From f55c563e2a0b52e4569ce6b5f81632cac598f7fe Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 30 十月 2024 18:36:55 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java |   55 ++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
index a318547..0773844 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
@@ -4,16 +4,19 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.Gson;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.exception.base.BaseException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.DtoConversionUtils;
+import com.ruoyi.common.utils.http.HttpUtils;
 import org.apache.commons.lang3.StringUtils;
 import com.smartor.domain.*;
 import com.smartor.mapper.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import com.smartor.service.IServiceTaskService;
 import org.springframework.transaction.annotation.Transactional;
@@ -147,7 +150,7 @@
     }
 
     @Override
-    public Map<String, Object> getScriptInfoByCondition(Long taskid, Long patid) {
+    public Map<String, Object> getScriptInfoByCondition(Long taskid, Long patid, Boolean isFinish) {
         Map<String, Object> map = new HashMap<>();
         ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
         serviceSubtaskVO.setPatid(patid);
@@ -169,19 +172,22 @@
             info = sfInfo(serviceTask, patid);
         } else if (serviceTask.getType().equals("2")) {
             //闂嵎
-            info = wjInfo(serviceTask, patid);
+            info = wjInfo(serviceTask, patid, isFinish);
         } else {
             //瀹ｆ暀
-            info = xjInfo(Long.valueOf(serviceTask.getLibtemplateid()), taskid, patid);
+            info = xjInfo(Long.valueOf(serviceTask.getLibtemplateid()), taskid, patid, isFinish);
         }
 
         //鍙鎵撳紑浜嗛〉闈紝灏辩畻鎴愬姛
-        ServiceSubtask ServiceTaskSingle = new ServiceSubtask();
-        ServiceTaskSingle.setTaskid(taskid);
-        ServiceTaskSingle.setPatid(patid);
-        ServiceTaskSingle.setResult("success");
-        ServiceTaskSingle.setFinishtime(new Date());
-        serviceSubtaskMapper.updateServiceSubtaskByCondition(ServiceTaskSingle);
+        if (isFinish) {
+            ServiceSubtask ss = new ServiceSubtask();
+            ss.setTaskid(taskid);
+            ss.setPatid(patid);
+            ss.setSendstate(1L);
+            ss.setResult("success");
+            ss.setFinishtime(new Date());
+            serviceSubtaskMapper.updateServiceSubtaskByCondition(ss);
+        }
         SvyTaskTemplate svyTaskTemplate = svyTaskTemplateMapper.selectSvyTaskTemplateBySvyid(serviceTask.getTemplateid());
         if (StringUtils.isNotEmpty(serviceTask.getKcb())) map.put("kcb", serviceTask.getKcb());
         map.put("script", info);
@@ -262,14 +268,15 @@
      * @param patid
      * @return
      */
-    private List wjInfo(ServiceTask serviceTask, Long patid) {
+    private List wjInfo(ServiceTask serviceTask, Long patid, Boolean isFinish) {
         //鐢ㄦ埛鐐瑰嚮浜嗗閾撅紝灏辩畻浠栭鍙栦簡
-        ServiceSubtask serviceSubtask = new ServiceSubtask();
-        serviceSubtask.setSendstate(1L);
-        serviceSubtask.setPatid(patid);
-        serviceSubtask.setTaskid(serviceTask.getTaskid());
-        serviceSubtaskMapper.updateServiceSubtaskByPatId(serviceSubtask);
-
+        if (isFinish == true) {
+            ServiceSubtask serviceSubtask = new ServiceSubtask();
+            serviceSubtask.setSendstate(1L);
+            serviceSubtask.setPatid(patid);
+            serviceSubtask.setTaskid(serviceTask.getTaskid());
+            serviceSubtaskMapper.updateServiceSubtaskByPatId(serviceSubtask);
+        }
         //閫氳繃妯℃澘ID鑾峰彇闂淇℃伅
         SvyLibTemplateScript svyLibTemplateScript = new SvyLibTemplateScript();
         svyLibTemplateScript.setSvyid(Long.valueOf(serviceTask.getLibtemplateid()));
@@ -325,13 +332,15 @@
         return svyLibTemplateScriptVOS;
     }
 
-    private List xjInfo(Long templateId, Long taskid, Long patid) {
-        ServiceSubtask serviceSubtask = new ServiceSubtask();
-        serviceSubtask.setTaskid(taskid);
-        serviceSubtask.setPatid(patid);
-        serviceSubtask.setResult("瀹屾垚");
-        serviceSubtask.setFinishtime(new Date());
-        serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);
+    private List xjInfo(Long templateId, Long taskid, Long patid, Boolean isFinish) {
+        if (isFinish == true) {
+            ServiceSubtask serviceSubtask = new ServiceSubtask();
+            serviceSubtask.setTaskid(taskid);
+            serviceSubtask.setPatid(patid);
+            serviceSubtask.setResult("瀹屾垚");
+            serviceSubtask.setFinishtime(new Date());
+            serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);
+        }
         HeLibrary heLibrary = heLibraryMapper.selectHeLibraryById(Long.valueOf(templateId));
         List list = new ArrayList();
         list.add(heLibrary);

--
Gitblit v1.9.3