WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改法规清单带入相关人，流程中的数据不能带入

Browse Source
This commit is contained in:
gaosong
2023-12-06 17:46:07 +08:00
parent 70c78b04f0
commit f9d614867c
2 changed files with 242 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+5 -1
View File
@@ -2611,7 +2611,10 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
} }
} }
}*/ }*/
if ((projectLawsInventoryEO.getDesignFlowStatus().equals(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
|| projectLawsInventoryEO.getDesignFlowStatus().equals(ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()))
&& (projectLawsInventoryEO.getVerifyFlowStatus().equals(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
|| projectLawsInventoryEO.getVerifyFlowStatus().equals(ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()))) {
String dutyTerritory = projectLawsInventoryEO.getDutyTerritory(); String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
if (StringUtils.isNotEmpty(dutyTerritory)) { if (StringUtils.isNotEmpty(dutyTerritory)) {
List<ProjectRelatedPersonnel> projectRelatedPersonnelTempList = projectRelatedPersonnels.stream().filter(relatedPersonnel -> { List<ProjectRelatedPersonnel> projectRelatedPersonnelTempList = projectRelatedPersonnels.stream().filter(relatedPersonnel -> {
@@ -2788,6 +2791,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
super.update(projectLawsInventoryEO, updateWrapper); super.update(projectLawsInventoryEO, updateWrapper);
} }
} }
}
//this.baseMapper.updateById(projectLawsInventoryEO); //this.baseMapper.updateById(projectLawsInventoryEO);
} }
} else { } else {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+7 -39
View File
@@ -2654,7 +2654,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
} }
}*/ }*/
if ((projectLawsInventoryEO.getDesignFlowStatus().equals(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
|| projectLawsInventoryEO.getDesignFlowStatus().equals(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
|| projectLawsInventoryEO.getDesignFlowStatus().equals(ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()))
&& (projectLawsInventoryEO.getVerifyFlowStatus().equals(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
|| projectLawsInventoryEO.getVerifyFlowStatus().equals(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
|| projectLawsInventoryEO.getVerifyFlowStatus().equals(ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue()))) {
String dutyTerritory = projectLawsInventoryEO.getDutyTerritory(); String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
if (StringUtils.isNotEmpty(dutyTerritory)) { if (StringUtils.isNotEmpty(dutyTerritory)) {
List<ProjectRelatedPersonnel> projectRelatedPersonnelTempList = projectRelatedPersonnels.stream().filter(relatedPersonnel -> { List<ProjectRelatedPersonnel> projectRelatedPersonnelTempList = projectRelatedPersonnels.stream().filter(relatedPersonnel -> {
@@ -2753,44 +2758,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
} }
//prehomo确认
//发起人角色
String prehomoInitiator = projectLawsInventoryEO.getPrehomoInitiator();
if (StringUtils.isNotEmpty(prehomoInitiator)) {
if (StringUtils.isEmpty(projectLawsInventoryEO.getPrehomoInitiatorId())) {
String userId = ToGetAUserId(prehomoInitiator, projectRelatedPersonnelTempList, studioEngineer);
if (StringUtils.isNotEmpty(userId)) {
projectLawsInventoryEO.setPrehomoInitiatorId(userId);
}
} else {
String userId = ToGetAUserId(prehomoInitiator, projectRelatedPersonnelTempList, studioEngineer, projectLawsInventoryEO.getPrehomoInitiatorId());
if (StringUtils.isNotEmpty(userId)) {
projectLawsInventoryEO.setPrehomoInitiatorId(userId);
} else {
updateWrapper.set(ProjectLawsInventoryEO::getPrehomoInitiatorId, null);
}
}
}
//责任人角色
String prehomoDuty = projectLawsInventoryEO.getPrehomoDuty();
if (StringUtils.isNotEmpty(prehomoDuty)) {
if (StringUtils.isEmpty(projectLawsInventoryEO.getPrehomoDutyId())) {
String userId = ToGetAUserId(prehomoDuty, projectRelatedPersonnelTempList, studioEngineer);
if (StringUtils.isNotEmpty(userId)) {
projectLawsInventoryEO.setPrehomoDutyId(userId);
}
} else {
String userId = ToGetAUserId(prehomoDuty, projectRelatedPersonnelTempList, studioEngineer, projectLawsInventoryEO.getPrehomoDutyId());
if (StringUtils.isNotEmpty(userId)) {
projectLawsInventoryEO.setPrehomoDutyId(userId);
} else {
updateWrapper.set(ProjectLawsInventoryEO::getPrehomoDutyId, null);
}
}
}
//验证符合性确认 //验证符合性确认
//发起人角色 //发起人角色
String verifyInitiator = projectLawsInventoryEO.getVerifyInitiator(); String verifyInitiator = projectLawsInventoryEO.getVerifyInitiator();
@@ -2831,6 +2798,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
super.update(projectLawsInventoryEO, updateWrapper); super.update(projectLawsInventoryEO, updateWrapper);
} }
} }
}
//this.baseMapper.updateById(projectLawsInventoryEO); //this.baseMapper.updateById(projectLawsInventoryEO);
} }
} else { } else {