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

feat(维修模块): 已领取管理,判断是不是其他的单位以及id

已领取管理,判断是不是其他的单位以及id
上级 be8d188a
...@@ -162,8 +162,10 @@ public class RepairController { ...@@ -162,8 +162,10 @@ public class RepairController {
// } else { // } else {
// return ResponseEntity.ok("error"); // return ResponseEntity.ok("error");
// } // }
List<String> list = sendUnits.stream().sorted().collect(Collectors.toList());
if (sendUnits.size() == 2) { if (sendUnits.size() == 2) {
return ResponseEntity.ok(sendUnits); return ResponseEntity.ok(list);
} else { } else {
return ResponseEntity.ok("error"); return ResponseEntity.ok("error");
} }
...@@ -1910,6 +1912,7 @@ public class RepairController { ...@@ -1910,6 +1912,7 @@ public class RepairController {
List<RepairDetail> repairDetails; List<RepairDetail> repairDetails;
if (level == 1) { if (level == 1) {
repairDetails = repairDetailDao.findAllByRepairStatus(5, repairTaskSelectVo.getPageable().getSort()); repairDetails = repairDetailDao.findAllByRepairStatus(5, repairTaskSelectVo.getPageable().getSort());
} else if (level == 2) { } else if (level == 2) {
repairDetails = repairDetailDao.findAllByRepairStatus(5, repairTaskSelectVo.getPageable().getSort()); repairDetails = repairDetailDao.findAllByRepairStatus(5, repairTaskSelectVo.getPageable().getSort());
} else { } else {
...@@ -2009,6 +2012,7 @@ public class RepairController { ...@@ -2009,6 +2012,7 @@ public class RepairController {
// } // }
else if (type == 7) { else if (type == 7) {
//0 //0
//7 已领取待入库
//List<RepairDetail> repairDetails = repairDetailDao.findAllByRepairStatus(2, repairTaskSelectVo.getPageable().getSort()); //List<RepairDetail> repairDetails = repairDetailDao.findAllByRepairStatus(2, repairTaskSelectVo.getPageable().getSort());
List<RepairDetail> repairDetails = repairDetailDao.findAllByRepairStatus(7, repairTaskSelectVo.getPageable().getSort()); List<RepairDetail> repairDetails = repairDetailDao.findAllByRepairStatus(7, repairTaskSelectVo.getPageable().getSort());
repairDetails.forEach(RepairDetail::setConfigName); repairDetails.forEach(RepairDetail::setConfigName);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论