From 9526971c403417c1c007804f24884c443b9e6cd7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 04 九月 2024 00:34:40 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java | 77 ++------------------------------------
1 files changed, 5 insertions(+), 72 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java
index f72d878..639975c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java
@@ -26,80 +26,12 @@
* @author ruoyi
* @date 2024-06-12
*/
-@Api(description = "鍗曚竴浠诲姟锛堥棶鍗凤級")
+@Api(description = "鍗曚竴浠诲姟锛堥棶鍗凤級(宸茬粡鎹㈡垚service_subtask)")
@RestController
@RequestMapping("/smartor/svysingle")
public class SvyTaskSingleController extends BaseController {
@Autowired
private ISvyTaskSingleService svyTaskSingleService;
-
- /**
- * 鏌ヨ鍗曚竴浠诲姟锛堥棶鍗凤級鍒楄〃
- */
- @ApiOperation("鏌ヨ鍗曚竴浠诲姟锛堥棶鍗凤級鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:single:list')")
- @GetMapping("/list")
- public TableDataInfo list(SvyTaskSingle svyTaskSingle) {
- startPage();
- List<SvyTaskSingle> list = svyTaskSingleService.selectSvyTaskSingleList(svyTaskSingle);
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭鍗曚竴浠诲姟锛堥棶鍗凤級鍒楄〃
- */
- @ApiOperation("瀵煎嚭鍗曚竴浠诲姟锛堥棶鍗凤級鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:single:export')")
- @Log(title = "鍗曚竴浠诲姟锛堥棶鍗凤級", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, SvyTaskSingle svyTaskSingle) {
- List<SvyTaskSingle> list = svyTaskSingleService.selectSvyTaskSingleList(svyTaskSingle);
- ExcelUtil<SvyTaskSingle> util = new ExcelUtil<SvyTaskSingle>(SvyTaskSingle.class);
- util.exportExcel(response, list, "鍗曚竴浠诲姟锛堥棶鍗凤級鏁版嵁");
- }
-
- /**
- * 鑾峰彇鍗曚竴浠诲姟锛堥棶鍗凤級璇︾粏淇℃伅
- */
- @ApiOperation("鑾峰彇鍗曚竴浠诲姟锛堥棶鍗凤級璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('system:single:query')")
- @GetMapping(value = "/getInfo/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id) {
- return success(svyTaskSingleService.selectSvyTaskSingleById(id));
- }
-
- /**
- * 鏂板鍗曚竴浠诲姟锛堥棶鍗凤級
- */
- @ApiOperation("鏂板鍗曚竴浠诲姟锛堥棶鍗凤級")
- @PreAuthorize("@ss.hasPermi('system:single:add')")
- @Log(title = "鍗曚竴浠诲姟锛堥棶鍗凤級", businessType = BusinessType.INSERT)
- @PostMapping("/add")
- public AjaxResult add(@RequestBody SvyTaskSingle svyTaskSingle) {
- return toAjax(svyTaskSingleService.insertSvyTaskSingle(svyTaskSingle));
- }
-
- /**
- * 淇敼鍗曚竴浠诲姟锛堥棶鍗凤級
- */
- @ApiOperation("淇敼鍗曚竴浠诲姟锛堥棶鍗凤級")
- @PreAuthorize("@ss.hasPermi('system:single:edit')")
- @Log(title = "鍗曚竴浠诲姟锛堥棶鍗凤級", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
- public AjaxResult edit(@RequestBody SvyTaskSingle svyTaskSingle) {
- return toAjax(svyTaskSingleService.updateSvyTaskSingle(svyTaskSingle));
- }
-
- /**
- * 鍒犻櫎鍗曚竴浠诲姟锛堥棶鍗凤級
- */
- @ApiOperation(" 鍒犻櫎鍗曚竴浠诲姟锛堥棶鍗凤級")
- @PreAuthorize("@ss.hasPermi('system:single:remove')")
- @Log(title = "鍗曚竴浠诲姟锛堥棶鍗凤級", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids) {
- return toAjax(svyTaskSingleService.deleteSvyTaskSingleByIds(ids));
- }
/**
* 鏂板鎴栦慨鏀瑰垹闄ら棶鍗蜂换鍔�
@@ -111,7 +43,8 @@
LoginUser loginUser = getLoginUser();
SysUser user = loginUser.getUser();
svyTaskVO.setCreateBy(user.getNickName());
- return toAjax(svyTaskSingleService.insertOrUpdateSvyTask(svyTaskVO));
+ ServiceTaskVO serviceTaskVO = DtoConversionUtils.sourceToTarget(svyTaskVO, ServiceTaskVO.class);
+ return toAjax(svyTaskSingleService.insertOrUpdateSvyTask(serviceTaskVO));
}
/**
@@ -121,8 +54,8 @@
@PostMapping("/queryTaskByCondition")
public AjaxResult queryTaskByCondition(@RequestBody SvyTaskSingleVO svyTaskSingleVO) {
//鏍规嵁鍏ュ弬鏌ヨ淇℃伅
- SvyTaskSingle svyTaskSingle = DtoConversionUtils.sourceToTarget(svyTaskSingleVO, SvyTaskSingle.class);
- SvyTaskVO svyTaskVO = svyTaskSingleService.queryTaskByCondition(svyTaskSingle);
+ ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(svyTaskSingleVO, ServiceSubtask.class);
+ ServiceTaskVO svyTaskVO = svyTaskSingleService.queryTaskByCondition(serviceSubtask);
return success(svyTaskVO);
}
}
--
Gitblit v1.9.3