From 614a629c551e6b62fe083e6d94ef40c4b6cc56ea Mon Sep 17 00:00:00 2001
From: "yang.yongquan" <3395816735@qq.com>
Date: Mon, 11 Jul 2022 16:36:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86SQL=E8=AF=AD?=
 =?UTF-8?q?=E5=8F=A5=EF=BC=8C=E5=B0=86=E6=9C=AA=E6=9F=A5=E8=AF=A2=E5=88=B0?=
 =?UTF-8?q?=E7=9A=84=E9=83=A8=E5=88=86=E5=9C=A8=E5=90=8E=E7=AB=AF=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E8=BF=94=E5=9B=9E=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TaskServiceImpl.java         | 24 ++++++++++++++++++-
 src/main/resources/mapper/TaskMapper.xml      | 13 ++++------
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/TaskServiceImpl.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/TaskServiceImpl.java
index e121674..03b37ee 100644
--- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/TaskServiceImpl.java
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/TaskServiceImpl.java
@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.validation.constraints.NotNull;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
@@ -125,7 +126,28 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements IT
         if (projectGroupService.getProjectAccessLevel(token, projectId) == 0) {
             throw new ForbiddenException(IProjectGroupService.UNABLE_TO_ACCESS_PROJECT);
         }
-        return baseMapper.selectProjectProcessOfStaff(projectId, staffId);
+        List<StaffProcessDTO> resList = baseMapper.selectProjectProcessOfStaff(projectId, staffId);
+        addResultProjectProcess(resList, Task.TYPE_ASSIGNMENT);
+        addResultProjectProcess(resList, Task.TYPE_DEFECT);
+        addResultProjectProcess(resList, Task.TYPE_DEMAND);
+        return resList;
+    }
+
+    @NotNull
+    private void addResultProjectProcess(List<StaffProcessDTO> resList, String projectType) {
+        Boolean typeExist = false;
+        for(StaffProcessDTO staffProcessDTO: resList) {
+            if(Objects.equals(staffProcessDTO.getTaskType(), projectType)) {
+                typeExist = true;
+            }
+        }
+        if(!typeExist) {
+            StaffProcessDTO staffProcessDTO = new StaffProcessDTO();
+            staffProcessDTO.setTaskType(projectType);
+            staffProcessDTO.setCompleteNum(0L);
+            staffProcessDTO.setTotalNum(0L);
+            resList.add(staffProcessDTO);
+        }
     }
 
     @Override
diff --git a/src/main/resources/mapper/TaskMapper.xml b/src/main/resources/mapper/TaskMapper.xml
index 08a8a95..092d166 100644
--- a/src/main/resources/mapper/TaskMapper.xml
+++ b/src/main/resources/mapper/TaskMapper.xml
@@ -33,20 +33,17 @@
     </select>
     <select id="selectProjectProcessOfStaff"
             resultType="cn.edu.hfut.rmdjzz.projectmanagement.entity.dto.StaffProcessDTO">
-        SELECT t2.task_type,
-        IF(complete_num IS NULL, 0, complete_num) AS complete_num,
-        IF(total_num IS NULL, 0, total_num) AS total_num
-        FROM (SELECT task_type,
+        SELECT task_type,
         SUM(IF(task_status = '已完成' OR task_status = '关闭', 1, 0)) AS complete_num,
         COUNT(task_status) AS total_num
         FROM task
         WHERE is_deleted = false
         AND task_project_id != 0
         AND task_project_id = #{projectId}
-        <if test="staffId != null">AND task_holder_id = #{staffId}</if>
-        GROUP BY task_type) AS t1
-        RIGHT JOIN (SELECT DISTINCT task_type FROM task) AS t2
-        ON t1.task_type = t2.task_type
+        <if test="staffId != null">
+            AND task_holder_id = #{staffId}
+        </if>
+        GROUP BY task_type
     </select>
     <select id="selectTaskClosedNum" resultType="cn.edu.hfut.rmdjzz.projectmanagement.entity.dto.TaskTrendDTO">
         SELECT closed_date AS task_date,