Skip to content

A
amos-boot-biz
Commit 5788889a authored by suhuiguang's avatar suhuiguang
Browse files
Options

1.圣元生产环境大屏bug

parent fdc3e377
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 6 deletions
amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/api/service/CylinderFillingMessageService.java
View file @ 5788889a
...@@ -35,12 +35,14 @@ public class CylinderFillingMessageService extends BaseService<CylinderFillingMe ...@@ -35,12 +35,14 @@ public class CylinderFillingMessageService extends BaseService<CylinderFillingMe
Page<CylinderFillingMessageModel> page = new Page<>(pageParam.getCurrent(), pageParam.getSize()); Page<CylinderFillingMessageModel> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
IPage<CylinderFillingMessageModel> uploadCylinderLogsByOrgCode = getUploadCylinderLogsByOrgCode(page, result.getOrgCode()); IPage<CylinderFillingMessageModel> uploadCylinderLogsByOrgCode = getUploadCylinderLogsByOrgCode(page, result.getOrgCode());
List<String> appIds = uploadCylinderLogsByOrgCode.getRecords().stream().map(CylinderFillingMessageModel::getAppId).collect(Collectors.toList()).stream().filter(x -> !ValidationUtil.isEmpty(x)).distinct().collect(Collectors.toList()); List<String> appIds = uploadCylinderLogsByOrgCode.getRecords().stream().map(CylinderFillingMessageModel::getAppId).collect(Collectors.toList()).stream().filter(x -> !ValidationUtil.isEmpty(x)).distinct().collect(Collectors.toList());
List<TzBaseEnterpriseInfoDto> tzBaseEnterpriseInfoDtos = iTzBaseEnterpriseInfoService.queryByAppId(appIds); if(appIds.size() > 0){
if (!ValidationUtil.isEmpty(tzBaseEnterpriseInfoDtos)){ List<TzBaseEnterpriseInfoDto> tzBaseEnterpriseInfoDtos = iTzBaseEnterpriseInfoService.queryByAppId(appIds);
Map<String, String> map = tzBaseEnterpriseInfoDtos.stream().collect(Collectors.toMap(TzBaseEnterpriseInfoDto::getAppId, TzBaseEnterpriseInfoDto::getUseUnitCode)); if (!ValidationUtil.isEmpty(tzBaseEnterpriseInfoDtos)){
uploadCylinderLogsByOrgCode.getRecords().stream().forEach(x -> { Map<String, String> map = tzBaseEnterpriseInfoDtos.stream().collect(Collectors.toMap(TzBaseEnterpriseInfoDto::getAppId, TzBaseEnterpriseInfoDto::getUseUnitCode));
x.setUseUnitCode(map.get(x.getAppId())); uploadCylinderLogsByOrgCode.getRecords().forEach(x -> {
}); x.setUseUnitCode(map.get(x.getAppId()));
});
}
} }
return page; return page;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment