diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java index 93d0de5b9..526cbbbc3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectRoleEnum.java @@ -9,6 +9,12 @@ public enum ProjectRoleEnum { HOMOLOGATION_ENGINEER("认证工程师","2"), ENGINEERING_INTERFACE_PERSON("工程接口人","3"), REGULATI_AND_HOMOLOGATION_ENGINEER("法规与认证工程师","4"), + DESIGNINITIATOR("设计符合性确认-发起人","5"), + DESIGNDUTY("设计符合性确认-责任人","6"), + PREHOMOINITIATOR("prehomo确认-发起人","7"), + PREHOMODUTY("prehomo确认-责任人","8"), + VERIFYINITIATOR("验证符合性确认-发起人","9"), + VERIFYDUTY("验证符合性确认-责任人","10"), ; String name; 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 19901580b..117a68b4c 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 @@ -2002,7 +2002,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl msgList, String regulationOwnerId, List> mapList, - String nameCn,String nameEn) { + String nameCn,String nameEn, + String fieldNumber) { //单选 if(regulationOwnerId.contains(",")){ if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ @@ -2210,7 +2211,25 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl