smartor.git - Gitblit

			@@ -33,6 +33,7 @@
			<result property="pid" column="pid"/>
			<result property="guid" column="guid"/>
			<result property="preachform" column="preachform"/>
			<result property="preachformDesc" column="preachform_desc"/>
			<result property="sendType" column="send_type"/>
			<result property="sendState" column="send_state"/>
			<result property="hospType" column="hosp_type"/>
			@@ -79,6 +80,7 @@
			text_param,
			templateid,
			templatename,
			preachform_desc,
			labelinfo,
			count,
			executed,
			@@ -120,8 +122,8 @@

			<select id="selectServiceTaskList" parameterType="com.smartor.domain.ServiceTask" resultMap="ServiceTaskResult">
			<include refid="selectServiceTaskVo"/>
			<where>
			del_flag=0
			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},
			@@ -150,8 +152,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>
			@@ -171,10 +174,9 @@
			<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=","
			@@ -189,7 +191,6 @@
			#{leaveldeptcode}
			</foreach>
			</if>
			</where>
			order by update_time desc,taskid desc
			</select>

			@@ -235,6 +236,7 @@
			service_task.pid,
			service_task.guid,
			service_task.preachform,
			service_task.preachform_desc,
			service_task.send_type,
			service_task.send_state,
			service_task.send_time_slot,
			@@ -248,19 +250,18 @@
			service_task.nexttaskid,
			service_task.nexttaskname,
			service_task.orgid from service_task
			<where>
			service_task.del_flag=0
			where 1=1
			and service_task.del_flag = 0
			<!-- and taskid in (-->
			<!-- select task_id from service_taskdept-->
			<!-- <where>-->
			<!-- where 1=1-->
			<!-- <if test="leaveldeptcodes != null and leaveldeptcodes.size()>0">-->
			<!-- dept_code in-->
			<!-- and dept_code in-->
			<!-- <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","-->
			<!-- close=")">-->
			<!-- #{leaveldeptcode}-->
			<!-- </foreach>-->
			<!-- </if>-->
			<!-- </where>-->
			<!-- )-->
			<if test="taskName != null and taskName != ''">and service_task.task_name like concat('%', #{taskName},
			'%')
			@@ -325,14 +326,12 @@
			<if test="leavehospitaldistrictcode != null ">and service_task.leavehospitaldistrictcode =
			#{leavehospitaldistrictcode}
			</if>

			</where>
			order by update_time desc,taskid desc
			</select>

			<select id="selectServiceTaskByTaskid" parameterType="Long" resultMap="ServiceTaskResult">
			<include refid="selectServiceTaskVo"/>
			where taskid = #{taskid}
			where taskid = #{taskid} and del_flag=0
			</select>

			<insert id="insertServiceTask" parameterType="com.smartor.domain.ServiceTask" useGeneratedKeys="true"
			@@ -365,6 +364,7 @@
			<if test="pid != null">pid,</if>
			<if test="guid != null">guid,</if>
			<if test="preachform != null">preachform,</if>
			<if test="preachformDesc != null">preachform_desc,</if>
			<if test="sendType != null">send_type,</if>
			<if test="sendState != null">send_state,</if>
			<if test="hospType != null and hospType != ''">hosp_type,</if>
			@@ -419,6 +419,7 @@
			<if test="pid != null">#{pid},</if>
			<if test="guid != null">#{guid},</if>
			<if test="preachform != null">#{preachform},</if>
			<if test="preachformDesc != null">#{preachformDesc},</if>
			<if test="sendType != null">#{sendType},</if>
			<if test="sendState != null">#{sendState},</if>
			<if test="hospType != null and hospType != ''">#{hospType},</if>
			@@ -477,6 +478,7 @@
			<if test="pid != null">pid = #{pid},</if>
			<if test="guid != null">guid = #{guid},</if>
			<if test="preachform != null">preachform = #{preachform},</if>
			<if test="preachformDesc != null">preachform_desc = #{preachformDesc},</if>
			<if test="sendType != null">send_type = #{sendType},</if>
			<if test="sendState != null">send_state = #{sendState},</if>
			<if test="hospType != null and hospType != ''">hosp_type = #{hospType},</if>