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

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java |   37 ++++++++++++++++++++++++++-----------
 1 files changed, 26 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 e9abbe2..d2e5e1b 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
@@ -119,16 +119,6 @@
         // 鐩存帴浠庡凡鏈夎仛鍚堢粨鏋滄帹绠梩otal锛岄伩鍏嶅幓鎺夊垎椤靛悗鍐嶅叏閲忔煡涓�閬嶅ぇ琛�
         long total = 0L;
         try {
-//                 * wzx: 鏈墽琛屾暟閲�
-//                    * ysf: 宸查殢璁挎暟閲�
-//                    * fssb: 鍙戦�佸け璐ユ暟閲�
-//                    * yfs: 宸插彂閫佹暟閲�
-//                    * dsf: 寰呴殢璁挎暟閲�
-
-//            long wzx = map.get("wzx") != null ? ((Number) map.get("wzx")).longValue() : 0L;
-//            long ysf = map.get("ysf") != null ? ((Number) map.get("ysf")).longValue() : 0L;
-//            long dsf = map.get("dsf") != null ? ((Number) map.get("dsf")).longValue() : 0L;
-//            long fssb = map.get("fssb") != null ? ((Number) map.get("fssb")).longValue() : 0L;
             total = map.get("total") != null ? ((Number) map.get("total")).longValue() : 0L;
 
         } catch (Exception e) {
@@ -185,7 +175,7 @@
                 if (ObjectUtils.isNotEmpty(oldCondition) && isSameCondition(oldCondition, serviceSubtaskEntity)) {
                     redisFlag = true;
                     map = redisMap;
-                    redisCache.setCacheObject(userId + "patItemCount", map, 120, TimeUnit.MINUTES);
+                    redisCache.setCacheObject(userId + "patItemCount", map, 60, TimeUnit.MINUTES);
                 }
             }
             if (!redisFlag) {
@@ -447,6 +437,31 @@
     }
 
     /**
+     * 鏂板鎴栦慨鏀瑰垹闄ゅ崟涓�浠诲姟(涓存椂鎺ュ彛)
+     */
+    @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 ServiceSubtaskVO serviceSubtaskVO) {
+
+        //鏍规嵁鍏ュ弬鏌ヨ淇℃伅-鐢ㄦ埛鍏崇郴
+        ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceSubtaskVO, ServiceSubtask.class);
+        serviceSubtask.setContinueContent(ObjectUtils.isNotEmpty(serviceSubtaskVO.getContinueContent()) ? serviceSubtaskVO.getContinueContent().toString() : null);
+        ServiceTaskVO ivrTaskVO = 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());
+
+        return success(serviceSubtaskService.insertOrUpdateTask(ivrTaskVO));
+    }
+
+    /**
      * 鐢佃瘽鍥炶皟浠诲姟(涓婃捣)
      */
     @ApiOperation("鐢佃瘽鍥炶皟浠诲姟")

--
Gitblit v1.9.3