From dbbb114c25b2406b6d1fd52019d2f2228ffcacd0 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 27 十一月 2024 18:04:16 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 4084d2b..75c9356 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -39,7 +39,7 @@
<result property="pid" column="pid"/>
<result property="guid" column="guid"/>
<result property="textParam" column="text_param"/>
- <result property="serviceform" column="serviceform"/>
+ <result property="preachform" column="preachform"/>
<result property="bedNo" column="bed_no"/>
<result property="sendType" column="send_type"/>
<result property="taskName" column="task_name"/>
@@ -132,7 +132,7 @@
pid,
guid,
text_param,
- serviceform,
+ preachform,
bed_no,
send_type,
task_name,
@@ -178,14 +178,20 @@
<if test="templatename != null and templatename != ''">and templatename like concat('%', #{templatename},
'%')
</if>
- <if test="leavehospitaldistrictcodes != null">
+ <if test="startOutHospTime != null">
+ AND date_format(endtime,'%y%m%d') >= date_format(#{startOutHospTime},'%y%m%d')
+ </if>
+ <if test="endOutHospTime != null">
+ AND date_format(endtime,'%y%m%d') <= date_format(#{endOutHospTime},'%y%m%d')
+ </if>
+ <if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
AND leavehospitaldistrictcode IN
<foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
close=")">
#{leavehospitaldistrictcode}
</foreach>
</if>
- <if test=" leaveldeptcodes != null">
+ <if test=" leaveldeptcodes != null and leaveldeptcodes.size()>0">
AND deptcode IN
<foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
close=")">
@@ -207,7 +213,7 @@
<if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
<if test="pid != null ">and pid = #{pid}</if>
- <if test="serviceform != null ">and serviceform = #{serviceform}</if>
+ <if test="preachform != null ">and preachform = #{preachform}</if>
<if test="guid != null and guid != ''">and guid = #{guid}</if>
<if test="textParam != null and textParam != ''">and text_param = #{textParam}</if>
<if test="bedNo != null">and bed_no = #{bedNo}</if>
@@ -232,7 +238,12 @@
<if test="remark != null">and remark = #{remark}</if>
<if test="suggest != null">and suggest = #{suggest}</if>
</where>
- order by update_time desc,id desc
+ <if test="serviceType != null and serviceType != ''and serviceType != '2'and serviceType != '3'">order by
+ long_send_time desc
+ </if>
+ <if test="serviceType != null and serviceType != ''and serviceType == '2'">order by endtime desc</if>
+ <if test="serviceType != null and serviceType != ''and serviceType == '3'">order by admindate desc</if>
+ -- order by update_time desc,id desc
</select>
<select id="selectServiceSubtaskById" parameterType="Long" resultMap="ServiceSubtaskResult">
@@ -274,7 +285,7 @@
<if test="pid != null">pid,</if>
<if test="guid != null">guid,</if>
<if test="textParam != null">text_param,</if>
- <if test="serviceform != null">serviceform,</if>
+ <if test="preachform != null">preachform,</if>
<if test="bedNo != null">bed_no,</if>
<if test="sendType != null and sendType != ''">send_type,</if>
<if test="taskName != null and taskName != ''">task_name,</if>
@@ -344,7 +355,7 @@
<if test="pid != null">#{pid},</if>
<if test="guid != null">#{guid},</if>
<if test="textParam != null">#{textParam},</if>
- <if test="serviceform != null">#{serviceform},</if>
+ <if test="preachform != null">#{preachform},</if>
<if test="bedNo != null">#{bedNo},</if>
<if test="sendType != null and sendType != ''">#{sendType},</if>
<if test="taskName != null and taskName != ''">#{taskName},</if>
@@ -418,7 +429,7 @@
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
<if test="textParam != null">text_param = #{textParam},</if>
- <if test="serviceform != null">serviceform = #{serviceform},</if>
+ <if test="preachform != null">preachform = #{preachform},</if>
<if test="bedNo != null">bed_no = #{bedNo},</if>
<if test="sendType != null and sendType != ''">send_type = #{sendType},</if>
<if test="taskName != null and taskName != ''">task_name = #{taskName},</if>
@@ -493,7 +504,7 @@
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
<if test="textParam != null">text_param = #{textParam},</if>
- <if test="serviceform != null">serviceform = #{serviceform},</if>
+ <if test="preachform != null">preachform = #{preachform},</if>
<if test="bedNo != null">bed_no = #{bedNo},</if>
<if test="sendType != null and sendType != ''">send_type = #{sendType},</if>
<if test="taskName != null and taskName != ''">task_name = #{taskName},</if>
@@ -541,6 +552,7 @@
<if test="sendname != null">sendname = #{sendname},</if>
<if test="phone != null">phone = #{phone},</if>
<if test="sex != null">sex = #{sex},</if>
+ <if test="sendstate != null ">sendstate = #{sendstate},</if>
<if test="age != null">age = #{age},</if>
<if test="sfzh != null">sfzh = #{sfzh},</if>
<if test="addr != null">addr = #{addr},</if>
@@ -568,7 +580,7 @@
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
<if test="textParam != null">text_param = #{textParam},</if>
- <if test="serviceform != null">serviceform = #{serviceform},</if>
+ <if test="preachform != null">preachform = #{preachform},</if>
<if test="bedNo != null">bed_no = #{bedNo},</if>
<if test="sendType != null and sendType != ''">send_type = #{sendType},</if>
<if test="taskName != null and taskName != ''">task_name = #{taskName},</if>
@@ -662,7 +674,7 @@
pid,
guid,
text_param,
- serviceform,
+ preachform,
bed_no,
send_type,
task_name,
--
Gitblit v1.9.3