From f89e03e3c1f2d621e62b7521fa0112ea63ed10f5 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 10 十一月 2025 15:59:16 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 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 e986244..ea78762 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
@@ -263,9 +263,10 @@
                 ServiceSubtask ss = new ServiceSubtask();
                 ss.setTaskid(taskid);
                 ss.setPatid(patid);
-                Integer integer = serviceSubtaskMapper.selectSendstateByCondition(ss);
-                if (integer != null && integer != 6) {
-                    ss.setSendstate(1L);
+                ss.setSendstate(3L);
+                List<Integer> integer = serviceSubtaskMapper.selectSendstateByCondition(ss);
+                if (integer != null) {
+                    ss.setSendstate(6L);
                     serviceSubtaskMapper.updateServiceSubtaskByCondition(ss);
                 }
             }
@@ -507,10 +508,11 @@
         }
         List<Map<String, String>> mapList = new ArrayList<>();
 
-        for (Map<String, String> map : ivrTaskMap.values()) {
-            mapList.add(map);
+        if (ivrTaskMap != null) {
+            for (Map<String, String> map : ivrTaskMap.values()) {
+                mapList.add(map);
+            }
         }
-
         //灏嗘ā鏉块棶棰樿瘽鏈噷鐨勯�氶厤绗︽浛鎹�
         for (SvyTaskTemplateScriptVO svyTaskTemplateScriptVO : svyTaskTemplateScriptVOS) {
             if (StringUtils.isNotEmpty(svyTaskTemplateScriptVO.getScriptContent())) {
@@ -603,8 +605,9 @@
             ServiceSubtask serviceSubtask = new ServiceSubtask();
             serviceSubtask.setTaskid(taskid);
             serviceSubtask.setPatid(patid);
-            Integer integer = serviceSubtaskMapper.selectSendstateByCondition(serviceSubtask);
-            if (integer == 3) {
+            serviceSubtask.setSendstate(3L);
+            List<Integer> integer = serviceSubtaskMapper.selectSendstateByCondition(serviceSubtask);
+            if (integer != null) {
                 serviceSubtask.setResult("瀹屾垚");
                 serviceSubtask.setFinishtime(new Date());
                 serviceSubtask.setSendstate(6L);

--
Gitblit v1.9.3