From d1568a5f8f11345e027c8feed27215568607cda0 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 17 三月 2026 10:40:13 +0800
Subject: [PATCH] 查询宣教分类列表,删除分页

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

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
index 5110723..8c3bdf7 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
@@ -60,6 +60,7 @@
         <result property="nexttaskname" column="nexttaskname"/>
         <result property="appltype" column="appltype"/>
         <result property="patCycle" column="pat_cycle"/>
+        <result property="diagType" column="diag_type"/>
     </resultMap>
 
     <sql id="selectServiceTaskVo">
@@ -116,14 +117,15 @@
                orgid,
                nexttaskflag,
                nexttaskid,
-               nexttaskname
+               nexttaskname,
+               diag_type
         from service_task
     </sql>
 
     <select id="selectServiceTaskList" parameterType="com.smartor.domain.ServiceTask" resultMap="ServiceTaskResult">
         <include refid="selectServiceTaskVo"/>
-        <where>
-            del_flag=0
+        where 1=1
+            and del_flag = 0
             <if test="taskName != null  and taskName != ''">and task_name like concat('%', #{taskName}, '%')</if>
             <if test="taskid != null">and taskid = #{taskid}</if>
             <if test="sendTimeSlot != null  and sendTimeSlot != ''">and send_time_slot like concat('%', #{sendTimeSlot},
@@ -152,8 +154,9 @@
             </if>
             <if test="endTime != null ">and date_format(update_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
             </if>
-
-            <if test="deptcode != null  and deptcode != ''">and deptcode = #{deptcode}</if>
+            <if test="deptcode != null  and deptcode != ''">
+                and deptcode REGEXP CONCAT('(^|,)', #{deptcode}, '(,|$)')
+            </if>
             <if test="deptname != null  and deptname != ''">and deptname = #{deptname}</if>
             <if test="isupload != null ">and isupload = #{isupload}</if>
             <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
@@ -170,13 +173,13 @@
             <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="diagType != null and diagType != ''">and diag_type = #{diagType}</if>
             <if test="leavehospitaldistrictname != null  ">and leavehospitaldistrictname =
                 #{leavehospitaldistrictname}
             </if>
-            <if test="leavehospitaldistrictcode != null  ">and leavehospitaldistrictcode =
-                #{leavehospitaldistrictcode}
+            <if test="leavehospitaldistrictcode != null  and leavehospitaldistrictcode != ''">
+                and leavehospitaldistrictcode REGEXP CONCAT('(^|,)', #{leavehospitaldistrictcode}, '(,|$)')
             </if>
-
             <if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size()>0">
                 AND leavehospitaldistrictcode IN
                 <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
@@ -191,7 +194,6 @@
                     #{leaveldeptcode}
                 </foreach>
             </if>
-        </where>
         order by update_time desc,taskid desc
     </select>
 
@@ -251,19 +253,18 @@
         service_task.nexttaskid,
         service_task.nexttaskname,
         service_task.orgid from service_task
-        <where>
-            service_task.del_flag=0
+        where 1=1
+            and service_task.del_flag = 0
             <!--            and taskid in (-->
             <!--            select task_id from service_taskdept-->
-            <!--            <where>-->
+            <!--            where 1=1-->
             <!--                <if test="leaveldeptcodes != null and leaveldeptcodes.size()>0">-->
-            <!--                    dept_code in-->
+            <!--                    and 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},
                 '%')
@@ -328,8 +329,6 @@
             <if test="leavehospitaldistrictcode != null  ">and service_task.leavehospitaldistrictcode =
                 #{leavehospitaldistrictcode}
             </if>
-
-        </where>
         order by update_time desc,taskid desc
     </select>
 
@@ -392,6 +391,7 @@
             <if test="sendDay != null  ">send_day,</if>
             <if test="appltype != null  ">appltype,</if>
             <if test="patCycle != null  ">pat_cycle,</if>
+            <if test="diagType != null and diagType != ''">diag_type,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="taskName != null">#{taskName},</if>
@@ -447,6 +447,7 @@
             <if test="sendDay != null  ">#{sendDay},</if>
             <if test="appltype != null  ">#{appltype},</if>
             <if test="patCycle != null  ">#{patCycle},</if>
+            <if test="diagType != null and diagType != ''">#{diagType},</if>
         </trim>
     </insert>
 
@@ -508,6 +509,7 @@
             <if test="sendDay != null  ">send_day = #{sendDay},</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>
         </trim>
         where taskid = #{taskid}
     </update>

--
Gitblit v1.9.3