From e00ef99886b9ab84f39c81432f8c7640e93026f9 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 27 二月 2025 15:54:30 +0800
Subject: [PATCH] 代码提交

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

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
index fa56374..3970f13 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
@@ -57,11 +57,13 @@
         <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,
@@ -109,8 +111,8 @@
                leavehospitaldistrictname,
                orgid,
                nexttaskflag,
-                nexttaskid,
-                nexttaskname
+               nexttaskid,
+               nexttaskname
         from service_task
     </sql>
 
@@ -163,6 +165,7 @@
             <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>
@@ -192,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,
@@ -244,18 +248,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>
@@ -312,6 +316,7 @@
             <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>
@@ -379,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>
@@ -431,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>
 
@@ -460,9 +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="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>
@@ -489,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