Merge remote-tracking branch 'origin/master'

liusheng

2025-02-19 a0e46d75fd50924c8e9ac0cf24a8daa0471bbed2

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

@@ -54,6 +54,9 @@
        <result property="leavehospitaldistrictcode" column="leavehospitaldistrictcode"/>
        <result property="leavehospitaldistrictname" column="leavehospitaldistrictname"/>
        <result property="compensateDate" column="compensate_date"/>
        <result property="nexttaskflag" column="nexttaskflag"/>
        <result property="nexttaskid" column="nexttaskid"/>
        <result property="nexttaskname" column="nexttaskname"/>
    </resultMap>

    <sql id="selectServiceTaskVo">
@@ -104,7 +107,10 @@
               jsy,
               leavehospitaldistrictcode,
               leavehospitaldistrictname,
               orgid
               orgid,
               nexttaskflag,
                nexttaskid,
                nexttaskname
        from service_task
    </sql>

@@ -154,6 +160,9 @@
            <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="leavehospitaldistrictname != null  ">and leavehospitaldistrictname =
                #{leavehospitaldistrictname}
            </if>
@@ -229,6 +238,9 @@
        service_task.leavehospitaldistrictcode,
        service_task.leavehospitaldistrictname,
        service_task.pat_cycle,
        service_task.nexttaskflag,
        service_task.nexttaskid,
        service_task.nexttaskname,
        service_task.orgid from service_task
        <where>
            service_task.del_flag=0
@@ -297,6 +309,9 @@
            <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="leavehospitaldistrictname != null  ">and service_task.leavehospitaldistrictname =
                #{leavehospitaldistrictname}
            </if>
@@ -389,6 +404,9 @@
            <if test="isupload != null">#{isupload},</if>
            <if test="uploadTime != null">#{uploadTime},</if>
            <if test="orgid != null">#{orgid},</if>
            <if test="nexttaskflag != null">#{nexttaskflag},</if>
            <if test="nexttaskid != null">#{nexttaskid},</if>
            <if test="nexttaskname != null">#{nexttaskname},</if>
            <if test="pid != null">#{pid},</if>
            <if test="guid != null">#{guid},</if>
            <if test="preachform != null">#{preachform},</if>
@@ -442,6 +460,9 @@
            <if test="isupload != null">isupload = #{isupload},</if>
            <if test="uploadTime != null">upload_time = #{uploadTime},</if>
            <if test="orgid != null">orgid = #{orgid},</if>
            <if test="nexttaskflag != null">#{nexttaskflag},</if>
            <if test="nexttaskid != null">#{nexttaskid},</if>
            <if test="nexttaskname != null">#{nexttaskname},</if>
            <if test="pid != null">pid = #{pid},</if>
            <if test="guid != null">guid = #{guid},</if>
            <if test="preachform != null">preachform = #{preachform},</if>