Browse Source

fix: 修复督察任务数据无法展示的问题

master
wxc 1 month ago
parent
commit
bb505db500
  1. 1
      src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskManagementController.java
  2. 4
      src/main/java/com/biutag/supervision/service/SupTaskService.java

1
src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskManagementController.java

@ -52,6 +52,7 @@ public class TaskManagementController {
public Result<Page<TaskVo>> pageResult(TaskQueryParam queryParam) { public Result<Page<TaskVo>> pageResult(TaskQueryParam queryParam) {
return Result.success(taskService.pageTaskData(queryParam)); return Result.success(taskService.pageTaskData(queryParam));
} }
@PostMapping("/addTaskManagement") @PostMapping("/addTaskManagement")
public Result addTaskManagement(@RequestBody TaskManagementDto dto){ public Result addTaskManagement(@RequestBody TaskManagementDto dto){
if(taskManagementService.save(dto)){ if(taskManagementService.save(dto)){

4
src/main/java/com/biutag/supervision/service/SupTaskService.java

@ -58,7 +58,7 @@ public class SupTaskService extends ServiceImpl<SupTaskMapper, SupTask> {
public Page<TaskVo> pageTaskData(TaskQueryParam queryParam){ public Page<TaskVo> pageTaskData(TaskQueryParam queryParam){
UserAuth user = UserContextHolder.getCurrentUser(); UserAuth user = UserContextHolder.getCurrentUser();
if (!AppConstants.USER_TYPE_SUPER.equals(user.getUserType()) || !user.getRoleCodes().contains(RoleCodeEnum.FIRST_ADMIN.getCode())) { if (!AppConstants.USER_TYPE_SUPER.equals(user.getUserType()) && !user.getRoleCodes().contains(RoleCodeEnum.FIRST_ADMIN.getCode())) {
return new Page<TaskVo>().setTotal(0).setRecords(new ArrayList<>()); return new Page<TaskVo>().setTotal(0).setRecords(new ArrayList<>());
} }
QueryWrapper<SupTask> queryWrapper = new QueryWrapper<>(); QueryWrapper<SupTask> queryWrapper = new QueryWrapper<>();
@ -67,7 +67,7 @@ public class SupTaskService extends ServiceImpl<SupTaskMapper, SupTask> {
.eq(StrUtil.isNotEmpty(queryParam.getTaskType()),"t.task_type", queryParam.getTaskType()) .eq(StrUtil.isNotEmpty(queryParam.getTaskType()),"t.task_type", queryParam.getTaskType())
.groupBy("t.id") .groupBy("t.id")
.orderByDesc("t.create_time"); .orderByDesc("t.create_time");
Page<TaskVo> page= baseMapper.queryTaskList(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper); Page<TaskVo> page = baseMapper.queryTaskList(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper);
page.getRecords().forEach(s->{ page.getRecords().forEach(s->{
List<SupTaskPerson> problems =personService.list(new LambdaQueryWrapper<SupTaskPerson>().eq(SupTaskPerson::getTaskId,s.getId())); List<SupTaskPerson> problems =personService.list(new LambdaQueryWrapper<SupTaskPerson>().eq(SupTaskPerson::getTaskId,s.getId()));
if(CollectionUtil.isNotEmpty(problems)){ if(CollectionUtil.isNotEmpty(problems)){

Loading…
Cancel
Save