修改法规发布时交付物为NA直接不涉及
This commit is contained in:
+9
-3
@@ -11729,6 +11729,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
||||
List<String> userIdList = new ArrayList<>();
|
||||
List<ProcessInfoDetailEO> processInfoDetailEOList = new ArrayList<>();
|
||||
|
||||
//交付物类型为NA,写远了不好找,写在这里方便以后优化
|
||||
String naType = "1645667531513237506";
|
||||
for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOS) {
|
||||
//未发起或拒绝 可以发起清单确认
|
||||
boolean checkStatus = (StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
|
||||
@@ -11739,15 +11741,19 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
|
||||
//如果该数据的法规工程师不为空
|
||||
boolean checkUser = (StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId()));
|
||||
if (checkStatus && checkUser) {
|
||||
if (StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
|
||||
//如果交付物为NA则流程状态直接为不涉及
|
||||
if(StringUtils.equals(projectLawsInventoryEO.getDesignDeliverableType(),naType)){
|
||||
projectLawsInventoryEO.setDesignFlowStatus(ComplianceFlowStatusEnum.UNINVOLVED.getValue());
|
||||
}else if (StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
|
||||
|| StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())) {
|
||||
projectLawsInventoryEO.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
|
||||
}
|
||||
if (StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
|
||||
if(StringUtils.equals(projectLawsInventoryEO.getVerifyDeliverableType(),naType)){
|
||||
projectLawsInventoryEO.setVerifyFlowStatus(ComplianceFlowStatusEnum.UNINVOLVED.getValue());
|
||||
}else if (StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
|
||||
|| StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())) {
|
||||
projectLawsInventoryEO.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
|
||||
}
|
||||
|
||||
projectLawsInventoryEO.setInventoryAffirmDueDate(endTime);
|
||||
|
||||
userIdList.add(projectLawsInventoryEO.getRegulationOwnerId());
|
||||
|
||||
Reference in New Issue
Block a user