From 03cceb276da695690b0b2b41e85a07f45b958aaa Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 18 Feb 2022 12:30:19 +0800
Subject: [PATCH] 任务下发人员调整

---
 src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 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 63c1085..8332f23 100644
--- a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
+++ b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.modules.taskqd.mapper.TaskqdMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="taskResultMap" type="org.springblade.modules.taskqd.entity.Taskqd">
+    <resultMap id="taskResultMap" type="org.springblade.modules.taskqd.vo.TaskqdVO">
         <id column="id" property="id"/>
         <result column="rname" property="rname"/>
         <result column="content" property="content"/>
@@ -17,6 +17,10 @@
         <result column="serid" property="serid"/>
         <result column="integral" property="integral"/>
         <result column="url" property="url"/>
+        <result column="captain" property="captain"/>
+        <result column="team" property="team"/>
+        <result column="iscation" property="iscation"/>
+        <result column="publisher" property="publisher"/>
     </resultMap>
 
 
@@ -24,25 +28,42 @@
         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>
         where id = #{id}
     </update>
 
 
     <!--日常任务列表-->
     <select id="selectList" resultMap="taskResultMap">
-        select jnum, num, serid
+        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>
 
     <select id="selectLi" resultMap="taskResultMap">
+        SELECT A.*,IFNULL(B.num,0) as nums FROM (
         select * from sys_taskqd where 1=1
         <if test="type==0">
-            and find_in_set(#{serid}, serid);
+            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 ) );
+            and id NOT IN ( SELECT id FROM sys_taskqd WHERE 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>
     </select>
 </mapper>

--
Gitblit v1.9.3