From 7702c20b66635c6191d22ce6cba37f3788d67dce Mon Sep 17 00:00:00 2001
From: tp_caosong1 <2NjSx%PcH>
Date: Mon, 6 Jan 2025 17:48:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=81=94=E8=B0=83=E5=AE=8C=E5=96=844?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../examine/task/service/impl/TaskServiceImpl.java | 14 +++++++++++++-
 .../mapper/business/examine/ExamineTaskMapper.xml  |  3 ---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/impl/TaskServiceImpl.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/impl/TaskServiceImpl.java
index 608d213..27807dc 100644
--- a/pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/impl/TaskServiceImpl.java
+++ b/pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/impl/TaskServiceImpl.java
@@ -67,7 +67,16 @@ public class TaskServiceImpl implements TaskService {
     @Override
     public List<ExamineTask> getTasks(TaskQueryDto queryDto) {
         List<ExamineTask> tasks = examineTaskDao.getTasks(queryDto);
+
+        Date currentTime = new Date();
+
         tasks.forEach(item -> {
+            if (item.getEndTime() != null && item.getEndTime().before(currentTime)) {
+                item.setTaskStatus(2);
+            } else {
+                item.setTaskStatus(0);
+            }
+
             ExamineUser examineUser = new ExamineUser();
             examineUser.setTaskId(item.getId());
             List<ExamineUser> existingUsers = userMapper.list(examineUser);
@@ -76,7 +85,10 @@ public class TaskServiceImpl implements TaskService {
                     .collect(Collectors.toList());
             item.setUserIdList(existingUserIds);
         });
-        return tasks;
+
+        return tasks.stream()
+                .filter(task -> task.getTaskStatus().equals(queryDto.getTaskStatus()))
+                .collect(Collectors.toList());
     }
 
     @Override
diff --git a/pms-business/src/main/resources/mapper/business/examine/ExamineTaskMapper.xml b/pms-business/src/main/resources/mapper/business/examine/ExamineTaskMapper.xml
index 646e31c..cbbee96 100644
--- a/pms-business/src/main/resources/mapper/business/examine/ExamineTaskMapper.xml
+++ b/pms-business/src/main/resources/mapper/business/examine/ExamineTaskMapper.xml
@@ -24,9 +24,6 @@
             <if test="taskName != null and taskName != ''">
                 AND task_name LIKE CONCAT('%', #{taskName}, '%')
             </if>
-            <if test="taskStatus != null">
-                AND task_status = #{taskStatus}
-            </if>
             <if test="year != null">
                 AND year = #{year}
             </if>