Merge remote-tracking branch 'origin/dev_1.1.0' into dev_1.1.0

# Conflicts:
#	pms-business/src/main/resources/mapper/business/examine/ExamineTaskMapper.xml

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);

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

pms-business/src/main/resources/mapper/business/examine/ExamineTaskMapper.xml

@@ -24,6 +24,16 @@
             <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>