From ae2265b47fce6358e427b467091a7cf91df93e4e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 13 三月 2025 10:16:53 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 141bd05..b629835 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -217,7 +217,7 @@
</if>
<if test="deptOrDistrict==2">
<if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
- AND leavehospitaldistrictcode IN
+ AND (leavehospitaldistrictcode IN
<foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="("
separator=","
close=")">
@@ -227,7 +227,7 @@
<if test=" leaveldeptcodes != null and leaveldeptcodes.size()>0">
OR deptcode IN
<foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
- close=")">
+ close="))">
#{leaveldeptcode}
</foreach>
</if>
@@ -262,6 +262,7 @@
<if test="longSendTime != null ">and long_send_time = #{longSendTime}</if>
<if test="sendstate != null ">and sendstate = #{sendstate}</if>
<if test="drname != null and drname != ''">and drname like concat('%', #{drname}, '%')</if>
+ <if test="taskName != null and taskName != ''">and task_name like concat('%', #{taskName}, '%')</if>
<if test="drcode != null ">and drcode = #{drcode}</if>
<if test="starttime != null ">and starttime = #{starttime}</if>
<if test="endtime != null ">and endtime = #{endtime}</if>
@@ -287,8 +288,12 @@
<include refid="selectServiceSubtaskVo"/>
<where>
del_flag=0
- <if test="createStartTime != null and createEndTime != null">create_time BETWEEN #{createStartTime} AND #{createEndTime}</if>
+ <if test="createStartTime != null and createEndTime != null">and create_time BETWEEN #{createStartTime} AND
+ #{createEndTime}
+ </if>
<if test="createBy != null ">and create_by = #{createBy}</if>
+ <if test="sendname != null ">and sendname = #{sendname}</if>
+ <if test="sfzh != null ">and sfzh = #{sfzh}</if>
</where>
</select>
--
Gitblit v1.9.3