提交 18d11f27 authored 作者: zhoushaopan's avatar zhoushaopan

fix(自查模块): 修复自查bug

修复自查bug
上级 bd08790d
...@@ -999,7 +999,7 @@ public class SelfCheckController { ...@@ -999,7 +999,7 @@ public class SelfCheckController {
Integer storageLocationId = selfCheckVo.getStorageLocationId(); Integer storageLocationId = selfCheckVo.getStorageLocationId();
String unit = userUtils.getCurrentUserUnitName(); String unit = userUtils.getCurrentUserUnitName();
PredicateBuilder<DeviceLibrary> predicateBuilder = Specifications.and(); PredicateBuilder<DeviceLibrary> predicateBuilder = Specifications.and();
predicateBuilder.eq("locationUnit", unit); // predicateBuilder.eq("locationUnit", unit);
if (selfCheckVo.getFilterStatusList() != null){ if (selfCheckVo.getFilterStatusList() != null){
predicateBuilder.notIn("lifeStatus",selfCheckVo.getFilterStatusList().toArray()); predicateBuilder.notIn("lifeStatus",selfCheckVo.getFilterStatusList().toArray());
...@@ -1010,7 +1010,7 @@ public class SelfCheckController { ...@@ -1010,7 +1010,7 @@ public class SelfCheckController {
if (storageLocationId1 != null ){ if (storageLocationId1 != null ){
if (storageLocationId1 != 0){ if (storageLocationId1 != 0){
predicateBuilder.eq("storageLocationId",storageLocationId1); predicateBuilder.eq("storageLocationId",storageLocationId1);
predicateBuilder.eq("ownUnit", unit);
} }
} }
}else { }else {
...@@ -1037,6 +1037,8 @@ public class SelfCheckController { ...@@ -1037,6 +1037,8 @@ public class SelfCheckController {
List<Integer> status = new ArrayList<>(Arrays.asList(5,10,12)); List<Integer> status = new ArrayList<>(Arrays.asList(5,10,12));
List<DeviceLibrary> deviceLibraries = deviceLibraryDao.findAll(predicateBuilder.build()) List<DeviceLibrary> deviceLibraries = deviceLibraryDao.findAll(predicateBuilder.build())
.stream().filter(deviceLibrary -> !status.contains(deviceLibrary.getLifeStatus())).collect(Collectors.toList()); .stream().filter(deviceLibrary -> !status.contains(deviceLibrary.getLifeStatus())).collect(Collectors.toList());
// List<DeviceLibrary> deviceLibraries = deviceLibraryDao.findAll()
// .stream().filter(deviceLibrary -> !status.contains(deviceLibrary.getLifeStatus())).collect(Collectors.toList());
deviceLibraries.forEach(DeviceLibrary::setConfigName); deviceLibraries.forEach(DeviceLibrary::setConfigName);
List<DeviceLibrary> deviceLibraryEntities = deviceLibraries.stream() List<DeviceLibrary> deviceLibraryEntities = deviceLibraries.stream()
.filter(deviceLibrary -> deviceLibrary.getLocationUnit().equals(unit)&&(deviceLibrary.getLifeStatus()==2||deviceLibrary.getLifeStatus()==14)) .filter(deviceLibrary -> deviceLibrary.getLocationUnit().equals(unit)&&(deviceLibrary.getLifeStatus()==2||deviceLibrary.getLifeStatus()==14))
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论