From 0a4fbcd9d997005bda2b5ac5dc9daa586342d7db Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 25 Feb 2022 14:43:11 +0800
Subject: [PATCH] 任务数量统计

---
 src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml |   29 ++++++++++++++++++++---------
 1 files changed, 20 insertions(+), 9 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 ef86d1c..85052d2 100644
--- a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
+++ b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
@@ -23,6 +23,11 @@
         <result column="publisher" property="publisher"/>
         <result column="fid" property="fid"/>
         <result column="fname" property="fname"/>
+        <result column="gather" property="gather"/>
+        <result column="gathername" property="gathername"/>
+        <result column="tasktype" property="tasktype"/>
+        <result column="phone" property="phone"/>
+        <result column="train" property="train"/>
     </resultMap>
 
 
@@ -53,9 +58,11 @@
     </select>
 
     <select id="queryReceiver" resultType="java.util.HashMap">
-        SELECT *
+        SELECT u.* ,
+	    r.role_name
         FROM blade_user
-        WHERE id in (${serid})
+        LEFT JOIN ( SELECT id, role_name FROM blade_role ) r on u.role_id = r.id
+        WHERE u.id in (${serid})
     </select>
 
     <select id="selectLi" resultMap="taskResultMap">
@@ -67,7 +74,7 @@
         </if>
         <if test="type==1">
             <if test="jurisdiction!='1372091709474910209'">
-                qd.jnum!=qd.num
+                qd.jnum!=qd.num AND qd.rtype = "2"
                 and (!find_in_set(#{serid}, serid) OR serid IS NULL )
                 and (j.id =#{jurisdiction} or
                 j.parent_id = #{jurisdiction})
@@ -78,14 +85,18 @@
         </if>
     </select>
 
-    <select id="selectNum" resultType="java.lang.Integer">
-        SELECT COUNT(*) as num
+    <select id="selectNum" resultType="java.util.HashMap">
+        SELECT COUNT(*) as num,tasktype
         FROM sys_taskqd qd
                  LEFT JOIN sys_jurisdiction j ON j.id = qd.jurisdiction
-        WHERE jnum!=num AND
+        WHERE jnum!=num AND qd.rtype = "2" AND
            (!find_in_set(#{serid}, serid) OR serid IS NULL )
-          and (j.id =#{jurisdiction}
-           or
-            j.parent_id = #{jurisdiction})
+          and (j.id =#{jurisdiction} or j.parent_id = #{jurisdiction})
+          or (j.id =#{workjurisdiction} or j.parent_id = #{workjurisdiction})
+        GROUP BY tasktype
+    </select>
+
+    <select id="querySerid" resultType="java.lang.String">
+        SELECT serid from sys_taskqd where id = #{rid}
     </select>
 </mapper>

--
Gitblit v1.9.3