From dbbb114c25b2406b6d1fd52019d2f2228ffcacd0 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 27 十一月 2024 18:04:16 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyTaskSingleController.java | 87 +++++++++----------------------------------
1 files changed, 19 insertions(+), 68 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 f5e8108..389e702 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
@@ -7,11 +7,11 @@
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.smartor.domain.IvrTaskVO;
-import com.smartor.domain.SvyTaskSingle;
-import com.smartor.domain.SvyTaskVO;
+import com.smartor.domain.*;
import com.smartor.service.ISvyTaskSingleService;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -26,6 +26,7 @@
* @author ruoyi
* @date 2024-06-12
*/
+@Api(description = "鍗曚竴浠诲姟锛堥棶鍗凤級(宸茬粡鎹㈡垚service_subtask)")
@RestController
@RequestMapping("/smartor/svysingle")
public class SvyTaskSingleController extends BaseController {
@@ -33,78 +34,28 @@
private ISvyTaskSingleService svyTaskSingleService;
/**
- * 鏌ヨ鍗曚竴浠诲姟锛堥棶鍗凤級鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('system:single:list')")
- @GetMapping("/list")
- public TableDataInfo list(SvyTaskSingle svyTaskSingle) {
- startPage();
- List<SvyTaskSingle> list = svyTaskSingleService.selectSvyTaskSingleList(svyTaskSingle);
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭鍗曚竴浠诲姟锛堥棶鍗凤級鍒楄〃
- */
- @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, "鍗曚竴浠诲姟锛堥棶鍗凤級鏁版嵁");
- }
-
- /**
- * 鑾峰彇鍗曚竴浠诲姟锛堥棶鍗凤級璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('system:single:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id) {
- return success(svyTaskSingleService.selectSvyTaskSingleById(id));
- }
-
- /**
- * 鏂板鍗曚竴浠诲姟锛堥棶鍗凤級
- */
- @PreAuthorize("@ss.hasPermi('system:single:add')")
- @Log(title = "鍗曚竴浠诲姟锛堥棶鍗凤級", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody SvyTaskSingle svyTaskSingle) {
- return toAjax(svyTaskSingleService.insertSvyTaskSingle(svyTaskSingle));
- }
-
- /**
- * 淇敼鍗曚竴浠诲姟锛堥棶鍗凤級
- */
- @PreAuthorize("@ss.hasPermi('system:single:edit')")
- @Log(title = "鍗曚竴浠诲姟锛堥棶鍗凤級", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody SvyTaskSingle svyTaskSingle) {
- return toAjax(svyTaskSingleService.updateSvyTaskSingle(svyTaskSingle));
- }
-
- /**
- * 鍒犻櫎鍗曚竴浠诲姟锛堥棶鍗凤級
- */
- @PreAuthorize("@ss.hasPermi('system:single:remove')")
- @Log(title = "鍗曚竴浠诲姟锛堥棶鍗凤級", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids) {
- return toAjax(svyTaskSingleService.deleteSvyTaskSingleByIds(ids));
- }
-
- /**
* 鏂板鎴栦慨鏀瑰垹闄ら棶鍗蜂换鍔�
*/
@ApiOperation("鏂板鎴栦慨鏀瑰垹闄ら棶鍗蜂换鍔�")
- @PreAuthorize("@ss.hasPermi('system:task:add')")
+ //@PreAuthorize("@ss.hasPermi('system:task:add')")
@PostMapping("/insertOrUpdateSvyTask")
public AjaxResult insertOrUpdateSvyTask(@RequestBody SvyTaskVO svyTaskVO) {
-
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));
+ }
+
+ /**
+ * 鏍规嵁鏉′欢鏌ヨ浠诲姟淇℃伅
+ */
+ @ApiOperation("鏍规嵁鏉′欢鏌ヨ浠诲姟淇℃伅")
+ @PostMapping("/queryTaskByCondition")
+ public AjaxResult queryTaskByCondition(@RequestBody SvyTaskSingleVO svyTaskSingleVO) {
+ //鏍规嵁鍏ュ弬鏌ヨ淇℃伅
+ ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(svyTaskSingleVO, ServiceSubtask.class);
+ ServiceTaskVO svyTaskVO = svyTaskSingleService.queryTaskByCondition(serviceSubtask);
+ return success(svyTaskVO);
}
}
--
Gitblit v1.9.3