Commit 96bb068d authored by 刘林's avatar 刘林

fix(jg):管道级别字典查询错误问题处理

parent 8d245c0a
...@@ -410,7 +410,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -410,7 +410,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
installationInfo.put("equDefineName", projectContraption.getEquDefineName()); installationInfo.put("equDefineName", projectContraption.getEquDefineName());
equipListMaps = projectContraptionService.getBaseMapper().selectEquipList(projectContraptionId); equipListMaps = projectContraptionService.getBaseMapper().selectEquipList(projectContraptionId);
equipListMaps.forEach(item -> equipListMaps.forEach(item ->
item.put("deviceLevel", Optional.ofNullable(dataDictionaryMapper.selectById(String.valueOf(item.get("deviceLevel")))) item.put("deviceLevel", Optional.ofNullable(dataDictionaryMapper.getByCode(String.valueOf(item.get("deviceLevel")),"8300"))
.map(DataDictionary::getName) .map(DataDictionary::getName)
.orElse(""))); .orElse("")));
} else { } else {
...@@ -2007,7 +2007,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -2007,7 +2007,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
List<Map<String, Object>> deviceList = projectContraptionService.getBaseMapper().selectEquipList(projectContraptionSeq); List<Map<String, Object>> deviceList = projectContraptionService.getBaseMapper().selectEquipList(projectContraptionSeq);
deviceList.forEach(device -> { deviceList.forEach(device -> {
String deviceLevel = String.valueOf(device.get("deviceLevel")); String deviceLevel = String.valueOf(device.get("deviceLevel"));
device.put("deviceLevel", dataDictionaryMapper.selectById(deviceLevel).getName()); device.put("deviceLevel", dataDictionaryMapper.getByCode(deviceLevel,"8300").getName());
device.put("sequenceNbr", projectContraptionSeq); device.put("sequenceNbr", projectContraptionSeq);
device.put("equListName", projectContraption.getEquListName()); device.put("equListName", projectContraption.getEquListName());
}); });
......
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