Commit 9a987ff9 authored by tianbo's avatar tianbo

refactor(jg): 移除updateEquipEs方法中未使用的map1参数

parent 7d34e32a
...@@ -1465,7 +1465,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -1465,7 +1465,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
changeRecordEq.setProductCode(idxBizJgFactoryInfo.getFactoryNum()); changeRecordEq.setProductCode(idxBizJgFactoryInfo.getFactoryNum());
certificateChangeRecordEqService.save(changeRecordEq); certificateChangeRecordEqService.save(changeRecordEq);
// 收集需要更新的es // 收集需要更新的es
esEquipmentDtos.add(updateEquipEs(jgInstallationNotice, tzsJgOtherInfo, idxBizJgRegisterInfo, idxBizJgSupervisionInfo, map1, dto)); esEquipmentDtos.add(updateEquipEs(jgInstallationNotice, tzsJgOtherInfo, idxBizJgRegisterInfo, idxBizJgSupervisionInfo, dto));
}); });
jgResumeInfoService.saveBatchResume( jgResumeInfoService.saveBatchResume(
jgRelationEquips.stream() jgRelationEquips.stream()
...@@ -1640,12 +1640,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -1640,12 +1640,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
private ESEquipmentCategoryDto updateEquipEs(JgInstallationNotice jgInstallationNotice, OtherInfo tzsJgOtherInfo, private ESEquipmentCategoryDto updateEquipEs(JgInstallationNotice jgInstallationNotice, OtherInfo tzsJgOtherInfo,
IdxBizJgRegisterInfo tzsJgRegistrationInfo, IdxBizJgSupervisionInfo idxBizJgSupervisionInfo, IdxBizJgRegisterInfo tzsJgRegistrationInfo, IdxBizJgSupervisionInfo idxBizJgSupervisionInfo,
Map<String, Object> map1, JgInstallationNoticeDto dto) { JgInstallationNoticeDto dto) {
Optional<ESEquipmentCategoryDto> esEqu = esEquipmentCategory.findById(tzsJgRegistrationInfo.getRecord()); Optional<ESEquipmentCategoryDto> esEqu = esEquipmentCategory.findById(tzsJgRegistrationInfo.getRecord());
ESEquipmentCategoryDto esEquipmentCategoryDto = new ESEquipmentCategoryDto(); ESEquipmentCategoryDto esEquipmentCategoryDto = new ESEquipmentCategoryDto();
esEqu.ifPresent(esDto -> { esEqu.ifPresent(esDto -> BeanUtils.copyProperties(esDto, esEquipmentCategoryDto));
BeanUtils.copyProperties(esDto, esEquipmentCategoryDto);
});
esEquipmentCategoryDto.setSEQUENCE_NBR(tzsJgRegistrationInfo.getRecord()); esEquipmentCategoryDto.setSEQUENCE_NBR(tzsJgRegistrationInfo.getRecord());
esEquipmentCategoryDto.setREC_DATE(new Date().getTime()); esEquipmentCategoryDto.setREC_DATE(new Date().getTime());
esEquipmentCategoryDto.setEQU_CODE(tzsJgRegistrationInfo.getEquCode()); esEquipmentCategoryDto.setEQU_CODE(tzsJgRegistrationInfo.getEquCode());
...@@ -2327,7 +2325,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -2327,7 +2325,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
updateJgUseInfo(jgInstallationNotice, installationNoticeEq); updateJgUseInfo(jgInstallationNotice, installationNoticeEq);
// 更新es // 更新es
esEquipmentDtos.add(updateEquipEs(jgInstallationNotice, tzsJgOtherInfo, idxBizJgRegisterInfo, idxBizJgSupervisionInfo, new HashMap<>(), dto)); esEquipmentDtos.add(updateEquipEs(jgInstallationNotice, tzsJgOtherInfo, idxBizJgRegisterInfo, idxBizJgSupervisionInfo, dto));
}); });
// 记录工程装置施工信息表 // 记录工程装置施工信息表
...@@ -2519,7 +2517,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -2519,7 +2517,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
changeRecordEq.setProductCode(idxBizJgFactoryInfo.getFactoryNum()); changeRecordEq.setProductCode(idxBizJgFactoryInfo.getFactoryNum());
certificateChangeRecordEqService.save(changeRecordEq); certificateChangeRecordEqService.save(changeRecordEq);
// 更新es // 更新es
esEquipmentDtos.add(updateEquipEs(jgInstallationNotice, tzsJgOtherInfo, idxBizJgRegisterInfo, idxBizJgSupervisionInfo, map1, dto)); esEquipmentDtos.add(updateEquipEs(jgInstallationNotice, tzsJgOtherInfo, idxBizJgRegisterInfo, idxBizJgSupervisionInfo, dto));
}); });
jgResumeInfoService.saveBatchResume( jgResumeInfoService.saveBatchResume(
jgRelationEquips.stream() jgRelationEquips.stream()
......
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