新增Orgid

liusheng

2025-10-21 2d1db09ab80b4f164ca9dd66b18d0992203fa417

 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,
@@ -111,8 +115,8 @@
               leavehospitaldistrictname,
               orgid,
               nexttaskflag,
                nexttaskid,
                nexttaskname
               nexttaskid,
               nexttaskname
        from service_task
    </sql>

@@ -233,6 +237,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,18 +253,18 @@
        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>
            )
            <!--            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},
                '%')
            </if>
@@ -330,7 +335,7 @@

    <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 +368,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 +391,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 +423,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 +446,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>

@@ -467,12 +476,13 @@
            <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="nexttaskflag != null">nexttaskflag = #{nexttaskflag},</if>
            <if test="nexttaskid != null">nexttaskid = #{nexttaskid},</if>
            <if test="nexttaskname != null">nexttaskname = #{nexttaskname},</if>
            <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 +504,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>