From 9a7b7c6558a3248284eabb751354a44962e97730 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 20 四月 2026 16:50:29 +0800
Subject: [PATCH] 【丽水】(临时接口)修改补偿机制

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 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 d2e5e1b..bd17476 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
@@ -444,21 +444,27 @@
     @Log(title = "鍗曚竴浠诲姟锛堥殢璁匡級", businessType = BusinessType.INSERT)
     @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
     @PostMapping("/insertOrUpdateTaskByTaskId")
-    public AjaxResult insertOrUpdateTaskByTaskId(@RequestBody ServiceSubtaskVO serviceSubtaskVO) {
+    public AjaxResult insertOrUpdateTaskByTaskId(@RequestBody ServiceTaskVO ivrTaskVO) {
 
         //鏍规嵁鍏ュ弬鏌ヨ淇℃伅-鐢ㄦ埛鍏崇郴
-        ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceSubtaskVO, ServiceSubtask.class);
-        serviceSubtask.setContinueContent(ObjectUtils.isNotEmpty(serviceSubtaskVO.getContinueContent()) ? serviceSubtaskVO.getContinueContent().toString() : null);
-        ServiceTaskVO ivrTaskVO = serviceSubtaskService.queryTaskByCondition(serviceSubtask);
+        ServiceSubtask serviceSubtask = new ServiceSubtask();
+        if(ObjectUtils.isNotEmpty(ivrTaskVO.getTaskid())){
+            serviceSubtask.setTaskid(ivrTaskVO.getTaskid());
+            ServiceTaskVO ivrTaskVO1 = serviceSubtaskService.queryTaskByCondition(serviceSubtask);
 
-        log.info("insertOrUpdateTaskByTaskId鐨勫叆鍙備负锛歿}", ivrTaskVO);
-        LoginUser loginUser = getLoginUser();
-        SysUser user = loginUser.getUser();
-        ivrTaskVO.setCreateBy(user.getNickName());
-        ivrTaskVO.setUpdateBy(user.getNickName());
-        ivrTaskVO.setOrgid(user.getOrgid());
+            log.info("insertOrUpdateTaskByTaskId鐨勫叆鍙備负锛歿}", ivrTaskVO);
+            LoginUser loginUser = getLoginUser();
+            SysUser user = loginUser.getUser();
+            ivrTaskVO.setCreateBy(user.getNickName());
+            ivrTaskVO.setUpdateBy(user.getNickName());
+            ivrTaskVO.setOrgid(user.getOrgid());
+            ivrTaskVO.setPatTaskRelevances(ivrTaskVO1.getPatTaskRelevances());
 
-        return success(serviceSubtaskService.insertOrUpdateTask(ivrTaskVO));
+            return success(serviceSubtaskService.insertOrUpdateTask(ivrTaskVO));
+        }else {
+            return error("insertOrUpdateTaskByTaskId taskid涓嶅彲涓虹┖");
+        }
+
     }
 
     /**

--
Gitblit v1.9.3