diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java index 2425ed44d..10ba287e5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java @@ -14,7 +14,7 @@ public enum FlowStateEnum { LIST_TO_BE_RELEASED("清单待发布","List to be released","List to be released"), LIST_TO_BE_CHECKED("任务待发起","Task to be initiated","List to be checked"), 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"), RESULTS_TO_BE_SUBMITTED("结果待提交","Results to be submitted","Results to be submitted"), RESULTS_TO_BE_REVIEWED("结果待审查","Results to be reviewed","Results to be reviewed"), diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 7275e56ff..316f33b3b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -12222,7 +12222,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl finalDutyId.equals(e.getId())). map(SysUser::getUsername).collect(Collectors.joining(",")); - projectLawsInventoryEO.setDesignDutyIdName(designDutyName); + if("design".equals(flowFlag)){ + projectLawsInventoryEO.setDesignDutyIdName(designDutyName); + }else{ + projectLawsInventoryEO.setVerifyDutyIdName(designDutyName); + } } else { projectLawsInventoryEO.setDesignDutyIdName(""); } @@ -12256,8 +12264,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl designDeliverableTypeList = Arrays.asList(deliverableType.split(",")); String name = getTreeName(cut, categoryList, designDeliverableTypeList); - projectLawsInventoryEO.setDesignDeliverableTypeName(name); + if("design".equals(flowFlag)){ + projectLawsInventoryEO.setDesignDeliverableTypeName(name); + }else{ + projectLawsInventoryEO.setVerifyDeliverableTypeName(name); + } + } //责任领域