提交 ea25cd2a authored 作者: 邓砥奕's avatar 邓砥奕 提交者: Matrix

修改bug

上级 d888987a
...@@ -139,6 +139,7 @@ public class TaskSelectController { ...@@ -139,6 +139,7 @@ public class TaskSelectController {
list.add(deviceLibraryService.getAllotList(new DeviceLibrarySelectVo()).stream().filter(deviceLibraryEntity -> packingIdList.contains(deviceLibraryEntity.getPackingId())).sorted(Comparator.comparing(DeviceLibrary::getPackingId)).collect(Collectors.toList())); list.add(deviceLibraryService.getAllotList(new DeviceLibrarySelectVo()).stream().filter(deviceLibraryEntity -> packingIdList.contains(deviceLibraryEntity.getPackingId())).sorted(Comparator.comparing(DeviceLibrary::getPackingId)).collect(Collectors.toList()));
return ResponseEntity.ok(new ResultObj(list,"查询成功")); return ResponseEntity.ok(new ResultObj(list,"查询成功"));
} }
AllotBill allotBillEntity = allotBillService.getOne(billId); AllotBill allotBillEntity = allotBillService.getOne(billId);
if (allotBillEntity.getSendUseraId()!=null) { if (allotBillEntity.getSendUseraId()!=null) {
allotBillEntity.setSenderUserA(userPublicService.getOne(allotBillEntity.getSendUseraId()).getName()); allotBillEntity.setSenderUserA(userPublicService.getOne(allotBillEntity.getSendUseraId()).getName());
...@@ -155,18 +156,6 @@ public class TaskSelectController { ...@@ -155,18 +156,6 @@ public class TaskSelectController {
list.add(allotBillEntity); list.add(allotBillEntity);
String str2 = allotBillEntity.getAllotCheckDetail(); String str2 = allotBillEntity.getAllotCheckDetail();
List<DeviceLibrary> deviceLibraryEntities = new ArrayList<>(); List<DeviceLibrary> deviceLibraryEntities = new ArrayList<>();
if (str2!=null) {
String[] strings1 = str2.split("x");
for (String s : strings1) {
if (s.length() >= 2 && "1".equals(s.substring(s.length() - 1))) {
Integer id = Integer.parseInt(s.substring(0, s.length() - 1));
Integer checkResult = Integer.parseInt(s.substring(s.length() - 1));
DeviceLibrary deviceLibraryEntity = deviceLibraryService.getOne(id);
deviceLibraryEntity.setCheckResult(checkResult);
deviceLibraryEntities.add(deviceLibraryEntity);
}
}
}
list.add(deviceLibraryEntities); list.add(deviceLibraryEntities);
return ResponseEntity.ok(new ResultObj(list,"查询成功")); return ResponseEntity.ok(new ResultObj(list,"查询成功"));
case 4: case 4:
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论