From 1468abbfadd8ba623c85e0c871aade69607ce085 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 25 二月 2025 14:24:54 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml |   31 ++++++++++++++++++++++++++++++-
 1 files changed, 30 insertions(+), 1 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
index b29b82d..b35d738 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
@@ -54,11 +54,16 @@
         <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"/>
+        <result property="appltype" column="appltype"/>
     </resultMap>
 
     <sql id="selectServiceTaskVo">
         select taskid,
                task_name,
+               appltype,
                send_day,
                long_task,
                show_date,
@@ -104,7 +109,10 @@
                jsy,
                leavehospitaldistrictcode,
                leavehospitaldistrictname,
-               orgid
+               orgid,
+               nexttaskflag,
+                nexttaskid,
+                nexttaskname
         from service_task
     </sql>
 
@@ -154,6 +162,10 @@
             <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="appltype != null  ">and appltype = #{appltype}</if>
             <if test="leavehospitaldistrictname != null  ">and leavehospitaldistrictname =
                 #{leavehospitaldistrictname}
             </if>
@@ -183,6 +195,7 @@
             resultMap="ServiceTaskResult">
         select service_task.taskid,
         service_task.task_name,
+        service_task.appltype,
         service_task.send_day,
         service_task.long_task,
         service_task.show_date,
@@ -229,6 +242,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 +313,10 @@
             <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>
@@ -364,6 +384,7 @@
             <if test="leavehospitaldistrictcode != null  ">leavehospitaldistrictcode,</if>
             <if test="compensateDate != null  and compensateDate != ''">compensate_date,</if>
             <if test="sendDay != null  ">send_day,</if>
+            <if test="appltype != null  ">appltype,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="taskName != null">#{taskName},</if>
@@ -389,6 +410,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>
@@ -413,6 +437,7 @@
             <if test="leavehospitaldistrictcode != null  ">#{leavehospitaldistrictcode},</if>
             <if test="compensateDate != null  and compensateDate != ''">#{compensateDate}</if>
             <if test="sendDay != null  ">#{sendDay},</if>
+            <if test="appltype != null  ">#{appltype},</if>
         </trim>
     </insert>
 
@@ -442,6 +467,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>
@@ -468,6 +496,7 @@
             </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>
         </trim>
         where taskid = #{taskid}
     </update>

--
Gitblit v1.9.3