From 10aaa035f5be0312304d20f022bdb714a8f4900a Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 11 十二月 2024 22:16:23 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml | 64 +++++++++++++++++++++++++++++++
1 files changed, 63 insertions(+), 1 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
index ec7a1dc..ae62737 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
@@ -20,6 +20,7 @@
<result property="type" column="type"/>
<result property="typename" column="typename"/>
<result property="deptcode" column="deptcode"/>
+ <result property="deptname" column="deptname"/>
<result property="delFlag" column="del_flag"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
@@ -46,6 +47,12 @@
<result property="textParam" column="text_param"/>
<result property="serviceType" column="service_type"/>
<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">
@@ -53,6 +60,7 @@
task_name,
long_task,
show_date,
+ compensate_date,
show_time_morn,
show_time_noon,
show_time_night,
@@ -75,6 +83,7 @@
hosp_type,
typename,
deptcode,
+ deptname,
del_flag,
update_by,
update_time,
@@ -89,6 +98,10 @@
send_state,
send_time_slot,
service_type,
+ kcb,
+ jsy,
+ leavehospitaldistrictcode,
+ leavehospitaldistrictname,
orgid
from service_task
</sql>
@@ -96,6 +109,7 @@
<select id="selectServiceTaskList" parameterType="com.smartor.domain.ServiceTask" resultMap="ServiceTaskResult">
<include refid="selectServiceTaskVo"/>
<where>
+ del_flag=0
<if test="taskName != null and taskName != ''">and task_name like concat('%', #{taskName}, '%')</if>
<if test="sendTimeSlot != null and sendTimeSlot != ''">and send_time_slot like concat('%', #{sendTimeSlot},
'%')
@@ -124,14 +138,40 @@
</if>
<if test="deptcode != null and deptcode != ''">and deptcode = #{deptcode}</if>
+ <if test="deptname != null and deptname != ''">and deptname = #{deptname}</if>
<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="compensateDate != null ">and compensate_date = #{compensateDate}</if>
+ <if test="leavehospitaldistrictname != null ">and leavehospitaldistrictname =
+ #{leavehospitaldistrictname}
+ </if>
+ <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="leaveldeptcodes != null and leaveldeptcodes.size()>0">
+ AND deptcode IN
+ <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
+ close=")">
+ #{leaveldeptcode}
+ </foreach>
+ </if>
+
+
</where>
order by update_time desc,taskid desc
</select>
@@ -159,6 +199,7 @@
<if test="type != null">type,</if>
<if test="typename != null">typename,</if>
<if test="deptcode != null">deptcode,</if>
+ <if test="deptname != null">deptname,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
@@ -173,7 +214,6 @@
<if test="sendType != null">send_type,</if>
<if test="sendState != null">send_state,</if>
<if test="hospType != null and hospType != ''">hosp_type,</if>
-
<if test="taskDesc != null and taskDesc != ''">task_desc,</if>
<if test="libtemplateid != null ">libtemplateid,</if>
<if test="libtemplatename != null and libtemplatename != ''">libtemplatename,</if>
@@ -186,6 +226,12 @@
<if test="textParam != null and textParam != ''">text_param,</if>
<if test="serviceType != null and serviceType != ''">service_type,</if>
<if test="longTask != null and longTask != ''">long_task,</if>
+ <if test="kcb != null and kcb != ''">kcb,</if>
+ <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>
@@ -202,6 +248,7 @@
<if test="type != null">#{type},</if>
<if test="typename != null">#{typename},</if>
<if test="deptcode != null">#{deptcode},</if>
+ <if test="deptname != null">#{deptname},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
@@ -228,6 +275,12 @@
<if test="textParam != null and textParam != ''">#{textParam},</if>
<if test="serviceType != null and serviceType != ''">#{serviceType},</if>
<if test="longTask != null and longTask != ''">#{longTask},</if>
+ <if test="kcb != null and kcb != ''">#{kcb},</if>
+ <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>
@@ -248,6 +301,7 @@
<if test="type != null">type = #{type},</if>
<if test="typename != null">typename = #{typename},</if>
<if test="deptcode != null">deptcode = #{deptcode},</if>
+ <if test="deptname != null">deptname = #{deptname},</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>
@@ -274,6 +328,14 @@
<if test="textParam != null and textParam != ''">text_param=#{textParam},</if>
<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 != ''">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