smartor.git - Gitblit

			@@ -122,18 +122,20 @@

			<select id="selectServiceTaskList" parameterType="com.smartor.domain.ServiceTask" resultMap="ServiceTaskResult">
			<include refid="selectServiceTaskVo"/>
			<where>
			del_flag=0
			WHERE 1=1
			<if test="orgid != null and orgid != ''"> and orgid = #{orgid}</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 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 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>
			@@ -152,8 +154,9 @@
			</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 = #{deptcode}</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>
			@@ -173,25 +176,24 @@
			<if test="leavehospitaldistrictname != null ">and leavehospitaldistrictname =
			#{leavehospitaldistrictname}
			</if>
			<if test="leavehospitaldistrictcode != null ">and leavehospitaldistrictcode =
			#{leavehospitaldistrictcode}
			<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=")">
			AND close=")">
			#{leavehospitaldistrictcode}
			</foreach>
			</if>
			<if test="leaveldeptcodes != null and leaveldeptcodes.size()>0">
			AND deptcode IN
			<foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
			close=")">
			AND close=")">
			#{leaveldeptcode}
			</foreach>
			</if>
			</where>

			order by update_time desc,taskid desc
			</select>

			@@ -251,11 +253,15 @@
			service_task.nexttaskid,
			service_task.nexttaskname,
			service_task.orgid from service_task
			<where>
			service_task.del_flag=0
			WHERE 1=1
			<if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>

			AND service_task.del_flag=0
			<!-- and taskid in (-->
			<!-- select task_id from service_taskdept-->
			<!-- <where>-->
			<!-- WHERE 1=1
			<if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
			-->
			<!-- <if test="leaveldeptcodes != null and leaveldeptcodes.size()>0">-->
			<!-- dept_code in-->
			<!-- <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","-->
			@@ -263,21 +269,19 @@
			<!-- #{leaveldeptcode}-->
			<!-- </foreach>-->
			<!-- </if>-->
			<!-- </where>-->
			<!-- -->
			<!-- )-->
			<if test="taskName != null and taskName != ''">and service_task.task_name like concat('%', #{taskName},
			'%')
			<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 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 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>
			@@ -292,13 +296,13 @@
			<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')
			AND 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')
			AND date_format(#{endTime},'%y%m%d')
			</if>

			<if test="deptcode != null and deptcode != ''">and service_task.deptcode = #{deptcode}</if>
			@@ -329,7 +333,7 @@
			#{leavehospitaldistrictcode}
			</if>

			</where>

			order by update_time desc,taskid desc
			</select>