Commit 0c724655 authored by 韩桐桐's avatar 韩桐桐

fix(jg):压力管道安装告知业务未进流程根据工程装置id查询最新的管道列表

parent ff4d6963
...@@ -343,7 +343,6 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -343,7 +343,6 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
lambda.eq(JgInstallationNoticeEq::getEquipTransferId, installationInfo.get("sequenceNbr")); lambda.eq(JgInstallationNoticeEq::getEquipTransferId, installationInfo.get("sequenceNbr"));
List<JgInstallationNoticeEq> jgInstallationNoticeEqs = jgInstallationNoticeEqMapper.selectList(lambda); List<JgInstallationNoticeEq> jgInstallationNoticeEqs = jgInstallationNoticeEqMapper.selectList(lambda);
if (!ValidationUtil.isEmpty(jgInstallationNoticeEqs)) { if (!ValidationUtil.isEmpty(jgInstallationNoticeEqs)) {
List<String> ids = jgInstallationNoticeEqs.stream().map(item -> item.getEquId()).collect(Collectors.toList());
// 压力管道从工程装置表查询设备信息 // 压力管道从工程装置表查询设备信息
if (PipelineEnum.INDUSTRIAL_PIPELINE.getCode().equals(equCategory)) { if (PipelineEnum.INDUSTRIAL_PIPELINE.getCode().equals(equCategory)) {
String projectContraptionId = (String) installationInfo.get("projectContraptionId"); String projectContraptionId = (String) installationInfo.get("projectContraptionId");
...@@ -351,8 +350,9 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -351,8 +350,9 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
installationInfo.put("pipelineLength", projectContraption.getPipelineLength()); installationInfo.put("pipelineLength", projectContraption.getPipelineLength());
installationInfo.put("projectContraptionNo", projectContraption.getProjectContraptionNo()); installationInfo.put("projectContraptionNo", projectContraption.getProjectContraptionNo());
installationInfo.put("projectContraption", projectContraption.getProjectContraption()); installationInfo.put("projectContraption", projectContraption.getProjectContraption());
equipListMaps = jgInstallationNoticeMapper.getPipelineEquInfoByRecords(ids); equipListMaps = projectContraptionService.getBaseMapper().selectEquipList(projectContraptionId);
} else { } else {
List<String> ids = jgInstallationNoticeEqs.stream().map(JgInstallationNoticeEq::getEquId).collect(Collectors.toList());
Iterable<ESEquipmentCategoryDto> equips = esEquipmentCategory.findAllById(ids); Iterable<ESEquipmentCategoryDto> equips = esEquipmentCategory.findAllById(ids);
equipListMaps = getEquipListMaps(equips); equipListMaps = getEquipListMaps(equips);
} }
......
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