From 7013bc82e699e293568b96808d9cf1e74eac9017 Mon Sep 17 00:00:00 2001
From: tp_caosong1 <2NjSx%PcH>
Date: Tue, 7 Jan 2025 09:41:37 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=81=94=E8=B0=83=E5=AE=8C=E5=96=845?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/examine/task/TaskSetUpController.java b/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/examine/task/TaskSetUpController.java
index f153c2b..4bfee4d 100644
--- a/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/examine/task/TaskSetUpController.java
+++ b/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/examine/task/TaskSetUpController.java
@@ -32,7 +32,7 @@ public class TaskSetUpController extends BaseController {
 
     // 分页查询+模糊查询
     @GetMapping("/get")
-    public TableDataInfo getTasks(TaskQueryDto queryDto) {
+    public TableDataInfo getTasks(@RequestBody TaskQueryDto queryDto) {
         startPage();
         List<ExamineTask> tasks = taskService.getTasks(queryDto);
         return getDataTable(tasks);
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 27807dc..de7c279 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
@@ -85,10 +85,7 @@ public class TaskServiceImpl implements TaskService {
                     .collect(Collectors.toList());
             item.setUserIdList(existingUserIds);
         });
-
-        return tasks.stream()
-                .filter(task -> task.getTaskStatus().equals(queryDto.getTaskStatus()))
-                .collect(Collectors.toList());
+        return tasks;
     }
 
     @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 cbbee96..8f18eff 100644
--- a/pms-business/src/main/resources/mapper/business/examine/ExamineTaskMapper.xml
+++ b/pms-business/src/main/resources/mapper/business/examine/ExamineTaskMapper.xml
@@ -24,11 +24,22 @@
             <if test="taskName != null and taskName != ''">
                 AND task_name LIKE CONCAT('%', #{taskName}, '%')
             </if>
+            <if test="taskStatus != null">
+                <choose>
+                    <when test="taskStatus == 2">
+                        AND end_time &lt; NOW()
+                    </when>
+                    <when test="taskStatus == 0">
+                        AND end_time > CURRENT_TIMESTAMP
+                    </when>
+                </choose>
+            </if>
             <if test="year != null">
                 AND year = #{year}
             </if>
         </where>
     </select>
+
     <select id="listTask" resultType="ExamineTask">
         select distinct t1.id,t1.task_name, t1.people_number, t1.people_number_detail, t1.task_status, t1.create_time, t1.end_time
         from pms_examine_task t1