代码提交

liusheng

2 天以前 28446c1489c8977d634e7a39dbbc96967e22c6f1

 smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml

@@ -60,6 +60,7 @@
        <result property="nexttaskname" column="nexttaskname"/>
        <result property="appltype" column="appltype"/>
        <result property="patCycle" column="pat_cycle"/>
        <result property="diagType" column="diag_type"/>
    </resultMap>

    <sql id="selectServiceTaskVo">
@@ -116,7 +117,8 @@
               orgid,
               nexttaskflag,
               nexttaskid,
               nexttaskname
               nexttaskname,
               diag_type
        from service_task
    </sql>

@@ -171,6 +173,7 @@
            <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>
@@ -251,81 +254,84 @@
        service_task.nexttaskname,
        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') &gt;=
                date_format(#{beginTime},'%y%m%d')
            </if>
            <if test="endTime != null ">and date_format( service_task.update_time,'%y%m%d') &lt;=
                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>
        <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') &gt;=
            date_format(#{beginTime},'%y%m%d')
        </if>
        <if test="endTime != null ">and date_format( service_task.update_time,'%y%m%d') &lt;=
            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 =
        <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="leavehospitaldistrictcodes!=null and leavehospitaldistrictcodes.size()>0">
            AND service_task.leavehospitaldistrictcode IN
            <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
                     close=")">
                #{leavehospitaldistrictcode}
            </if>
            </foreach>
        </if>
        <if test="leaveldeptcodes!=null and leaveldeptcodes.size()>0">
            AND service_task.deptcode IN
            <foreach collection="leaveldeptcodes" item="deptcode" open="(" separator=","
                     close=")">
                #{deptcode}
            </foreach>
        </if>
        <if test="leavehospitaldistrictcode != null  ">and service_task.leavehospitaldistrictcode =
            #{leavehospitaldistrictcode}
        </if>
        order by update_time desc,taskid desc
    </select>

@@ -388,6 +394,7 @@
            <if test="sendDay != null  ">send_day,</if>
            <if test="appltype != null  ">appltype,</if>
            <if test="patCycle != null  ">pat_cycle,</if>
            <if test="diagType != null and diagType != ''">diag_type,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="taskName != null">#{taskName},</if>
@@ -443,6 +450,7 @@
            <if test="sendDay != null  ">#{sendDay},</if>
            <if test="appltype != null  ">#{appltype},</if>
            <if test="patCycle != null  ">#{patCycle},</if>
            <if test="diagType != null and diagType != ''">#{diagType},</if>
        </trim>
    </insert>

@@ -504,6 +512,7 @@
            <if test="sendDay != null  ">send_day = #{sendDay},</if>
            <if test="appltype != null  ">appltype = #{appltype},</if>
            <if test="patCycle != null  ">pat_cycle = #{patCycle},</if>
            <if test="diagType != null and diagType != ''">diag_type = #{diagType},</if>
        </trim>
        where taskid = #{taskid}
    </update>