Commit c8a90bb9 authored by suhuiguang's avatar suhuiguang

fix(jg):bug处理

1.安装告知地址为null 2.维修告知设备种类名称为null
parent 34915b27
...@@ -298,7 +298,9 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto ...@@ -298,7 +298,9 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
List<Map<String, Object>> deviceList = EquipmentClassifityEnum.YLGD.getCode().equals(equListCode) List<Map<String, Object>> deviceList = EquipmentClassifityEnum.YLGD.getCode().equals(equListCode)
? idxBizJgProjectContraptionMapper.selectPipelineList(equIds) ? idxBizJgProjectContraptionMapper.selectPipelineList(equIds)
: getEquipListMaps(esEquipmentCategory.findAllById(equIds)); : getEquipListMaps(esEquipmentCategory.findAllById(equIds));
deviceList.forEach(item->{
item.replaceAll((k, v) -> v == null ? "" : v);
});
maintainInfo.put("deviceList", deviceList); maintainInfo.put("deviceList", deviceList);
} }
...@@ -651,6 +653,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto ...@@ -651,6 +653,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
} }
notice.setEquListCode(Objects.toString(tableData.get(EQU_LIST_CODE),"")); notice.setEquListCode(Objects.toString(tableData.get(EQU_LIST_CODE),""));
notice.setEquCategory(Objects.toString(tableData.get(EQU_CATEGORY_CODE),"")); notice.setEquCategory(Objects.toString(tableData.get(EQU_CATEGORY_CODE),""));
notice.setEquCategoryDesc(equipCategoryTypeHandler.handle(notice.getEquCategory()));
notice.setInstallUnitName(reginParams.getCompany().getCompanyName()); notice.setInstallUnitName(reginParams.getCompany().getCompanyName());
notice.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode()); notice.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
notice.setCreateUserName(reginParams.getUserModel().getRealName()); notice.setCreateUserName(reginParams.getUserModel().getRealName());
......
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