提交 1a2ed1cd authored 作者: zhoushaopan's avatar zhoushaopan

feat(维修管理): 添加日志排除已领取的bug

添加日志排除已领取的bug
上级 9905b1a9
...@@ -1935,7 +1935,7 @@ public class RepairController { ...@@ -1935,7 +1935,7 @@ public class RepairController {
for (RepairDetail repairDetail : repairDetails2) { for (RepairDetail repairDetail : repairDetails2) {
if(repairDetail.getRepairBackBillId()!=null){ if(repairDetail.getRepairBackBillId()!=null){
TaskBto taskBto = taskService.getParentTaskIsNull(repairDetail.getRepairBackBillId(), 10); TaskBto taskBto = taskService.getParentTaskIsNull(repairDetail.getRepairBackBillId(), 10);
log.info("维修退回taskBto:{}",taskBto); log.info("维修退回任务id:{},业务id:{}",taskBto.getId(),taskBto.getBillId());
if (taskBto != null){ if (taskBto != null){
taskUserVo = taskBto.toVo(); taskUserVo = taskBto.toVo();
} }
...@@ -1943,7 +1943,7 @@ public class RepairController { ...@@ -1943,7 +1943,7 @@ public class RepairController {
if (repairDetail.getDeviceRepairBillId() != null && repairDetail.getDeviceRepairBillId() !=0){ if (repairDetail.getDeviceRepairBillId() != null && repairDetail.getDeviceRepairBillId() !=0){
TaskBto taskBto1 = taskService.getParentTaskIsNull(repairDetail.getDeviceRepairBillId(), 5); TaskBto taskBto1 = taskService.getParentTaskIsNull(repairDetail.getDeviceRepairBillId(), 5);
if (taskBto1 != null){ if (taskBto1 != null){
log.info("送修taskBto1:{}",taskBto1); log.info("送修任务id:{},业务id:{}",taskBto1.getId(),taskBto1.getBillId());
taskUserVo1 = taskBto1.toVo(); taskUserVo1 = taskBto1.toVo();
} }
} }
...@@ -1953,7 +1953,8 @@ public class RepairController { ...@@ -1953,7 +1953,8 @@ public class RepairController {
equipmentReceivedVos.add(equipmentReceivedVo); equipmentReceivedVos.add(equipmentReceivedVo);
} }
//按照时间排序 //按照时间排序
List<EquipmentReceivedVo> equipmentReceivedVoList = equipmentReceivedVos.stream().sorted(Comparator.comparing(EquipmentReceivedVo::getUpdateTime)).collect(Collectors.toList()); List<EquipmentReceivedVo> equipmentReceivedVoList = equipmentReceivedVos.stream()
.sorted(Comparator.comparing(EquipmentReceivedVo::getUpdateTime)).collect(Collectors.toList());
List<EquipmentReceivedVo> finalList = sortMethod2(repairTaskSelectVo.getOrders(), equipmentReceivedVos, equipmentReceivedVoList); List<EquipmentReceivedVo> finalList = sortMethod2(repairTaskSelectVo.getOrders(), equipmentReceivedVos, equipmentReceivedVoList);
return ResponseEntity.ok(PageUtil.getPerPage(repairTaskSelectVo.getPage(), repairTaskSelectVo.getSize(), finalList, repairTaskSelectVo.getPageable())); return ResponseEntity.ok(PageUtil.getPerPage(repairTaskSelectVo.getPage(), repairTaskSelectVo.getSize(), finalList, repairTaskSelectVo.getPageable()));
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论