From 1872936aceb6b7148f33a04c9b2a605faf5cfd1b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 10 十一月 2025 16:12:49 +0800
Subject: [PATCH] 添加ishide

---
 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
index fe021e6..737b13d 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -134,7 +134,6 @@
         return serviceSubtaskAnswerMapper.deleteServiceSubtaskAnswerById(id);
     }
 
-
     @Override
     public Integer saveQuestionAnswer(ServiceSubTaskAnswerReq serviceSubTaskAnswerReq, Long flag) {
         Long tid = null;
@@ -644,6 +643,7 @@
     }
 
     private Map<String, String> setWJInfo(SvyTaskTemplateScriptVO svyTaskTemplateScriptVO, Long taskid, Long patid) {
+        log.error("-----svyTaskTemplateScriptVO鐨勫�间负锛歿}", svyTaskTemplateScriptVO);
         ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
         serviceSubtaskVO.setTaskid(taskid);
         serviceSubtaskVO.setPatid(patid);
@@ -701,6 +701,7 @@
         serviceSubtaskDetailMapper.insertServiceSubtaskDetail(serviceSubtaskDetail);
 
         //濡備綍杩欓渶瑕佹湇鍔¤ˉ鍋跨殑鏈嶅姟ID涓嶄负绌虹殑璇濓紝鍒欒繘琛岀珛鍗冲彂閫�
+        log.error("------svyTaskTemplateScriptVO.getSendTaskids()鐨勫�间负锛歿},selectServiceSubtaskList鐨勫�间负锛歿}", svyTaskTemplateScriptVO.getSendTaskids(), selectServiceSubtaskList.size());
         if (CollectionUtils.isNotEmpty(svyTaskTemplateScriptVO.getSendTaskids()) && CollectionUtils.isNotEmpty(selectServiceSubtaskList)) {
             sendTaskIds(svyTaskTemplateScriptVO.getSendTaskids(), selectServiceSubtaskList.get(0));
         }
@@ -716,6 +717,14 @@
         for (Integer taskId : sendTaskids) {
             ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(Long.valueOf(taskId));
             String content = sendMQContent(serviceTask, null);
+            //鍏堟煡璇竴涓嬶紝璇ユ偅鑰呭湪璇ervice_task涓紝鏄惁宸茬粡瀛樺湪,濡傛灉宸茬粡瀛樺湪锛屽垯涓嶇敤鍐嶄繚瀛樹簡
+            ServiceSubtask ss = new ServiceSubtask();
+            ss.setTaskid(Long.valueOf(taskId));
+            ss.setPatid(serviceSubtask.getPatid());
+            ss.setCreateTimeNew(new Date());
+            List<Integer> list = serviceSubtaskMapper.selectSendstateByCondition(ss);
+            if (CollectionUtils.isNotEmpty(list)) return true;
+
             //鍏堜慨鏀圭姸鎬�
             insertServiceSubtask(serviceTask, new Date(), serviceSubtask);
             //绔嬪嵆鍙戦��
@@ -723,7 +732,7 @@
             serviceTask.setStopState(null);
             log.info("娑堟伅鍙戦�佹垚鍔�");
         }
-        return null;
+        return true;
     }
 
 
@@ -735,6 +744,7 @@
         serviceSubtask.setTemplatename(serviceTask.getTemplatename());
         serviceSubtask.setTemplateid(serviceTask.getTemplateid());
         serviceSubtask.setSendstate(2L);
+        serviceSubtask.setCurrentPreachform(null);
         serviceSubtask.setVisitTime(date);
         serviceSubtask.setId(null);
         serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);

--
Gitblit v1.9.3