提交 d7320cc7 authored 作者: zhoushaopan's avatar zhoushaopan

fix(盘存模块): 修改自查查询

修改自查查询
上级 ec365bb2
......@@ -194,9 +194,9 @@ public class DeviceLibraryController {
public ResponseEntity selectDeviceList(@RequestBody SelfCheckVo selfCheckVo) {
String unit = userUtils.getCurrentUserUnitName();
PredicateBuilder<DeviceLibrary> predicateBuilder = Specifications.and();
predicateBuilder.eq("ownUnit", unit);
predicateBuilder.eq("locationUnit", unit);
predicateBuilder.eq(selfCheckVo.getStorageLocationId()!=null,"storageLocationId",selfCheckVo.getStorageLocationId());
List<Integer> status = new ArrayList<>(Arrays.asList(5,10,11,12));
List<Integer> status = new ArrayList<>(Arrays.asList(5,10,12));
List<DeviceLibrary> deviceLibraries = deviceLibraryDao.findAll(predicateBuilder.build())
.stream().filter(deviceLibrary -> !status.contains(deviceLibrary.getLifeStatus())).collect(Collectors.toList());
deviceLibraries.forEach(DeviceLibrary::setConfigName);
......
......@@ -107,7 +107,7 @@ public class WarehouseInspectionServiceImpl implements WarehouseInspectionServic
PredicateBuilder<DeviceLibrary> predicateBuilder = Specifications.and();
// predicateBuilder.eq("ownUnit",currentUserUnitName);
predicateBuilder.eq("locationUnit",currentUserUnitName);
List<Integer> statusList = new ArrayList<>(Arrays.asList(5,10,11,12));
List<Integer> statusList = new ArrayList<>(Arrays.asList(5,10,12));
List<DeviceLibrary> allDevices = deviceLibraryService.findAllDevices().stream()
.filter(deviceLibrary -> deviceLibrary.getLocationUnit().equals(currentUserUnitName)
&& !statusList.contains(deviceLibrary.getLifeStatus())).collect(Collectors.toList());
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论