From c24d16a37523a49080392610357872ce580cbc38 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 26 十月 2026 14:03:33 +0800
Subject: [PATCH] 代码提交
---
ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskDetailMapper.xml | 55 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 7 deletions(-)
diff --git a/ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskDetailMapper.xml b/ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskDetailMapper.xml
index 3b8bb91..89fa87a 100644
--- a/ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskDetailMapper.xml
+++ b/ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskDetailMapper.xml
@@ -219,8 +219,8 @@
ssd.targetid,
ssd.template_type,
ssd.lib_templateid,
- sd.deptcode,
- sd.deptname,
+ sd.leaveldeptcode AS deptcode,
+ sd.leaveldeptname AS deptname,
sd.leavehospitaldistrictcode,
sd.leavehospitaldistrictname
from service_subtask_detail ssd
@@ -247,7 +247,7 @@
</foreach>
</if>
<if test="leaveldeptcodes != null and leaveldeptcodes.size() > 0">
- and sd.deptcode in
+ and sd.leaveldeptcode in
<foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator="," close=")">
#{leaveldeptcode}
</foreach>
@@ -283,12 +283,22 @@
<if test="questiontext != null">and questiontext = #{questiontext}</if>
</select>
- <select id="isExistServiceSubtaskDetail" resultType="com.ruoyi.task.domain.DTO.ServiceSubtaskDetailDTO">
+ <!--
+ 鈿狅笍 鍙ｅ緞鍙樻洿锛�2026-10-21锛夛細杩欓噷**涓嶅啀杩囨护 del_flag**锛屾敼涓哄彇璇� (sub_id, scriptid) 鏈�鏂扮殑涓�琛屻��
+
+ 鍘熷洜锛氬師鏉ュ彧璁� del_flag=0锛屾槑缁嗕竴鏃﹁閫昏緫鍒犻櫎灏辨煡涓嶅埌锛屼笅涓�娆′繚瀛樺繀鐒� INSERT 涓�鏉℃柊鍓湰锛�
+ 瀵艰嚧鍚屼竴浣嶆偅鑰呭悓涓�閬撻鍫嗗嚭 2~6 鏉￠噸澶嶆槑缁嗭紙瑙� nhfy 2026-09-08 鐨勪簨鏁咃級銆�
+ 鏀逛负銆屽拷鐣ュ垹闄ゆ爣璁般�佸彇鏈�鏂颁竴琛屻�嶅悗锛屼繚瀛樿蛋 UPDATE锛堢敱璋冪敤鏂瑰啀璋� reviveServiceSubtaskDetail 澶嶆椿锛夛紝
+ 鍓湰涓嶄細鍐嶇疮绉��
+ -->
+ <select id="isExistServiceSubtaskDetail" resultType="com.ruoyi.task.domain.DTO.ServiceSubtaskDetailDTO">
select id, questiontext, matchedtext, score
from service_subtask_detail
- where del_flag = 0
+ where 1 = 1
<if test="subid != null ">and sub_id = #{subid}</if>
<if test="scriptid != null">and scriptid = #{scriptid}</if>
+ order by id desc
+ limit 1
</select>
<insert id="insertServiceSubtaskDetail" parameterType="com.ruoyi.task.domain.ServiceSubtaskDetail"
@@ -453,7 +463,6 @@
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="orgid != null">orgid = #{orgid},</if>
<if test="createTime != null">create_time = #{createTime},</if>
- <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
@@ -512,7 +521,6 @@
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="orgid != null">orgid = #{orgid},</if>
<if test="createTime != null">create_time = #{createTime},</if>
- <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
@@ -533,6 +541,39 @@
where patid = #{patid} and scriptid = #{scriptid} and sub_id = #{subId}
</update>
+ <!-- ======================================================================
+ 閫昏緫鍒犻櫎 / 澶嶆椿锛�2026-10-21 鏀跺彛锛�
+ ======================================================================
+ 鑳屾櫙锛氫笂闈袱鏉￠�氱敤 UPDATE锛坲pdateServiceSubtaskDetail銆乽pdateSSDByCondition锛夊師鏈兘甯�
+ if test="delFlag != null" 灏卞幓 SET del_flag = 瀹㈡埛绔紶鐨勫�硷紝
+ 绛変簬鎶� del_flag 鐨勫啓鏉冮檺浜ょ粰浜嗗鎴风锛氬墠绔竴涓� {"subId":x,"delFlag":"1"}
+ 灏辫兘鎶婃暣鍗风瓟鍗锋倓鎮�"鍒犻櫎"锛坣hfy 2026-09-08 灏辫繖鏍蜂涪浜� 10 浣嶆偅鑰呯殑婊℃剰搴︿綔绛旓紝
+ 鑰� patItemExport 鐨勩�岄棶棰樿鎯呭崰姣斻�嶅張鍙 del_flag=0锛屼簬鏄� 380 琛屽彧鍓� 370 浜猴級銆�
+ 鐜板湪杩欎袱鏉￠�氱敤 UPDATE 宸茬Щ闄� del_flag 瀛楁锛岄�昏緫鍒犻櫎鍙兘璧颁笅闈袱鏉′笓鐢ㄨ鍙ワ紝
+ 澶嶆椿鍙厑璁哥疆鍥� '0'锛坮eviveServiceSubtaskDetail锛夈��
+ ====================================================================== -->
+ <update id="softDeleteServiceSubtaskDetailBySubId">
+ update service_subtask_detail
+ set del_flag = '1', update_time = now()
+ where sub_id = #{subId}
+ and del_flag = '0'
+ </update>
+
+ <update id="softDeleteServiceSubtaskDetailById">
+ update service_subtask_detail
+ set del_flag = '1', update_time = now()
+ where id = #{id}
+ and del_flag = '0'
+ </update>
+
+ <!-- 澶嶆椿涓�琛屾槑缁嗭細淇濆瓨绛旀鏃跺懡涓巻鍙茶鍒犲壇鏈� -> 鏇存柊鍐呭鍚庡啀缃洖 del_flag='0'锛岄伩鍏嶆柊澧炲壇鏈� -->
+ <update id="reviveServiceSubtaskDetail">
+ update service_subtask_detail
+ set del_flag = '0'
+ where id = #{id}
+ and del_flag <> '0'
+ </update>
+
<delete id="deleteServiceSubtaskDetailByCalldetailid" parameterType="String">
delete
from service_subtask_detail
--
Gitblit v1.9.3