Commit 144e1bc9 authored by 韩桐桐's avatar 韩桐桐

fix(jg):安装告知工程装置列表回显

parent 8b45a370
......@@ -175,6 +175,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
private IdxBizJgFactoryInfoServiceImpl idxBizJgFactoryInfoService;
@Autowired
private IdxBizJgProjectContraptionServiceImpl projectContraptionService;
@Autowired
private ObjectMapper objectMapper;
......@@ -1728,7 +1729,12 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
if (ValidationUtil.isEmpty(projectContraption)) {
return null;
}
List<Map<String, Object>> deviceList = this.baseMapper.getDeviceListByProjectContraption(projectContraptionSeq);
List<Map<String, Object>> deviceList = projectContraptionService.getBaseMapper().selectEquipList(projectContraptionSeq);
deviceList.forEach(device -> {
String deviceLevel = String.valueOf(device.get("deviceLevel"));
device.put("deviceLevel", dataDictionaryMapper.selectById(deviceLevel).getName());
device.put("sequenceNbr", projectContraptionSeq);
});
return new JSONObject().fluentPut("deviceList", deviceList)
.fluentPut("projectContraption", projectContraption.getProjectContraption())
.fluentPut("projectContraptionNo", projectContraption.getProjectContraptionNo())
......
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