From 4c19ddd36bdfb43b5ef4e8df3c9a98cd4d356d6c Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 26 May 2022 10:55:04 +0800
Subject: [PATCH] 1、资讯模糊匹配修改

---
 src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml |   54 +++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
index a44cdcb..9e3ac8e 100644
--- a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
+++ b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
@@ -49,12 +49,49 @@
         where id = #{rid}
     </update>
 
+    <update id="updateSerid">
+        update sys_taskqd
+        SET serid=#{serid},team=#{newteam},num=#{newnum}
+        where id = #{rid}
+    </update>
 
     <!--日常任务列表-->
+    <select id="getlist" resultMap="taskResultMap">
+        SELECT
+        *
+        FROM
+        sys_taskqd
+        WHERE
+        serid LIKE concat("%",#{id},"%")
+        <if test="type == 3">
+            and rtype = 1
+        </if>
+        <if test="type == 2">
+            AND ( rtype = "0" OR rtype = "2" )
+        </if>
+    </select>
+
+    <!--任务统计-->
     <select id="selectList" resultMap="taskResultMap">
-        select jnum, num, serid, team
+        select jnum, num, serid, team ,time,endtime
         from sys_taskqd
         where id = #{id}
+    </select>
+    <select id="taskCount" resultType="java.util.HashMap">
+        SELECT
+            count( * ) AS count
+        FROM
+            sys_taskqd
+        WHERE
+            serid LIKE  concat("%",#{id},"%")
+            AND rtype = "1" UNION ALL
+        SELECT
+            count( * ) AS count
+        FROM
+            sys_taskqd
+        WHERE
+            serid LIKE concat("%",#{id},"%")
+            AND ( rtype = "0" OR rtype = "2" )
     </select>
 
     <select id="queryReceiver" resultType="java.util.HashMap">
@@ -70,13 +107,15 @@
         select qd.* from sys_taskqd qd LEFT JOIN sys_jurisdiction j ON j.id = qd.jurisdiction where 1=1 AND
         <if test="type==0">
             (qd.rtype = "2" or qd.rtype = "0") AND
-            find_in_set(#{serid}, serid) and qd.tasktype=#{tasktype}) A LEFT JOIN (SELECT COUNT(*) as num,hdid,serid FROM
+            find_in_set(#{serid}, serid) and qd.tasktype=#{tasktype}) A LEFT JOIN (SELECT COUNT(*) as num,hdid,serid
+            FROM
             sys_taskfk WHERE
             serid=#{serid} GROUP BY hdid,serid) B ON A.id=B.hdid
         </if>
         <if test="type==2">
             qd.rtype = "1" AND
-            find_in_set(#{serid}, serid) and qd.tasktype=#{tasktype}) A LEFT JOIN (SELECT COUNT(*) as num,hdid,serid FROM
+            find_in_set(#{serid}, serid) and qd.tasktype=#{tasktype}) A LEFT JOIN (SELECT COUNT(*) as num,hdid,serid
+            FROM
             sys_taskfk WHERE
             serid=#{serid} GROUP BY hdid,serid) B ON A.id=B.hdid
         </if>
@@ -88,9 +127,10 @@
                 qd.rtype = "2"
                 and qd.tasktype=#{tasktype}
                 and (!find_in_set(#{serid}, serid) OR serid IS NULL )
-                and (j.id =#{jurisdiction} or
+                and
+                ((j.id =#{jurisdiction} or
                 j.parent_id = #{jurisdiction}) or (j.id =#{workjurisdiction} or
-                j.parent_id = #{workjurisdiction})
+                j.parent_id = #{workjurisdiction}))
             </if>
             ) A LEFT JOIN (SELECT
             COUNT(*)
@@ -106,10 +146,10 @@
            (!find_in_set(#{serid}
             , serid)
            OR serid IS NULL )
-          and (j.id =#{jurisdiction}
+          and ((j.id =#{jurisdiction}
            or j.parent_id = #{jurisdiction})
            or (j.id =#{workjurisdiction}
-           or j.parent_id = #{workjurisdiction})
+           or j.parent_id = #{workjurisdiction}))
         GROUP BY tasktype
     </select>
 

--
Gitblit v1.9.3