From e56e937f0b78152cc607ade75b3a0e1b2c1c2c4c Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期六, 07 十一月 2026 14:40:10 +0800
Subject: [PATCH] fix: 完成时状态与超时判断区分任务组

---
 smartor/src/main/resources/mapper/smartor/ServiceSubtaskPreachformMapper.xml |   27 ++++++++++++++++++++++-----
 1 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskPreachformMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskPreachformMapper.xml
index 05b062e..e63538f 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskPreachformMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskPreachformMapper.xml
@@ -247,22 +247,39 @@
         </trim>
         where 1=1
             <if test="subid != null">and subid =
-                #{subid},
+                #{subid}
             </if>
             <if test="taskid != null">and taskid =
-                #{taskid},
+                #{taskid}
             </if>
             <if test="preachform != null">and preachform =
-                #{preachform},
+                #{preachform}
             </if>
             <if test="remark != null">and remark =
-                #{remark},
+                #{remark}
             </if>
             <if test="orgid != null">and orgid =
-                #{orgid},
+                #{orgid}
             </if>
     </update>
 
+    <!-- 寰俊鍏紬鍙峰凡棰嗗彇鏈~鍐欐寜榛樿閫夐」瀹屾垚锛氫粎鏇存柊褰撳墠瀛愪换鍔$殑褰撳墠鍏紬鍙疯銆�
+         鍙厑璁镐粠宸插彂閫�(2)/宸查鍙�(3)杩佺Щ鍒板畬鎴�(9)锛岄伩鍏嶅苟鍙戞垨閲嶅琛ュ伩瑕嗙洊鍏朵粬鐘舵�併�� -->
+    <update id="updateWechatPreachformComplete" parameterType="com.smartor.domain.ServiceSubtaskPreachform">
+        update service_subtask_preachform
+        set sendstate = '9',
+            remark = case
+                         when remark is null or remark = '' then #{remark}
+                         else concat(remark, ',', #{remark})
+                     end,
+            update_time = now()
+        where id = #{id}
+          and subid = #{subid}
+          and orgid = #{orgid}
+          and preachform = #{preachform}
+          and sendstate in ('2', '3')
+    </update>
+
 
     <update id="deleteServiceSubtaskPreachformById" parameterType="Long">
         update service_subtask_preachform

--
Gitblit v1.9.3