| | |
| | | PageInfo<TaskPageListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); |
| | | List<TaskPageListVO> list = this.baseMapper.pageList(pageInfo, query); |
| | | XpTaskRule xpTaskRule = xpTaskRuleMapper.selectOne(new LambdaQueryWrapper<XpTaskRule>().last("limit 1")); |
| | | // if (Objects.nonNull(xpTaskRule)) { |
| | | // list.stream().filter(item -> item.getTaskCategory().equals(2)).forEach(item -> { |
| | | // item.setCanArriveRange(xpTaskRule.getCanArriveRange()); |
| | | // }); |
| | | // } |
| | | if (Objects.nonNull(xpTaskRule)) { |
| | | list.stream().filter(item -> item.getTaskCategory().equals(2)).forEach(item -> { |
| | | item.setCanArriveRange(xpTaskRule.getCanArriveRange()); |
| | | }); |
| | | } |
| | | pageInfo.setRecords(list); |
| | | return pageInfo; |
| | | } |
| | |
| | | res.setTaskCategory(task.getTaskCategory()); |
| | | res.setTaskTypeId(task.getTaskTypeId()); |
| | | res.setStatus(task.getStatus()); |
| | | res.setHandleTime(task.getHandleTime()); |
| | | XpVehicleClean vehicleDetection = vehicleCleanMapper.selectOne(new LambdaQueryWrapper<XpVehicleClean>() |
| | | .eq(XpVehicleClean::getTaskId, id).last("limit 1")); |
| | | if (vehicleDetection != null) { |
| | | res.setHandleTime(vehicleDetection.getCreateTime()); |
| | | res.setTaskImage(vehicleDetection.getTaskImage()); |
| | | res.setOperationUserId(vehicleDetection.getOperationsUserId()); |
| | | if (vehicleDetection.getOperationsUserId() != null) { |