代码提交

liusheng

昨天 18f876d637cf1e9b0b264a4586e4a676a21f8166

 ruoyi-task/src/main/resources/mapper/task/ServiceTaskMapper.xml

@@ -15,6 +15,7 @@
        <result property="unexecuted" column="unexecuted"/>
        <result property="fail" column="fail"/>
        <result property="sendDay" column="send_day"/>
        <result property="delayFinishDays" column="delay_finish_days"/>
        <result property="checkuserid" column="checkuserid"/>
        <result property="checkusername" column="checkusername"/>
        <result property="checktime" column="checktime"/>
@@ -62,6 +63,8 @@
        <result property="appltype" column="appltype"/>
        <result property="patCycle" column="pat_cycle"/>
        <result property="diagType" column="diag_type"/>
        <!-- 2026-11：点位编码（同德「按点位」需求），建子任务时原样拷到 service_subtask -->
        <result property="pointLocation" column="point_location"/>
    </resultMap>

    <sql id="selectServiceTaskVo">
@@ -70,6 +73,7 @@
               pat_cycle,
               appltype,
               send_day,
               delay_finish_days,
               long_task,
               show_date,
               compensate_date,
@@ -120,7 +124,8 @@
               nexttaskflag,
               nexttaskid,
               nexttaskname,
               diag_type
               diag_type,
               point_location
        from service_task
    </sql>

@@ -206,6 +211,7 @@
        service_task.task_name,
        service_task.appltype,
        service_task.send_day,
        service_task.delay_finish_days,
        service_task.long_task,
        service_task.show_date,
        service_task.compensate_date,
@@ -256,7 +262,8 @@
        service_task.nexttaskid,
        service_task.nexttaskname,
        service_task.orgid,
        service_task.campusid from service_task
        service_task.campusid,
        service_task.point_location from service_task
        where 1=1
        and service_task.del_flag = 0
        <!--            and taskid in (-->
@@ -488,9 +495,11 @@
            <if test="leavehospitaldistrictcode != null  ">leavehospitaldistrictcode,</if>
            <if test="compensateDate != null  and compensateDate != ''">compensate_date,</if>
            <if test="sendDay != null  ">send_day,</if>
            <if test="delayFinishDays != null  ">delay_finish_days,</if>
            <if test="appltype != null  ">appltype,</if>
            <if test="patCycle != null  ">pat_cycle,</if>
            <if test="diagType != null and diagType != ''">diag_type,</if>
            <if test="pointLocation != null and pointLocation != ''">point_location,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="taskName != null">#{taskName},</if>
@@ -543,11 +552,13 @@
            <if test="jsy != null  and jsy != ''">#{jsy},</if>
            <if test="leavehospitaldistrictname != null  ">#{leavehospitaldistrictname},</if>
            <if test="leavehospitaldistrictcode != null  ">#{leavehospitaldistrictcode},</if>
            <if test="compensateDate != null  and compensateDate != ''">#{compensateDate}</if>
            <if test="compensateDate != null  and compensateDate != ''">#{compensateDate},</if>
            <if test="sendDay != null  ">#{sendDay},</if>
            <if test="delayFinishDays != null  ">#{delayFinishDays},</if>
            <if test="appltype != null  ">#{appltype},</if>
            <if test="patCycle != null  ">#{patCycle},</if>
            <if test="diagType != null and diagType != ''">#{diagType},</if>
            <if test="pointLocation != null and pointLocation != ''">#{pointLocation},</if>
        </trim>
    </insert>

@@ -608,9 +619,11 @@
            </if>
            <if test="compensateDate != null  and compensateDate != ''">compensate_date = #{compensateDate},</if>
            <if test="sendDay != null  ">send_day = #{sendDay},</if>
            <if test="delayFinishDays != null  ">delay_finish_days = #{delayFinishDays},</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>
            <if test="pointLocation != null and pointLocation != ''">point_location = #{pointLocation},</if>
        </trim>
        where taskid = #{taskid}
    </update>