mula
/
pms-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 联调完善4

dev_1.1.0
tp_caosong1 2025-01-06 17:48:46 +08:00
parent a02fdc81aa
commit 7702c20b66
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pms-business/src/main/java/tech/unissense/pms/business/examine/task/service/impl/TaskServiceImpl.java
View File

@ -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

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

@ -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>