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

法规清单-流程跳转

Browse Source
This commit is contained in:
zhn
2023-09-27 17:01:21 +08:00
parent 550658aef1
commit 51d32188aa
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java
+1 -1
View File
@@ -14,7 +14,7 @@ public enum FlowStateEnum {
LIST_TO_BE_RELEASED("清单待发布","List to be released","List to be released"), LIST_TO_BE_RELEASED("清单待发布","List to be released","List to be released"),
LIST_TO_BE_CHECKED("任务待发起","Task to be initiated","List to be checked"), LIST_TO_BE_CHECKED("任务待发起","Task to be initiated","List to be checked"),
REGULATORY_ENGINEER_RETURNS("法规工程师退回","Regulatory engineer returns","Regulatory engineer returns"), REGULATORY_ENGINEER_RETURNS("法规工程师退回","Regulatory engineer returns","Regulatory engineer returns"),
REFUSAL_OF_RESPONSIBLE_PERSON("责任人拒绝","Refusal of responsible person","Refusal of responsible person"), REFUSAL_OF_RESPONSIBLE_PERSON("责任人拒绝","Refusal of responsible person","Duty Person Rejected"),
TASK_TO_BE_CONFIRMED("任务待确认","Task to be confirmed","Task to be confirmed"), TASK_TO_BE_CONFIRMED("任务待确认","Task to be confirmed","Task to be confirmed"),
RESULTS_TO_BE_SUBMITTED("结果待提交","Results to be submitted","Results to be submitted"), RESULTS_TO_BE_SUBMITTED("结果待提交","Results to be submitted","Results to be submitted"),
RESULTS_TO_BE_REVIEWED("结果待审查","Results to be reviewed","Results to be reviewed"), RESULTS_TO_BE_REVIEWED("结果待审查","Results to be reviewed","Results to be reviewed"),
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+22 -5
View File
@@ -12222,7 +12222,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
if (StringUtils.isNotEmpty(flowStatus)) { if (StringUtils.isNotEmpty(flowStatus)) {
String designFlowStatusName = ComplianceFlowStatusEnum.getTextByValue(flowStatus, cut); String designFlowStatusName = ComplianceFlowStatusEnum.getTextByValue(flowStatus, cut);
projectLawsInventoryEO.setDesignFlowStatusName(designFlowStatusName); if("design".equals(flowFlag)){
projectLawsInventoryEO.setDesignFlowStatusName(designFlowStatusName);
}else{
projectLawsInventoryEO.setVerifyFlowStatusName(designFlowStatusName);
}
} }
//发起人. //发起人.
@@ -12242,7 +12246,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String finalDutyId = dutyId; String finalDutyId = dutyId;
String designDutyName = sysUsers.stream().filter(e -> finalDutyId.equals(e.getId())). String designDutyName = sysUsers.stream().filter(e -> finalDutyId.equals(e.getId())).
map(SysUser::getUsername).collect(Collectors.joining(",")); map(SysUser::getUsername).collect(Collectors.joining(","));
projectLawsInventoryEO.setDesignDutyIdName(designDutyName); if("design".equals(flowFlag)){
projectLawsInventoryEO.setDesignDutyIdName(designDutyName);
}else{
projectLawsInventoryEO.setVerifyDutyIdName(designDutyName);
}
} else { } else {
projectLawsInventoryEO.setDesignDutyIdName(""); projectLawsInventoryEO.setDesignDutyIdName("");
} }
@@ -12256,8 +12264,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())) { if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())) {
String fileName = this.editService.getFileName(projectLawsInventoryEO, fileInfos, projectLawsInventoryEO.getDesignDeliverableTemplate()); String fileName = this.editService.getFileName(projectLawsInventoryEO, fileInfos, projectLawsInventoryEO.getDesignDeliverableTemplate());
if (org.apache.commons.lang3.StringUtils.isNotBlank(fileName)) { if (StringUtils.isNotBlank(fileName)) {
projectLawsInventoryEO.setDesignDeliverableTemplateName(fileName); if("design".equals(flowFlag)){
projectLawsInventoryEO.setDesignDeliverableTemplateName(fileName);
}else{
projectLawsInventoryEO.setVerifyDeliverableTemplateName(fileName);
}
} }
} }
//交付物类型 //交付物类型
@@ -12270,7 +12282,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if (StringUtils.isNotBlank(deliverableType)) { if (StringUtils.isNotBlank(deliverableType)) {
List<String> designDeliverableTypeList = Arrays.asList(deliverableType.split(",")); List<String> designDeliverableTypeList = Arrays.asList(deliverableType.split(","));
String name = getTreeName(cut, categoryList, designDeliverableTypeList); String name = getTreeName(cut, categoryList, designDeliverableTypeList);
projectLawsInventoryEO.setDesignDeliverableTypeName(name); if("design".equals(flowFlag)){
projectLawsInventoryEO.setDesignDeliverableTypeName(name);
}else{
projectLawsInventoryEO.setVerifyDeliverableTypeName(name);
}
} }
//责任领域 //责任领域