平台件法规清单调取-法规工程师和工程接口人带入

This commit is contained in:
zhn
2023-10-18 16:09:32 +08:00
parent 895fea9ab3
commit 56ba63e6f5
@@ -365,6 +365,8 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
LambdaQueryWrapper<ProjectLawsInventoryEO> wrapperTemp = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ProjectLawsInventoryEO> wrapperTemp = new LambdaQueryWrapper<>();
wrapperTemp.in(ProjectLawsInventoryEO::getProjectLibraryId, projectLawsInventoryEO.getProjectLibraryId()); wrapperTemp.in(ProjectLawsInventoryEO::getProjectLibraryId, projectLawsInventoryEO.getProjectLibraryId());
List<ProjectLawsInventoryEO> projectLawsInventoryEOList = this.list(wrapperTemp); List<ProjectLawsInventoryEO> projectLawsInventoryEOList = this.list(wrapperTemp);
//项目信息
ProjectLibraryBase projectLibraryBase = projectLibraryBaseService.getById(projectLawsInventoryEO.getProjectLibraryId());
//调取 //调取
String dummyInventoryBaseId = projectLawsInventoryEO.getDummyInventoryBaseId(); String dummyInventoryBaseId = projectLawsInventoryEO.getDummyInventoryBaseId();
if (StringUtils.isNotBlank(projectLawsInventoryEO.getDummyids())) { if (StringUtils.isNotBlank(projectLawsInventoryEO.getDummyids())) {
@@ -403,6 +405,8 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
projectLawsInventoryEOTemp.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); projectLawsInventoryEOTemp.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
projectLawsInventoryEOTemp.setCreateTime(new Date()); projectLawsInventoryEOTemp.setCreateTime(new Date());
projectLawsInventoryEOTemp.setUpdateTime(new Date()); projectLawsInventoryEOTemp.setUpdateTime(new Date());
projectLawsInventoryEOTemp.setRegulationOwnerId(projectLibraryBase.getRegulationOwnerId());
projectLawsInventoryEOTemp.setEngineeringInterfacePerson(projectLibraryBase.getEngineeringInterfacePerson());
projectLawsInventoryEOS.add(projectLawsInventoryEOTemp); projectLawsInventoryEOS.add(projectLawsInventoryEOTemp);
} }
} else { } else {
@@ -414,7 +418,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
if (collect.size() != 0) { if (collect.size() != 0) {
for (ProjectLawsInventoryEO lawsInventoryEO : collect) { for (ProjectLawsInventoryEO lawsInventoryEO : collect) {
//数据对比 //数据对比
ProjectLawsInventoryEO projectLawsInventoryEOTemp = dataCompare(lawsInventoryEO, dummyInventoryInfoEO); ProjectLawsInventoryEO projectLawsInventoryEOTemp = dataCompare(lawsInventoryEO, dummyInventoryInfoEO,projectLibraryBase);
projectLawsInventoryEOListTemp.add(projectLawsInventoryEOTemp); projectLawsInventoryEOListTemp.add(projectLawsInventoryEOTemp);
} }
} else { } else {
@@ -429,6 +433,8 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
projectLawsInventoryEOTemp.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); projectLawsInventoryEOTemp.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
projectLawsInventoryEOTemp.setCreateTime(new Date()); projectLawsInventoryEOTemp.setCreateTime(new Date());
projectLawsInventoryEOTemp.setUpdateTime(new Date()); projectLawsInventoryEOTemp.setUpdateTime(new Date());
projectLawsInventoryEOTemp.setRegulationOwnerId(projectLibraryBase.getRegulationOwnerId());
projectLawsInventoryEOTemp.setEngineeringInterfacePerson(projectLibraryBase.getEngineeringInterfacePerson());
projectLawsInventoryEOS.add(projectLawsInventoryEOTemp); projectLawsInventoryEOS.add(projectLawsInventoryEOTemp);
} }
} }
@@ -3685,10 +3691,12 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
} }
private ProjectLawsInventoryEO dataCompare(ProjectLawsInventoryEO projectLawsInventoryEO, DummyInventoryInfoEO dummyInventoryInfoEO) { private ProjectLawsInventoryEO dataCompare(ProjectLawsInventoryEO projectLawsInventoryEO,
DummyInventoryInfoEO dummyInventoryInfoEO,
ProjectLibraryBase projectLibraryBase) {
//编号 //编号
if (StringUtils.isBlank(projectLawsInventoryEO.getSerialNumber())) { if (StringUtils.isBlank(projectLawsInventoryEO.getSerialNumber())) {
projectLawsInventoryEO.setSendMsgFlag(dummyInventoryInfoEO.getSerialNumber()); projectLawsInventoryEO.setSerialNumber(dummyInventoryInfoEO.getSerialNumber());
} }
//标题 //标题
if (StringUtils.isBlank(projectLawsInventoryEO.getTitle())) { if (StringUtils.isBlank(projectLawsInventoryEO.getTitle())) {
@@ -3788,6 +3796,14 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
if (StringUtils.isBlank(projectLawsInventoryEO.getVerifyDuty())) { if (StringUtils.isBlank(projectLawsInventoryEO.getVerifyDuty())) {
projectLawsInventoryEO.setVerifyDuty(dummyInventoryInfoEO.getVerifyDuty()); projectLawsInventoryEO.setVerifyDuty(dummyInventoryInfoEO.getVerifyDuty());
} }
//法规工程师
if(StringUtils.isBlank(projectLawsInventoryEO.getRegulationOwnerId())){
projectLawsInventoryEO.setRegulationOwnerId(projectLibraryBase.getRegulationOwnerId());
}
//工程接口人
if(StringUtils.isBlank(projectLawsInventoryEO.getEngineeringInterfacePerson())){
projectLawsInventoryEO.setEngineeringInterfacePerson(projectLibraryBase.getEngineeringInterfacePerson());
}
return projectLawsInventoryEO; return projectLawsInventoryEO;
} }