From 7a4465ad9ffccaa6d8d9e4545c6d9fce0344ac45 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 22 四月 2026 19:41:37 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/smartor
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 31 -------------------------------
1 files changed, 0 insertions(+), 31 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
index 3f0b9e2..92bfa3d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -437,37 +437,6 @@
}
/**
- * 鏂板鎴栦慨鏀瑰垹闄ゅ崟涓�浠诲姟(涓存椂鎺ュ彛)
- */
- @ApiOperation("鏂板鎴栦慨鏀瑰垹闄ゅ崟涓�浠诲姟(涓存椂鎺ュ彛)")
- //@PreAuthorize("@ss.hasPermi('system:task:add')")
- @Log(title = "鍗曚竴浠诲姟锛堥殢璁匡級", businessType = BusinessType.INSERT)
- @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
- @PostMapping("/insertOrUpdateTaskByTaskId")
- public AjaxResult insertOrUpdateTaskByTaskId(@RequestBody ServiceTaskVO ivrTaskVO) {
- log.info("insertOrUpdateTaskByTaskId鐨勫叆鍙備负锛歿}", ivrTaskVO);
- LoginUser loginUser = getLoginUser();
- SysUser user = loginUser.getUser();
- ivrTaskVO.setCreateBy(user.getNickName());
- ivrTaskVO.setUpdateBy(user.getNickName());
- ivrTaskVO.setOrgid(user.getOrgid());
- //鏍规嵁鍏ュ弬鏌ヨ淇℃伅-鐢ㄦ埛鍏崇郴
- ServiceSubtask serviceSubtask = new ServiceSubtask();
- if(ObjectUtils.isNotEmpty(ivrTaskVO.getTaskid())){
- serviceSubtask.setTaskid(ivrTaskVO.getTaskid());
- serviceSubtask.setOrgid(user.getOrgid());
- serviceSubtask.setCampusid(user.getCampusid());
- ServiceTaskVO ivrTaskVO1 = serviceSubtaskService.queryTaskByCondition(serviceSubtask);
- ivrTaskVO.setPatTaskRelevances(ivrTaskVO1.getPatTaskRelevances());
-
- return success(serviceSubtaskService.insertOrUpdateTask(ivrTaskVO));
- }else {
- return error("insertOrUpdateTaskByTaskId taskid涓嶅彲涓虹┖");
- }
-
- }
-
- /**
* 鐢佃瘽鍥炶皟浠诲姟(涓婃捣)
*/
@ApiOperation("鐢佃瘽鍥炶皟浠诲姟")
--
Gitblit v1.9.3