From 228d63dfa0a3dd4d085c5dc1476c5a629fe998b3 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 18 Feb 2022 16:06:49 +0800
Subject: [PATCH] 任务管理

---
 src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml |   31 +++++++++++++++----------------
 1 files changed, 15 insertions(+), 16 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 8332f23..0d2d028 100644
--- a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
+++ b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
@@ -27,42 +27,41 @@
     <update id="updatet">
         update sys_taskqd
         SET serid=#{serid},
-            num=#{num}
-            <if test="param4!='' and param4!=null">
-                ,captain =#{param4}
-            </if>
-            <if test="param5!='' and param5!=null">
-                ,team =#{param5}
-            </if>
+        num=#{num}
+        <if test="param4!='' and param4!=null">
+            ,captain =#{param4}
+        </if>
+        <if test="param5!='' and param5!=null">
+            ,team =#{param5}
+        </if>
         where id = #{id}
     </update>
 
 
     <!--日常任务列表-->
     <select id="selectList" resultMap="taskResultMap">
-        select jnum, num, serid,team
+        select jnum, num, serid, team
         from sys_taskqd
         where id = #{id}
     </select>
 
     <select id="queryReceiver" resultType="java.util.HashMap">
-        SELECT
-            *
-        FROM
-            blade_user
-        WHERE
-            id in ( ${serid} )
+        SELECT *
+        FROM blade_user
+        WHERE id in (${serid})
     </select>
 
     <select id="selectLi" resultMap="taskResultMap">
         SELECT A.*,IFNULL(B.num,0) as nums FROM (
-        select * from sys_taskqd where 1=1
+        select qd.* from sys_taskqd LEFT JOIN sys_jurisdiction j ON j.id = qd.jurisdiction where 1=1
         <if test="type==0">
             and find_in_set(#{serid}, serid)) 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==1">
-            and id NOT IN ( SELECT id FROM sys_taskqd WHERE find_in_set(#{serid}, serid ))) A LEFT JOIN (SELECT COUNT(*)
+            and id NOT IN ( SELECT id FROM sys_taskqd WHERE find_in_set(#{serid}, serid )) and (j.id =#{jurisdiction} or
+            j.parent_id = #{jurisdiction}) AND qd.jnum!=qd.num ) 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>
     </select>

--
Gitblit v1.9.3