From 3d047130b059efd46f56be37465a751ab16ee8cb Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 11 十一月 2026 14:06:56 +0800
Subject: [PATCH] Merge branch 'smartor_ls_merge' into 20261111-妇幼档案随访
---
ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskPreachformMapper.xml | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskPreachformMapper.xml b/ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskPreachformMapper.xml
index 702a23d..9a39543 100644
--- a/ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskPreachformMapper.xml
+++ b/ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskPreachformMapper.xml
@@ -299,6 +299,24 @@
</update>
<!-- 鍘� deleteServiceSubtaskPreachformById锛�<update> 缃� del_flag=1 -->
+ <!-- 寰俊鍏紬鍙峰凡棰嗗彇鏈～鍐欐寜榛樿閫夐」瀹屾垚锛氫粎鏇存柊褰撳墠瀛愪换鍔＄殑褰撳墠鍏紬鍙疯銆�
+ 鍙厑璁镐粠宸插彂閫�(2)/宸查鍙�(3)杩佺Щ鍒板畬鎴�(9)锛岄伩鍏嶅苟鍙戞垨閲嶅琛ュ伩瑕嗙洊鍏朵粬鐘舵�併�� -->
+ <update id="updateWechatPreachformComplete" parameterType="com.ruoyi.task.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
<trim prefix="SET" suffixOverrides=",">
--
Gitblit v1.9.3