From 048db32d9a965f1ef398a8aa02a012e9b968a6b1 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 08 十一月 2024 18:39:04 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
index 65a6411..ae62737 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
@@ -49,8 +49,10 @@
<result property="longTask" column="long_task"/>
<result property="kcb" column="kcb"/>
<result property="jsy" column="jsy"/>
+ <result property="compensateDate" column="compensate_date"/>
<result property="leavehospitaldistrictcode" column="leavehospitaldistrictcode"/>
<result property="leavehospitaldistrictname" column="leavehospitaldistrictname"/>
+ <result property="compensateDate" column="compensate_date"/>
</resultMap>
<sql id="selectServiceTaskVo">
@@ -58,6 +60,7 @@
task_name,
long_task,
show_date,
+ compensate_date,
show_time_morn,
show_time_noon,
show_time_night,
@@ -139,33 +142,28 @@
<if test="isupload != null ">and isupload = #{isupload}</if>
<if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
+ <if test="compensateDate != null and compensateDate != ''">and compensate_date = #{compensateDate}</if>
<if test="hospType != null and hospType != ''">and hosp_type = #{hospType}</if>
<if test="libtemplateid != null ">and libtemplateid = #{libtemplateid}</if>
<if test="libtemplatename != null and libtemplatename != ''">and libtemplatename = #{libtemplatename}</if>
<if test="createBy != null and createBy != ''">and create_by = #{createBy}</if>
<if test="sendState != null ">and send_state = #{sendState}</if>
- <if test="leavehospitaldistrictname != null ">and leavehospitaldistrictname = #{leavehospitaldistrictname}</if>
- <if test="leavehospitaldistrictcode != null ">and leavehospitaldistrictcode = #{leavehospitaldistrictcode}</if>
- <if test="leavehospitaldistrictcodes != null and leaveldeptcodes != null">
- AND (leavehospitaldistrictcode IN
- <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
- close=")">
- #{leavehospitaldistrictcode}
- </foreach>
- OR deptcode IN
- <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
- close="))">
- #{leaveldeptcode}
- </foreach>
+ <if test="compensateDate != null ">and compensate_date = #{compensateDate}</if>
+ <if test="leavehospitaldistrictname != null ">and leavehospitaldistrictname =
+ #{leavehospitaldistrictname}
</if>
- <if test="leavehospitaldistrictcodes != null and leaveldeptcodes == null">
+ <if test="leavehospitaldistrictcode != null ">and leavehospitaldistrictcode =
+ #{leavehospitaldistrictcode}
+ </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="leavehospitaldistrictcodes == null and leaveldeptcodes != null">
+ <if test="leaveldeptcodes != null and leaveldeptcodes.size()>0">
AND deptcode IN
<foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
close=")">
@@ -232,6 +230,8 @@
<if test="jsy != null and jsy != ''">jsy,</if>
<if test="leavehospitaldistrictname != null ">leavehospitaldistrictname,</if>
<if test="leavehospitaldistrictcode != null ">leavehospitaldistrictcode,</if>
+ <if test="compensateDate != null and compensateDate != ''">compensate_date,</if>
+ <if test="compensateDate != null ">compensate_date,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="taskName != null">#{taskName},</if>
@@ -279,6 +279,8 @@
<if test="jsy != null and jsy != ''">#{jsy},</if>
<if test="leavehospitaldistrictname != null ">#{leavehospitaldistrictname},</if>
<if test="leavehospitaldistrictcode != null ">#{leavehospitaldistrictcode},</if>
+ <if test="compensateDate != null and compensateDate != ''">#{compensateDate}</if>
+ <if test="compensateDate != null ">#{compensateDate},</if>
</trim>
</insert>
@@ -327,9 +329,13 @@
<if test="serviceType != null and serviceType != ''">service_type = #{serviceType},</if>
<if test="longTask != null and longTask != ''">long_task = #{longTask},</if>
<if test="kcb != null and kcb != ''">kcb = #{kcb},</if>
- <if test="jsy != null and jsy != ''">kcb = #{jsy},</if>
- <if test="leavehospitaldistrictname != null ">leavehospitaldistrictname = #{leavehospitaldistrictname},</if>
- <if test="leavehospitaldistrictcode != null ">leavehospitaldistrictcode = #{leavehospitaldistrictcode},</if>
+ <if test="jsy != null and jsy != ''">jsy = #{jsy},</if>
+ <if test="leavehospitaldistrictname != null ">leavehospitaldistrictname = #{leavehospitaldistrictname},
+ </if>
+ <if test="leavehospitaldistrictcode != null ">leavehospitaldistrictcode = #{leavehospitaldistrictcode},
+ </if>
+ <if test="compensateDate != null and compensateDate != ''">compensate_date = #{compensateDate}</if>
+ <if test="compensateDate != null ">compensate_date = #{compensateDate}</if>
</trim>
where taskid = #{taskid}
</update>
--
Gitblit v1.9.3