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

feat: 联调完善5

dev_1.1.0
tp_caosong1 2025-01-07 09:41:37 +08:00
parent 7702c20b66
commit 7013bc82e6
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pms-admin/src/main/java/tech/unissense/pms/web/controller/business/examine/task/TaskSetUpController.java
View File

@ -32,7 +32,7 @@ public class TaskSetUpController extends BaseController {
// 分页查询+模糊查询 // 分页查询+模糊查询
@GetMapping("/get") @GetMapping("/get")
public TableDataInfo getTasks(TaskQueryDto queryDto) { public TableDataInfo getTasks(@RequestBody TaskQueryDto queryDto) {
startPage(); startPage();
List<ExamineTask> tasks = taskService.getTasks(queryDto); List<ExamineTask> tasks = taskService.getTasks(queryDto);
return getDataTable(tasks); return getDataTable(tasks);

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

@ -85,10 +85,7 @@ public class TaskServiceImpl implements TaskService {
.collect(Collectors.toList()); .collect(Collectors.toList());
item.setUserIdList(existingUserIds); item.setUserIdList(existingUserIds);
}); });
return tasks;
return tasks.stream()
.filter(task -> task.getTaskStatus().equals(queryDto.getTaskStatus()))
.collect(Collectors.toList());
} }
@Override @Override

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

@ -24,11 +24,22 @@
<if test="taskName != null and taskName != ''"> <if test="taskName != null and taskName != ''">
AND task_name LIKE CONCAT('%', #{taskName}, '%') AND task_name LIKE CONCAT('%', #{taskName}, '%')
</if> </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"> <if test="year != null">
AND year = #{year} AND year = #{year}
</if> </if>
</where> </where>
</select> </select>
<select id="listTask" resultType="ExamineTask"> <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 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 from pms_examine_task t1