提交 34ff67ce authored 作者: zhoushaopan's avatar zhoushaopan

fix(装备模块): 解决了打印表达设备数量不对

解决了打印表达设备数量不对
上级 e32c8668
...@@ -241,7 +241,7 @@ public class DeviceLibraryController { ...@@ -241,7 +241,7 @@ public class DeviceLibraryController {
@Autowired @Autowired
private UnitStoreLocationService unitStoreLocationService; private UnitStoreLocationService unitStoreLocationService;
@ApiOperation(value = "模糊查询核心装备分页", notes = "可以通过这个接口查询装备列表") @ApiOperation(value = "模糊查询核心装备分页", notes = "可以通过这个接口查询装备列表 全省库")
@PostMapping("/core/feature/summary") @PostMapping("/core/feature/summary")
public ResponseEntity selectCoreDevicePage(@RequestBody DeviceLibrarySelectVo deviceLibrarySelectVo) { public ResponseEntity selectCoreDevicePage(@RequestBody DeviceLibrarySelectVo deviceLibrarySelectVo) {
...@@ -259,6 +259,8 @@ public class DeviceLibraryController { ...@@ -259,6 +259,8 @@ public class DeviceLibraryController {
// Boolean hasTypeDim = deviceLibrarySelectVo.getTypeDim()!=null; // Boolean hasTypeDim = deviceLibrarySelectVo.getTypeDim()!=null;
SimpleDateFormat sdf = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ); SimpleDateFormat sdf = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" );
List<DeviceLibrary> resultList = deviceLibraryService.getCoreDevicePage(deviceLibrarySelectVo); List<DeviceLibrary> resultList = deviceLibraryService.getCoreDevicePage(deviceLibrarySelectVo);
Map<String,Object> map = new HashMap<>();
map.put("resultList",resultList);
if (hasModelDim||hasLifeStatusDim||hasLocationUnitDim||hasNameDim||hasOwnUnitDim||hasSeqDim) { if (hasModelDim||hasLifeStatusDim||hasLocationUnitDim||hasNameDim||hasOwnUnitDim||hasSeqDim) {
resultList = resultList.stream().filter(deviceLibrary -> { resultList = resultList.stream().filter(deviceLibrary -> {
Boolean containModelDim = !hasModelDim||deviceLibrary.getModel().contains(deviceLibrarySelectVo.getModelDim()); Boolean containModelDim = !hasModelDim||deviceLibrary.getModel().contains(deviceLibrarySelectVo.getModelDim());
...@@ -276,7 +278,6 @@ public class DeviceLibraryController { ...@@ -276,7 +278,6 @@ public class DeviceLibraryController {
} }
// List<DeviceVo> deviceVos = resultList.stream().map(DeviceLibrary::parseVo).collect(Collectors.toList()); // List<DeviceVo> deviceVos = resultList.stream().map(DeviceLibrary::parseVo).collect(Collectors.toList());
Page<DeviceLibrary> deviceLibraryEntities = PageUtil.getPerPage(deviceLibrarySelectVo.getPage(), deviceLibrarySelectVo.getSize(), resultList, deviceLibrarySelectVo.getPageable()); Page<DeviceLibrary> deviceLibraryEntities = PageUtil.getPerPage(deviceLibrarySelectVo.getPage(), deviceLibrarySelectVo.getSize(), resultList, deviceLibrarySelectVo.getPageable());
Map<String,Object> map = new HashMap<>();
Map<Integer,String> lifeStatusMap = configCache.getLifeStatusMap(); Map<Integer,String> lifeStatusMap = configCache.getLifeStatusMap();
// //
Map<Integer, String> styleMap = configCache.getStyleMap(); Map<Integer, String> styleMap = configCache.getStyleMap();
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论