From 85a5ca43ff5a05dcb34d4e90b9c96fd0dd16aa2f Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 22 五月 2026 16:00:43 +0800
Subject: [PATCH] 【丽水】暂时不加 campusid
---
smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml | 218 ++++++++++++++++++++++++++++++++++++------------------
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 8 -
2 files changed, 145 insertions(+), 81 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index c55d298..5ed008b 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -36,7 +36,6 @@
<result property="isupload" column="isupload"/>
<result property="uploadTime" column="upload_time"/>
<result property="orgid" column="orgid"/>
- <result property="campusid" column="campusid"/>
<result property="pid" column="pid"/>
<result property="guid" column="guid"/>
<result property="taskGuid" column="task_guid"/>
@@ -813,7 +812,6 @@
<if test="isupload != null">isupload,</if>
<if test="uploadTime != null">upload_time,</if>
<if test="orgid != null">orgid,</if>
- <if test="campusid != null">campusid,</if>
<if test="pid != null">pid,</if>
<if test="guid != null">guid,</if>
<if test="textParam != null">text_param,</if>
@@ -906,7 +904,6 @@
<if test="isupload != null">#{isupload},</if>
<if test="uploadTime != null">#{uploadTime},</if>
<if test="orgid != null">#{orgid},</if>
- <if test="campusid != null">#{campusid},</if>
<if test="pid != null">#{pid},</if>
<if test="guid != null">#{guid},</if>
<if test="textParam != null">#{textParam},</if>
@@ -1004,7 +1001,6 @@
<if test="isupload != null">isupload = #{isupload},</if>
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="orgid != null">orgid = #{orgid},</if>
- <if test="campusid != null">campusid = #{campusid},</if>
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
<if test="textParam != null">text_param = #{textParam},</if>
@@ -1103,7 +1099,6 @@
<if test="isupload != null">isupload = #{isupload},</if>
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="orgid != null">orgid = #{orgid},</if>
- <if test="campusid != null">campusid = #{campusid},</if>
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
<if test="textParam != null">text_param = #{textParam},</if>
@@ -1206,7 +1201,6 @@
<if test="isupload != null">isupload = #{isupload},</if>
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="orgid != null">orgid = #{orgid},</if>
- <if test="campusid != null">campusid = #{campusid},</if>
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
<if test="visitCount != null">visit_count = #{visitCount},</if>
@@ -1306,7 +1300,6 @@
<if test="isupload != null">isupload = #{isupload},</if>
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="orgid != null">orgid = #{orgid},</if>
- <if test="campusid != null">campusid = #{campusid},</if>
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
<if test="textParam != null">text_param = #{textParam},</if>
@@ -2556,3 +2549,4 @@
</select>
</mapper>
+
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
index 7a1aeae..8d227ba 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
@@ -30,7 +30,6 @@
<result property="isupload" column="isupload"/>
<result property="uploadTime" column="upload_time"/>
<result property="orgid" column="orgid"/>
- <result property="campusid" column="campusid"/>
<result property="pid" column="pid"/>
<result property="guid" column="guid"/>
<result property="preachform" column="preachform"/>
@@ -126,76 +125,75 @@
<select id="selectServiceTaskList" parameterType="com.smartor.domain.ServiceTask" resultMap="ServiceTaskResult">
<include refid="selectServiceTaskVo"/>
where 1=1
- and del_flag = 0
- <if test="taskName != null and taskName != ''">and task_name like concat('%', #{taskName}, '%')</if>
- <if test="taskid != null">and taskid = #{taskid}</if>
- <if test="sendTimeSlot != null and sendTimeSlot != ''">and send_time_slot like concat('%', #{sendTimeSlot},
- '%')
- </if>
- <if test="templateid != null and templateid != ''">and templateid = #{templateid}</if>
- <if test="longTask != null and longTask != ''">and long_task = #{longTask}</if>
- <if test="serviceType != null and serviceType != ''">and service_type = #{serviceType}</if>
- <if test="templatename != null and templatename != ''">and templatename like concat('%', #{templatename},
- '%')
- </if>
- <if test="labelinfo != null and labelinfo != ''">and labelinfo = #{labelinfo}</if>
- <if test="count != null ">and count = #{count}</if>
- <if test="executed != null ">and executed = #{executed}</if>
- <if test="unexecuted != null ">and unexecuted = #{unexecuted}</if>
- <if test="fail != null ">and fail = #{fail}</if>
- <if test="checkuserid != null and checkuserid != ''">and checkuserid = #{checkuserid}</if>
- <if test="checkusername != null and checkusername != ''">and checkusername like concat('%',
- #{checkusername}, '%')
- </if>
- <if test="checktime != null ">and checktime = #{checktime}</if>
- <if test="sendDay != null ">and send_day = #{sendDay}</if>
- <if test="type != null and type != ''">and type = #{type}</if>
- <if test="typename != null and typename != ''">and typename like concat('%', #{typename}, '%')</if>
- <if test="beginTime != null ">and date_format(update_time,'%y%m%d') >= date_format(#{beginTime},'%y%m%d')
- </if>
- <if test="endTime != null ">and date_format(update_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d')
- </if>
- <if test="deptcode != null and deptcode != ''">
- and deptcode REGEXP CONCAT('(^|,)', #{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="campusid != null and campusid != ''">and campusid = #{campusid}</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="patCycle != null ">and pat_cycle = #{patCycle}</if>
- <if test="nexttaskflag != null ">and nexttaskflag = #{nexttaskflag}</if>
- <if test="nexttaskid != null ">and nexttaskid = #{nexttaskid}</if>
- <if test="nexttaskname != null ">and nexttaskname = #{nexttaskname}</if>
- <if test="appltype != null ">and appltype = #{appltype}</if>
- <if test="diagType != null and diagType != ''">and diag_type = #{diagType}</if>
- <if test="leavehospitaldistrictname != null ">and leavehospitaldistrictname =
- #{leavehospitaldistrictname}
- </if>
- <if test="leavehospitaldistrictcode != null and leavehospitaldistrictcode != ''">
- and leavehospitaldistrictcode REGEXP CONCAT('(^|,)', #{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>
+ and del_flag = 0
+ <if test="taskName != null and taskName != ''">and task_name like concat('%', #{taskName}, '%')</if>
+ <if test="taskid != null">and taskid = #{taskid}</if>
+ <if test="sendTimeSlot != null and sendTimeSlot != ''">and send_time_slot like concat('%', #{sendTimeSlot},
+ '%')
+ </if>
+ <if test="templateid != null and templateid != ''">and templateid = #{templateid}</if>
+ <if test="longTask != null and longTask != ''">and long_task = #{longTask}</if>
+ <if test="serviceType != null and serviceType != ''">and service_type = #{serviceType}</if>
+ <if test="templatename != null and templatename != ''">and templatename like concat('%', #{templatename},
+ '%')
+ </if>
+ <if test="labelinfo != null and labelinfo != ''">and labelinfo = #{labelinfo}</if>
+ <if test="count != null ">and count = #{count}</if>
+ <if test="executed != null ">and executed = #{executed}</if>
+ <if test="unexecuted != null ">and unexecuted = #{unexecuted}</if>
+ <if test="fail != null ">and fail = #{fail}</if>
+ <if test="checkuserid != null and checkuserid != ''">and checkuserid = #{checkuserid}</if>
+ <if test="checkusername != null and checkusername != ''">and checkusername like concat('%',
+ #{checkusername}, '%')
+ </if>
+ <if test="checktime != null ">and checktime = #{checktime}</if>
+ <if test="sendDay != null ">and send_day = #{sendDay}</if>
+ <if test="type != null and type != ''">and type = #{type}</if>
+ <if test="typename != null and typename != ''">and typename like concat('%', #{typename}, '%')</if>
+ <if test="beginTime != null ">and date_format(update_time,'%y%m%d') >= date_format(#{beginTime},'%y%m%d')
+ </if>
+ <if test="endTime != null ">and date_format(update_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d')
+ </if>
+ <if test="deptcode != null and deptcode != ''">
+ and deptcode REGEXP CONCAT('(^|,)', #{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="patCycle != null ">and pat_cycle = #{patCycle}</if>
+ <if test="nexttaskflag != null ">and nexttaskflag = #{nexttaskflag}</if>
+ <if test="nexttaskid != null ">and nexttaskid = #{nexttaskid}</if>
+ <if test="nexttaskname != null ">and nexttaskname = #{nexttaskname}</if>
+ <if test="appltype != null ">and appltype = #{appltype}</if>
+ <if test="diagType != null and diagType != ''">and diag_type = #{diagType}</if>
+ <if test="leavehospitaldistrictname != null ">and leavehospitaldistrictname =
+ #{leavehospitaldistrictname}
+ </if>
+ <if test="leavehospitaldistrictcode != null and leavehospitaldistrictcode != ''">
+ and leavehospitaldistrictcode REGEXP CONCAT('(^|,)', #{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>
order by update_time desc,taskid desc
</select>
@@ -257,6 +255,53 @@
service_task.orgid from service_task
where 1=1
and service_task.del_flag = 0
+ <!-- and taskid in (-->
+ <!-- select task_id from service_taskdept-->
+ <!-- where 1=1-->
+ <!-- <if test="leaveldeptcodes != null and leaveldeptcodes.size()>0">-->
+ <!-- and dept_code in-->
+ <!-- <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","-->
+ <!-- close=")">-->
+ <!-- #{leaveldeptcode}-->
+ <!-- </foreach>-->
+ <!-- </if>-->
+ <!-- )-->
+ <if test="taskName != null and taskName != ''">and service_task.task_name like concat('%', #{taskName},
+ '%')
+ </if>
+ <if test="sendTimeSlot != null and sendTimeSlot != ''">and service_task.send_time_slot like concat('%',
+ #{sendTimeSlot},
+ '%')
+ </if>
+ <if test="templateid != null and templateid != ''">and service_task.templateid = #{templateid}</if>
+ <if test="longTask != null and longTask != ''">and service_task.long_task = #{longTask}</if>
+ <if test="serviceType != null and serviceType != ''">and service_task.service_type = #{serviceType}</if>
+ <if test="templatename != null and templatename != ''">and service_task.templatename like concat('%',
+ #{templatename},
+ '%')
+ </if>
+ <if test="labelinfo != null and labelinfo != ''">and service_task.labelinfo = #{labelinfo}</if>
+ <if test="count != null ">and service_task.count = #{count}</if>
+ <if test="executed != null ">and service_task.executed = #{executed}</if>
+ <if test="unexecuted != null ">and service_task.unexecuted = #{unexecuted}</if>
+ <if test="fail != null ">and service_task.fail = #{fail}</if>
+ <if test="checkuserid != null and checkuserid != ''">and service_task.checkuserid = #{checkuserid}</if>
+ <if test="checkusername != null and checkusername != ''">and service_task.checkusername like concat('%',
+ #{checkusername}, '%')
+ </if>
+ <if test="checktime != null ">and service_task.checktime = #{checktime}</if>
+ <if test="sendDay != null ">and service_task.send_day = #{sendDay}</if>
+ <if test="type != null and type != ''">and service_task.type = #{type}</if>
+ <if test="typename != null and typename != ''">and service_task.typename like concat('%', #{typename},
+ '%')
+ </if>
+ <if test="beginTime != null ">and date_format( service_task.update_time,'%y%m%d') >=
+ date_format(#{beginTime},'%y%m%d')
+ </if>
+ <if test="endTime != null ">and date_format( service_task.update_time,'%y%m%d') <=
+ date_format(#{endTime},'%y%m%d')
+ </if>
+ and service_task.del_flag = 0
<if test="taskName != null and taskName != ''">and service_task.task_name like concat('%', #{taskName},
'%')
</if>
@@ -293,6 +338,33 @@
date_format(#{endTime},'%y%m%d')
</if>
+ <if test="deptcode != null and deptcode != ''">and service_task.deptcode = #{deptcode}</if>
+ <if test="deptname != null and deptname != ''">and service_task.deptname = #{deptname}</if>
+ <if test="isupload != null ">and service_task.isupload = #{isupload}</if>
+ <if test="uploadTime != null ">and service_task.upload_time = #{uploadTime}</if>
+ <if test="orgid != null and orgid != ''">and service_task.orgid = #{orgid}</if>
+ <if test="compensateDate != null and compensateDate != ''">and service_task.compensate_date =
+ #{compensateDate}
+ </if>
+ <if test="hospType != null and hospType != ''">and service_task.hosp_type = #{hospType}</if>
+ <if test="libtemplateid != null ">and service_task.libtemplateid = #{libtemplateid}</if>
+ <if test="libtemplatename != null and libtemplatename != ''">and service_task.libtemplatename =
+ #{libtemplatename}
+ </if>
+ <if test="createBy != null and createBy != ''">and service_task.create_by = #{createBy}</if>
+ <if test="sendState != null ">and service_task.send_state = #{sendState}</if>
+ <if test="compensateDate != null ">and service_task.compensate_date = #{compensateDate}</if>
+ <if test="patCycle != null ">and service_task.pat_cycle = #{patCycle}</if>
+ <if test="nexttaskflag != null ">and nexttaskflag = #{nexttaskflag}</if>
+ <if test="nexttaskid != null ">and nexttaskid = #{nexttaskid}</if>
+ <if test="nexttaskname != null ">and nexttaskname = #{nexttaskname}</if>
+ <if test="appltype != null ">and appltype = #{appltype}</if>
+ <if test="leavehospitaldistrictname != null ">and service_task.leavehospitaldistrictname =
+ #{leavehospitaldistrictname}
+ </if>
+ <if test="leavehospitaldistrictcode != null ">and service_task.leavehospitaldistrictcode =
+ #{leavehospitaldistrictcode}
+ </if>
<if test="deptcode != null and deptcode != ''">and service_task.deptcode = #{deptcode}</if>
<if test="deptname != null and deptname != ''">and service_task.deptname = #{deptname}</if>
<if test="isupload != null ">and service_task.isupload = #{isupload}</if>
@@ -369,7 +441,6 @@
<if test="isupload != null">isupload,</if>
<if test="uploadTime != null">upload_time,</if>
<if test="orgid != null">orgid,</if>
- <if test="campusid != null">campusid,</if>
<if test="pid != null">pid,</if>
<if test="guid != null">guid,</if>
<if test="preachform != null">preachform,</if>
@@ -423,7 +494,6 @@
<if test="isupload != null">#{isupload},</if>
<if test="uploadTime != null">#{uploadTime},</if>
<if test="orgid != null">#{orgid},</if>
- <if test="campusid != null">#{campusid},</if>
<if test="nexttaskflag != null">#{nexttaskflag},</if>
<if test="nexttaskid != null">#{nexttaskid},</if>
<if test="nexttaskname != null">#{nexttaskname},</if>
@@ -484,7 +554,6 @@
<if test="isupload != null">isupload = #{isupload},</if>
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="orgid != null">orgid = #{orgid},</if>
- <if test="campusid != null">campusid = #{campusid},</if>
<if test="nexttaskflag != null">nexttaskflag = #{nexttaskflag},</if>
<if test="nexttaskid != null">nexttaskid = #{nexttaskid},</if>
<if test="nexttaskname != null">nexttaskname = #{nexttaskname},</if>
@@ -541,3 +610,4 @@
</foreach>
</update>
</mapper>
+
--
Gitblit v1.9.3