【市一】调整mapper获取ordid

陈昶聿

5 天以前 987e38327f849e1b13d8541246dde08d877db0e8

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

@@ -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"/>
@@ -58,11 +59,13 @@
        <result property="nexttaskid" column="nexttaskid"/>
        <result property="nexttaskname" column="nexttaskname"/>
        <result property="appltype" column="appltype"/>
        <result property="patCycle" column="pat_cycle"/>
    </resultMap>

    <sql id="selectServiceTaskVo">
        select taskid,
               task_name,
               pat_cycle,
               appltype,
               send_day,
               long_task,
@@ -77,6 +80,7 @@
               text_param,
               templateid,
               templatename,
               preachform_desc,
               labelinfo,
               count,
               executed,
@@ -118,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>
@@ -148,8 +154,9 @@
            </if>
            <if test="endTime != null ">and date_format(update_time,'%y%m%d') &lt;= 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>
@@ -169,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>

@@ -233,6 +239,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,
@@ -246,33 +253,35 @@
        service_task.nexttaskid,
        service_task.nexttaskname,
        service_task.orgid from service_task
        <where>
            service_task.del_flag=0
<!--            and taskid in (-->
<!--            select task_id from service_taskdept-->
<!--            <where>-->
<!--                <if test="leaveldeptcodes != null and leaveldeptcodes.size()>0">-->
<!--                    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},
                '%')
        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 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=","-->
            <!--                             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 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>
@@ -287,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') &gt;=
                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') &lt;=
                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>
@@ -324,13 +333,13 @@
                #{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"
@@ -363,6 +372,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>
@@ -385,6 +395,7 @@
            <if test="compensateDate != null  and compensateDate != ''">compensate_date,</if>
            <if test="sendDay != null  ">send_day,</if>
            <if test="appltype != null  ">appltype,</if>
            <if test="patCycle != null  ">pat_cycle,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="taskName != null">#{taskName},</if>
@@ -416,6 +427,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>
@@ -438,6 +450,7 @@
            <if test="compensateDate != null  and compensateDate != ''">#{compensateDate}</if>
            <if test="sendDay != null  ">#{sendDay},</if>
            <if test="appltype != null  ">#{appltype},</if>
            <if test="patCycle != null  ">#{patCycle},</if>
        </trim>
    </insert>

@@ -473,6 +486,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>
@@ -494,9 +508,10 @@
            </if>
            <if test="leavehospitaldistrictcode != null  ">leavehospitaldistrictcode = #{leavehospitaldistrictcode},
            </if>
            <if test="compensateDate != null  and compensateDate != ''">compensate_date = #{compensateDate}</if>
            <if test="sendDay != null  ">send_day = #{sendDay}</if>
            <if test="appltype != null  ">appltype = #{appltype}</if>
            <if test="compensateDate != null  and compensateDate != ''">compensate_date = #{compensateDate},</if>
            <if test="sendDay != null  ">send_day = #{sendDay},</if>
            <if test="appltype != null  ">appltype = #{appltype},</if>
            <if test="patCycle != null  ">pat_cycle = #{patCycle},</if>
        </trim>
        where taskid = #{taskid}
    </update>