From 4c5232a4f64e1b92f0c556d945e2567c357f05a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 25 May 2023 14:14:03 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=A2=ABG=E5=B9=B2=E6=89=B0=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/service/impl/ProjectLibraryBaseServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 9373a6125..03acddbfc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -2459,6 +2459,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl 0) { List TimeNodeVOList = TimeNodeVOsList.get(0); for (TimeNodeVO tnVo : TimeNodeVOList) { + if(tnVo.isG()){ + continue; + } if (null != postNodeTnVo) { break; } @@ -2495,6 +2498,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl 0) { List TimeNodeVOList = TimeNodeVOsList.get(0); for (TimeNodeVO tnVo : TimeNodeVOList) { + if(tnVo.isG()){ + continue; + } tnVo.setProjectId(plb.getId()); preNodeList.addAll(getNodeProgressList(tnVo)); } From b253d5c794093e7872c41025812aed21fe1fb7ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 30 May 2023 19:05:28 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E9=BB=98=E8=AE=A4=E6=97=B6=E9=97=B4=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=B8=89=E5=B9=B4=E5=86=85?= =?UTF-8?q?=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOServiceImpl.java | 38 +++++++++---------- .../modules/warn/service/LawsWarnService.java | 4 +- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + jero-web/src/components/search/index.vue | 5 ++- .../views/regulatoryEarlyWarning/index.vue | 8 +++- 6 files changed, 35 insertions(+), 22 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index a01f25fa6..0cc56ba53 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -4373,25 +4373,25 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl= '" + warnTime.split(",")[0] + "'" - + " and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') <= '" + warnTime.split(",")[1] + "'"); - } else { - conditionSb.append(" and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') = '" + warnTime + "'"); - } - }else{ - //日期(区分单日期还时间范围) - if (warnTime.contains(",")) { - conditionSb.append(" and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') >= '" + warnTime.split(",")[0] + "'" - + " and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') <= '" + warnTime.split(",")[1] + "'"); - } else { - conditionSb.append(" and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') = '" + warnTime + "'"); - } - } - } +// if(StringUtils.isNotBlank(warnTime)){ +// if("0".equals(flag)){ +// //日期(区分单日期还时间范围) +// if (warnTime.contains(",")) { +// conditionSb.append(" and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') >= '" + warnTime.split(",")[0] + "'" +// + " and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') <= '" + warnTime.split(",")[1] + "'"); +// } else { +// conditionSb.append(" and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') = '" + warnTime + "'"); +// } +// }else{ +// //日期(区分单日期还时间范围) +// if (warnTime.contains(",")) { +// conditionSb.append(" and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') >= '" + warnTime.split(",")[0] + "'" +// + " and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') <= '" + warnTime.split(",")[1] + "'"); +// } else { +// conditionSb.append(" and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') = '" + warnTime + "'"); +// } +// } +// } //高级搜索 queryConditionVOList List if(ObjectUtils.isNotEmpty(parameter.get("queryConditionVOList"))){ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java index 1fd7b4b88..1887f6bb7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java @@ -102,7 +102,7 @@ public class LawsWarnService { } else if(StringUtils.equals(flag,"1")){ parameter.put("implement_time",parameter.get("WarnTime")); } - parameter.remove("WarnTime"); +// parameter.remove("WarnTime"); String cut = (String) parameter.get("cut");//中英文切换标识 List onlCgformFieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); @@ -122,6 +122,8 @@ public class LawsWarnService { fieldListNew.add(fieldTemp); } } + + //封装查询条件 String condition = bussDocumentLibraryEOService.getConditionStr(parameter); int pageNo = Integer.parseInt(parameter.get("pageNo").toString()); diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 28d744d1e..e65385334 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1333,6 +1333,7 @@ module.exports = { inRecentMonths6:'In recent 6 months', inRecentYear1:'In recent 1 year', inRecentYear2:'In recent 2 year', + inRecentYear3:'In recent 3 year', selectAll:'Select All', importLocalDisassemblyOrder:'Import local disassembly order', notExport:'Not exported', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index f92664c4a..f4d27845b 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1435,6 +1435,7 @@ module.exports = { inRecentMonths6: '近6个月内', inRecentYear1: '近1年内', inRecentYear2: '近2年内', + inRecentYear3: '近3年内', selectAll: '全选', importLocalDisassemblyOrder: '导入本地拆解单', notExport: '未导出', diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue index af43a52be..465f35037 100644 --- a/jero-web/src/components/search/index.vue +++ b/jero-web/src/components/search/index.vue @@ -245,7 +245,7 @@ if (this.isDefault) { let startTime = moment(new Date()).format('YYYY-MM-DD') // this.queryParam['WarnTimeText'] = '2' - let endTime = this.getNowdate() + let endTime = '2099-01-01' this.queryParam['WarnTime'] = [startTime, endTime] this.queryParam = { ...this.queryParam } } @@ -295,6 +295,9 @@ }else if (this.queryParam['WarnTimeText'] == '5') { monthData = 7 yearData = -1 + }else if (this.queryParam['WarnTimeText'] == '6') { + monthData = 37 + yearData = 3 } if(this.queryParam['WarnTimeText'] == '5'){ var time = new Date(); diff --git a/jero-web/src/views/regulatoryEarlyWarning/index.vue b/jero-web/src/views/regulatoryEarlyWarning/index.vue index e1d2d7b2b..6554970ac 100644 --- a/jero-web/src/views/regulatoryEarlyWarning/index.vue +++ b/jero-web/src/views/regulatoryEarlyWarning/index.vue @@ -155,7 +155,10 @@ value: '4', name: this.$t('inRecentYear2') }, - + { + value: '6', + name: this.$t('inRecentYear3') + }, ] } ], @@ -338,6 +341,9 @@ } else if (this.searchParmes['WarnTimeText'] == '4') { monthData = 25 yearData = 2 + }else if (this.queryParam['WarnTimeText'] == '6') { + monthData = 37 + yearData = 3 } var date_now = new Date()//获取当前时间 var year = date_now.getFullYear()//获取当前时间的年份 From 3a8e61e5338d98a69a71801af0cf7254bd8eff9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 31 May 2023 11:57:34 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E9=87=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/service/impl/ProjectLawsInventoryEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 781436b00..91797c52f 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 @@ -6846,7 +6846,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Tue, 6 Jun 2023 14:15:18 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BB=BB=E6=84=8F=E4=B8=8A=E4=BC=A0windows=E7=9A=84$$DATA?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=B5=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/common/util/CommonUtils.java | 2 +- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application-test.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/CommonUtils.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/CommonUtils.java index eaa9de9ef..73829e372 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/CommonUtils.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/CommonUtils.java @@ -220,7 +220,7 @@ public class CommonUtils { */ public static boolean limitFileSuffix(String fileName,String[] fileSuffixLimits){ final List fileNameList = Arrays.asList(fileSuffixLimits); - boolean isExists = fileNameList.stream().anyMatch(name -> fileName.substring(0,fileName.lastIndexOf('.')).contains(name)||fileName.substring(fileName.lastIndexOf('.')).equals(name)); + boolean isExists = fileNameList.stream().anyMatch(name -> fileName.substring(0,fileName.lastIndexOf('.')).contains(name)||fileName.substring(fileName.lastIndexOf('.')).contains(name)); return isExists; } /** diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml index 53383a8d2..37c4bed53 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -287,7 +287,7 @@ jero : type: STANDALONE enabled: true # 文件限制后缀黑名单 - fileSuffixLimits : 0x00,%00,\\00,.jsp,.exe,.php,.asp,.aspx,.jspx,.xml,.html,.js,.sh,.bin + fileSuffixLimits : 0x00,%00,\\00,.jsp,.exe,.php,.asp,.aspx,.jspx,.xml,.html,.js,.sh,.bin,$DATA # 跨站白名单 whiteUrls: #cas单点登录 diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml index e42c282f8..dd13647ef 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml @@ -253,7 +253,7 @@ jero : type: STANDALONE enabled: true # 文件限制后缀黑名单 - fileSuffixLimits : 0x00,%00,\\00,.jsp,.exe,.php,.asp,.aspx,.jspx,.xml,.html,.js,.sh,.bin + fileSuffixLimits : 0x00,%00,\\00,.jsp,.exe,.php,.asp,.aspx,.jspx,.xml,.html,.js,.sh,.bin,$DATA # 跨站白名单 whiteUrls: #cas单点登录 diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-test.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-test.yml index 3c9365ccf..b80f02cb7 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-test.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-test.yml @@ -257,7 +257,7 @@ jero : type: STANDALONE enabled: true # 文件限制后缀黑名单 - fileSuffixLimits : 0x00,%00,\\00,.jsp,.exe,.php,.asp,.aspx,.jspx,.xml,.html,.js,.sh,.bin + fileSuffixLimits : 0x00,%00,\\00,.jsp,.exe,.php,.asp,.aspx,.jspx,.xml,.html,.js,.sh,.bin,$DATA # 跨站白名单 whiteUrls: #cas单点登录 From 7a6dd9a6b159833e52a5f5ddf4d0448a6cd969d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 7 Jun 2023 19:25:05 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOServiceImpl.java | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index c33192062..c91389679 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -4346,6 +4346,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl dbFieldExampleList = new LinkedList<>(); // 固定列 + int indexOfDescription = 1; // 参数名称的位置 for (int i = 0; i < fieldList.size(); i++) { OnlCgformField onlCgformField = fieldList.get(i); String dbFieldName = onlCgformField.getDbFieldName(); @@ -4356,6 +4357,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl dbFieldNameListCC = new LinkedList<>(); + List dbFieldListCC = new LinkedList<>(); + // 查询所有认证类别 + List sysDictItemList = sysDictItemService.selectItemsByDictCode("cert_category"); + if (CutEnum.EN.getValue().equals(cut)) { + sysDictItemList.forEach(sysDictItem -> { + dbFieldListCC.add(sysDictItem.getItemValue()); + dbFieldNameListCC.add(sysDictItem.getEnName() + " Number"); + }); + + } else { + sysDictItemList.forEach(sysDictItem -> { + dbFieldListCC.add(sysDictItem.getItemValue()); + dbFieldNameListCC.add(sysDictItem.getItemText() + "编号"); + }); + } + dbFieldList.addAll(dbFieldListCC); + dbFieldNameList.addAll(dbFieldNameListCC); + String[] title = new String[3]; String dbFieldStr = StringUtils.join(dbFieldList, ","); String dbFieldNameStr = StringUtils.join(dbFieldNameList, ","); @@ -4595,6 +4619,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl nioNumberList = dataList.stream().map(m -> (String) m.getNioNumber()).collect(Collectors.toList()); + List certCategoryParamsInfoPublishEOList = certCategoryParamsInfoPublishEOService.queryListByVersionAndNio(paramsTemplateId, paramsTemplatePublishVersion, nioNumberList); //查询所有认证类别参数项 + for (ParamsCollectManifestEO collectManifestEO : exportDataList) { Map record1 = objectToMapDre(collectManifestEO); String controlType = (String) record1.get("control_type"); @@ -4844,6 +4873,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl certCategoryParamsInfoPublishEOS = certCategoryParamsInfoPublishEOList.stream().filter(e -> nioNumber.equals(e.getNioNumber())).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(certCategoryParamsInfoPublishEOS)) { + certCategoryParamsInfoPublishEOS.forEach(certCategoryParamsInfoPublishEO -> { + record1.put(certCategoryParamsInfoPublishEO.getCertCategory(), certCategoryParamsInfoPublishEO.getParamsNumber()); + }); + } + // 处理参考列，没引用过则不显示该列 if (StringUtils.isNotEmpty(paramsManifestEO.getReferencesColName()) && StringUtils.isNotEmpty(collectManifestEO.getReferencesCol())) { List referencesColList = Arrays.asList(collectManifestEO.getReferencesCol().split("#")); @@ -5480,6 +5517,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl list = paramsConfigDataEOList.stream().filter(e -> collectManifestMap.get(nioNumber).equals(e.getParamsCollectManifestId()) From 57e94856d9ded044e7967ca7d1788e357d0b58c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 8 Jun 2023 11:38:05 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E8=A7=92=E8=89=B2=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOServiceImpl.java | 88 +++++++++---------- 1 file changed, 42 insertions(+), 46 deletions(-) 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 91797c52f..8857dcbce 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 @@ -618,29 +618,27 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 0) { for (String allDuty : allDutyList) { String dutyPerson = allDuty; - if (!StringUtils.isEmpty(dutyPerson)) { - if (!allList.contains(dutyPerson)) { - if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())) { - if (relatedPersonnel.getEngineeringInterfacePerson() != null) { - String engineeringInterfacePerson = dutyPerson + "," + relatedPersonnel.getEngineeringInterfacePerson(); - relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson); - } else { - relatedPersonnel.setEngineeringInterfacePerson(dutyPerson); - } - } else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())) { - if (relatedPersonnel.getEngineerLawSet() != null) { - String engineerLawSet = dutyPerson + "," + relatedPersonnel.getEngineerLawSet(); - relatedPersonnel.setEngineerLawSet(engineerLawSet); - } else { - relatedPersonnel.setEngineerLawSet(dutyPerson); - } - } else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())) { - if (relatedPersonnel.getEngineerAttSet() != null) { - String engineerAttSet = dutyPerson + "," + relatedPersonnel.getEngineerAttSet(); - relatedPersonnel.setEngineerAttSet(engineerAttSet); - } else { - relatedPersonnel.setEngineerAttSet(dutyPerson); - } + if (StringUtils.isNotEmpty(dutyPerson) && !allList.contains(dutyPerson) && StringUtils.isNotEmpty(roleCode1)) { + if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())) { + if (relatedPersonnel.getEngineeringInterfacePerson() != null) { + String engineeringInterfacePerson = dutyPerson + "," + relatedPersonnel.getEngineeringInterfacePerson(); + relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson); + } else { + relatedPersonnel.setEngineeringInterfacePerson(dutyPerson); + } + } else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())) { + if (relatedPersonnel.getEngineerLawSet() != null) { + String engineerLawSet = dutyPerson + "," + relatedPersonnel.getEngineerLawSet(); + relatedPersonnel.setEngineerLawSet(engineerLawSet); + } else { + relatedPersonnel.setEngineerLawSet(dutyPerson); + } + } else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())) { + if (relatedPersonnel.getEngineerAttSet() != null) { + String engineerAttSet = dutyPerson + "," + relatedPersonnel.getEngineerAttSet(); + relatedPersonnel.setEngineerAttSet(engineerAttSet); + } else { + relatedPersonnel.setEngineerAttSet(dutyPerson); } } } @@ -4558,29 +4556,27 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 0) { for (String allDuty : allDutyList) { String dutyPerson = allDuty; - if (!StringUtils.isEmpty(dutyPerson)) { - if (!allList.contains(dutyPerson)) { - if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())) { - if (relatedPersonnel.getEngineeringInterfacePerson() != null) { - String engineeringInterfacePerson = dutyPerson + "," + relatedPersonnel.getEngineeringInterfacePerson(); - relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson); - } else { - relatedPersonnel.setEngineeringInterfacePerson(dutyPerson); - } - } else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())) { - if (relatedPersonnel.getEngineerLawSet() != null) { - String engineerLawSet = dutyPerson + "," + relatedPersonnel.getEngineerLawSet(); - relatedPersonnel.setEngineerLawSet(engineerLawSet); - } else { - relatedPersonnel.setEngineerLawSet(dutyPerson); - } - } else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())) { - if (relatedPersonnel.getEngineerAttSet() != null) { - String engineerAttSet = dutyPerson + "," + relatedPersonnel.getEngineerAttSet(); - relatedPersonnel.setEngineerAttSet(engineerAttSet); - } else { - relatedPersonnel.setEngineerAttSet(dutyPerson); - } + if (StringUtils.isNotEmpty(dutyPerson) && !allList.contains(dutyPerson) && StringUtils.isNotEmpty(roleCode1)) { + if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())) { + if (relatedPersonnel.getEngineeringInterfacePerson() != null) { + String engineeringInterfacePerson = dutyPerson + "," + relatedPersonnel.getEngineeringInterfacePerson(); + relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson); + } else { + relatedPersonnel.setEngineeringInterfacePerson(dutyPerson); + } + } else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())) { + if (relatedPersonnel.getEngineerLawSet() != null) { + String engineerLawSet = dutyPerson + "," + relatedPersonnel.getEngineerLawSet(); + relatedPersonnel.setEngineerLawSet(engineerLawSet); + } else { + relatedPersonnel.setEngineerLawSet(dutyPerson); + } + } else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())) { + if (relatedPersonnel.getEngineerAttSet() != null) { + String engineerAttSet = dutyPerson + "," + relatedPersonnel.getEngineerAttSet(); + relatedPersonnel.setEngineerAttSet(engineerAttSet); + } else { + relatedPersonnel.setEngineerAttSet(dutyPerson); } } } From 8e5b2aa962b543f7571468fa9855b02305181342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 9 Jun 2023 18:19:38 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E8=8A=82=E7=82=B9MP=EF=BC=8C=E5=9C=B0=E6=96=B9=E6=89=B9?= =?UTF-8?q?=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/entity/ProjectTaskPlanning.java | 16 +++++ .../enums/ProjectTaskPlanningNameEnum.java | 3 + .../impl/ProjectTaskPlanningServiceImpl.java | 66 +++++++++++++++++++ 3 files changed, 85 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskPlanning.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskPlanning.java index 32324c8c2..ef06a26d1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskPlanning.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskPlanning.java @@ -147,4 +147,20 @@ public class ProjectTaskPlanning implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") private Date eight; + + /**mp*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date mp; + + /**地方批准1*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date localapproval1; + + /**地方批准2*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date localapproval2; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java index 767676d4c..3905ec322 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java @@ -18,6 +18,8 @@ public enum ProjectTaskPlanningNameEnum { ATTESTATION_START_TIME("认证开始","Certification Start"),// name:认证开始 value:Certification begins VERIFY_DEADLINE("验证核查","Verification And Verification"), CERTIFICATION_SUBMISSION("认证提交","Certification Submission"), + LOCALAPPROVAL_1("地方批准1","Local Approval 1"), + LOCALAPPROVAL_2("地方批准2","Local Approval 2"), G_ZERO("G0","G0"), G_ONE("G1","G1"), G_TWO("G2","G2"), @@ -26,6 +28,7 @@ public enum ProjectTaskPlanningNameEnum { G_FIVE("G5","G5"), G_SIX("G6","G6"), G_SEVEN("G7","G7"), + G_MP("MP","MP"), // VERIFY_DEADLINE("验证符合性确认","Validation Compliance Confirmation"), ; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java index 478d48fd1..2130aae07 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java @@ -299,6 +299,52 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl Date: Mon, 12 Jun 2023 15:35:23 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsCollectManifestEOServiceImpl.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index c33192062..37c66f4c9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -3789,9 +3789,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl Date: Wed, 14 Jun 2023 11:20:34 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOController.java | 2 + .../ProjectLawsInventoryEOServiceImpl.java | 43 ++++++++++--------- 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java index ae498ef27..d3a21eb4f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java @@ -303,6 +303,8 @@ public class ProjectLawsInventoryEOController extends JeroController dutyTerritoryList = new ArrayList<>(); //获取批量设置中责任领域 - String dutyTerritory = projectLawsInventoryEOList.get(0).getDutyTerritory(); + String dutyTerritory = projectLawsInventoryEO.getDutyTerritory(); if (!StringUtils.isEmpty(dutyTerritory)) { for (ProjectLawsInventoryEO info : infoList) { info.setDutyTerritory(dutyTerritory); } - } - if (!StringUtils.isEmpty(DesdutyId)) { - for (ProjectLawsInventoryEO info : infoList) { - info.setDesignDutyId(DesdutyId); - } - } - if (!StringUtils.isEmpty(VerdutyId)) { - for (ProjectLawsInventoryEO info : infoList) { - info.setVerifyDutyId(VerdutyId); - } - } - - if (!StringUtils.isEmpty(dutyTerritory)) { dutyTerritoryList = Arrays.asList(dutyTerritory.split(",")); dutyTerritoryList = dutyTerritoryList.stream().distinct().collect(Collectors.toList()); } else { @@ -4461,9 +4448,20 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl params = new HashMap<>(); params.put("projectLibraryId", projectLibrartId); params.put("userId", currentUser.getId()); @@ -4480,9 +4478,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl designDutyIdList = new ArrayList<>(); - designDutyIdList = Arrays.asList(projectLawsInventoryEO1.getDesignDutyId().split(",")); + if (StringUtils.isNotEmpty(projectLawsInventoryEO1.getDesignDutyId())) { + designDutyIdList = Arrays.asList(projectLawsInventoryEO1.getDesignDutyId().split(",")); + } + List verifyDutyIdList = new ArrayList<>(); - verifyDutyIdList = Arrays.asList(projectLawsInventoryEO1.getVerifyDutyId().split(",")); + if (StringUtils.isNotEmpty(projectLawsInventoryEO1.getVerifyDutyId())) { + verifyDutyIdList = Arrays.asList(projectLawsInventoryEO1.getVerifyDutyId().split(",")); + } //allDutyList 为法规工程师中验证符合性和确认符合中的责任人 List allDutyList = new ArrayList<>(); From 522475cfd746f65edad7a8d152ab317b07528a21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 14 Jun 2023 15:55:01 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOServiceImpl.java | 229 +++++++++--------- 1 file changed, 111 insertions(+), 118 deletions(-) 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 c8a4de920..b21ddee2b 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 @@ -4433,27 +4433,27 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl dutyTerritoryList = new ArrayList<>(); //获取批量设置中责任领域 String dutyTerritory = projectLawsInventoryEO.getDutyTerritory(); - if (!StringUtils.isEmpty(dutyTerritory)) { + if (StringUtils.isNotEmpty(dutyTerritory)) { for (ProjectLawsInventoryEO info : infoList) { info.setDutyTerritory(dutyTerritory); } dutyTerritoryList = Arrays.asList(dutyTerritory.split(",")); - dutyTerritoryList = dutyTerritoryList.stream().distinct().collect(Collectors.toList()); } else { for (ProjectLawsInventoryEO info : infoList) { - List dutyList = new ArrayList<>(); - dutyList = Arrays.asList(info.getDutyTerritory().split(",")); - dutyTerritoryList.addAll(dutyList); + if (StringUtils.isNotEmpty(info.getDutyTerritory())) { + dutyTerritoryList.addAll(Arrays.asList(info.getDutyTerritory().split(","))); + } } - dutyTerritoryList = dutyTerritoryList.stream().distinct().collect(Collectors.toList()); } - if (!StringUtils.isEmpty(desdutyId)) { + dutyTerritoryList = dutyTerritoryList.stream().distinct().collect(Collectors.toList()); + + if (StringUtils.isNotEmpty(desdutyId)) { for (ProjectLawsInventoryEO info : infoList) { info.setDesignDutyId(desdutyId); } } - if (!StringUtils.isEmpty(verdutyId)) { + if (StringUtils.isNotEmpty(verdutyId)) { for (ProjectLawsInventoryEO info : infoList) { info.setVerifyDutyId(verdutyId); } @@ -4467,132 +4467,125 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl studionList = new ArrayList<>(); + List certificationEngineerList = new ArrayList<>(); + List projectLibraryBases = projectLibraryBaseService.queryById(projectLibrartId, cut); + String roleCode1 = projectLibraryRoleRelEO.getRoleCode(); + if(CollectionUtils.isNotEmpty(dutyTerritoryList)){ + //获取相关责任领域下的和projectLibrartId的相关人员名单的信息 + List projectRelatedPersonnelList = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritoy(projectLibrartId, dutyTerritoryList); + if(CollectionUtils.isNotEmpty(projectRelatedPersonnelList)){ + List updatePrpEoList = new ArrayList<>(); - //获取相关责任领域下的和projectLibrartId的相关人员名单的信息 - List projectRelatedPersonnelList = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritoy(projectLibrartId, dutyTerritoryList); + for (ProjectLawsInventoryEO projectLawsInventoryEO1 : infoList) { - List list = new ArrayList<>(); + //分别获取当前编辑中的设计符合性和认证符合性责任人 + List designDutyIdList = new ArrayList<>(); + if (StringUtils.isNotEmpty(projectLawsInventoryEO1.getDesignDutyId())) { + designDutyIdList = Arrays.asList(projectLawsInventoryEO1.getDesignDutyId().split(",")); + } - for (ProjectLawsInventoryEO projectLawsInventoryEO1 : infoList) { + List verifyDutyIdList = new ArrayList<>(); + if (StringUtils.isNotEmpty(projectLawsInventoryEO1.getVerifyDutyId())) { + verifyDutyIdList = Arrays.asList(projectLawsInventoryEO1.getVerifyDutyId().split(",")); + } - //分别获取当前编辑中的设计符合性和认证符合性责任人 - List designDutyIdList = new ArrayList<>(); - if (StringUtils.isNotEmpty(projectLawsInventoryEO1.getDesignDutyId())) { - designDutyIdList = Arrays.asList(projectLawsInventoryEO1.getDesignDutyId().split(",")); - } + //allDutyList 为法规工程师中验证符合性和确认符合中的责任人 + List allDutyList = new ArrayList<>(); + allDutyList.addAll(designDutyIdList); + allDutyList.addAll(verifyDutyIdList); + allDutyList = allDutyList.stream().distinct().collect(Collectors.toList()); - List verifyDutyIdList = new ArrayList<>(); - if (StringUtils.isNotEmpty(projectLawsInventoryEO1.getVerifyDutyId())) { - verifyDutyIdList = Arrays.asList(projectLawsInventoryEO1.getVerifyDutyId().split(",")); - } + List allList = new ArrayList<>(); + List enginnerList = new ArrayList<>(); + List lawEnginnerList = new ArrayList<>(); + List enginnerLawSetList = new ArrayList<>(); + List enginnerAttSetList = new ArrayList<>(); - //allDutyList 为法规工程师中验证符合性和确认符合中的责任人 - List allDutyList = new ArrayList<>(); - allDutyList.addAll(designDutyIdList); - allDutyList.addAll(verifyDutyIdList); - allDutyList = allDutyList.stream().distinct().collect(Collectors.toList()); + for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) { + // 工程接口人 + String enginneringInterfacePerson = relatedPersonnel.getEngineeringInterfacePerson(); + if (!StringUtils.isEmpty(enginneringInterfacePerson)) { + enginnerList = Arrays.stream(enginneringInterfacePerson.split(",")).collect(Collectors.toList()); + allList.addAll(enginnerList); + } - List allList = new ArrayList<>(); - List enginnerList = new ArrayList<>(); - List lawEnginnerList = new ArrayList<>(); - List enginnerLawSetList = new ArrayList<>(); - List enginnerAttSetList = new ArrayList<>(); - //根据相关人员名单获取的工程接口人 - for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) { - String enginneringInterfacePerson = relatedPersonnel.getEngineeringInterfacePerson(); - if (!StringUtils.isEmpty(enginneringInterfacePerson)) { - enginnerList = Arrays.stream(enginneringInterfacePerson.split(",")).collect(Collectors.toList()); - allList.addAll(enginnerList); - } - } - //获取相关人员名单中的法规工程师 - for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) { - String lawEngineer = relatedPersonnel.getLawEngineer(); - if (!StringUtils.isEmpty(lawEngineer)) { - lawEnginnerList = Arrays.stream(lawEngineer.split(",")).collect(Collectors.toList()); - allList.addAll(lawEnginnerList); - } - } - //获取相关人员名单中的工程接口-法规工程师设置 - for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) { - String engineerLawSet = relatedPersonnel.getEngineerLawSet(); - if (!StringUtils.isEmpty(engineerLawSet)) { - enginnerLawSetList = Arrays.stream(engineerLawSet.split(",")).collect(Collectors.toList()); - allList.addAll(enginnerLawSetList); - } - } - //获取相关人员名单中的工程接口-认证工程师设置 - for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) { - String engineerAttSet = relatedPersonnel.getEngineerAttSet(); - if (!StringUtils.isEmpty(engineerAttSet)) { - enginnerAttSetList = Arrays.stream(engineerAttSet.split(",")).collect(Collectors.toList()); - allList.addAll(enginnerAttSetList); - } - } - //获取当前项目库id的studio工程师和认证工程师 - List studionList = new ArrayList<>(); - List certificationEngineerList = new ArrayList<>(); - List projectLibraryBases = projectLibraryBaseService.queryById(projectLibrartId, cut); - for (ProjectLibraryBase projectLibraryBase : projectLibraryBases) { - studionList.add(projectLibraryBase.getStudioEngineer()); + // 法规工程师 + String lawEngineer = relatedPersonnel.getLawEngineer(); + if (!StringUtils.isEmpty(lawEngineer)) { + lawEnginnerList = Arrays.stream(lawEngineer.split(",")).collect(Collectors.toList()); + allList.addAll(lawEnginnerList); + } - String certificationEngineer = projectLibraryBase.getCertificationEngineer(); - if (!StringUtils.isEmpty(certificationEngineer)) { - certificationEngineerList = Arrays.stream(certificationEngineer.split(",")).collect(Collectors.toList()); - allList.addAll(certificationEngineerList); - } - } - allList = allList.stream().filter(all -> { - return StringUtils.isNotBlank(all); - }).distinct().collect(Collectors.toList()); - /* - for(String all : allList){ - if(all.equals("")){ - allList.remove(all); - } - } - */ - //遍历所有人alllist中是否包含责任人,如果包含，不用操作。 - //-------如果不包含,再去判断当前用户的角色是studio、法规还是认证 - for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) { - if (allList.size() > 0) { - for (String allDuty : allDutyList) { - String dutyPerson = allDuty; - if (StringUtils.isNotEmpty(dutyPerson) && !allList.contains(dutyPerson) && StringUtils.isNotEmpty(roleCode1)) { - if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())) { - if (relatedPersonnel.getEngineeringInterfacePerson() != null) { - String engineeringInterfacePerson = dutyPerson + "," + relatedPersonnel.getEngineeringInterfacePerson(); - relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson); - } else { - relatedPersonnel.setEngineeringInterfacePerson(dutyPerson); - } - } else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())) { - if (relatedPersonnel.getEngineerLawSet() != null) { - String engineerLawSet = dutyPerson + "," + relatedPersonnel.getEngineerLawSet(); - relatedPersonnel.setEngineerLawSet(engineerLawSet); - } else { - relatedPersonnel.setEngineerLawSet(dutyPerson); - } - } else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())) { - if (relatedPersonnel.getEngineerAttSet() != null) { - String engineerAttSet = dutyPerson + "," + relatedPersonnel.getEngineerAttSet(); - relatedPersonnel.setEngineerAttSet(engineerAttSet); - } else { - relatedPersonnel.setEngineerAttSet(dutyPerson); + // 工程接口-法规工程师设置 + String engineerLawSet = relatedPersonnel.getEngineerLawSet(); + if (!StringUtils.isEmpty(engineerLawSet)) { + enginnerLawSetList = Arrays.stream(engineerLawSet.split(",")).collect(Collectors.toList()); + allList.addAll(enginnerLawSetList); + } + + // 工程接口-认证工程师设置 + String engineerAttSet = relatedPersonnel.getEngineerAttSet(); + if (!StringUtils.isEmpty(engineerAttSet)) { + enginnerAttSetList = Arrays.stream(engineerAttSet.split(",")).collect(Collectors.toList()); + allList.addAll(enginnerAttSetList); + } + } + + for (ProjectLibraryBase projectLibraryBase : projectLibraryBases) { + studionList.add(projectLibraryBase.getStudioEngineer()); + + String certificationEngineer = projectLibraryBase.getCertificationEngineer(); + if (!StringUtils.isEmpty(certificationEngineer)) { + certificationEngineerList = Arrays.stream(certificationEngineer.split(",")).collect(Collectors.toList()); + allList.addAll(certificationEngineerList); + } + } + allList = allList.stream().filter(all -> { + return StringUtils.isNotBlank(all); + }).distinct().collect(Collectors.toList()); + //遍历所有人alllist中是否包含责任人,如果包含，不用操作。 + //-------如果不包含,再去判断当前用户的角色是studio、法规还是认证 + for (ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList) { + if (allList.size() > 0) { + for (String allDuty : allDutyList) { + String dutyPerson = allDuty; + if (StringUtils.isNotEmpty(dutyPerson) && !allList.contains(dutyPerson) && StringUtils.isNotEmpty(roleCode1)) { + if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue())) { + if (relatedPersonnel.getEngineeringInterfacePerson() != null) { + String engineeringInterfacePerson = dutyPerson + "," + relatedPersonnel.getEngineeringInterfacePerson(); + relatedPersonnel.setEngineeringInterfacePerson(engineeringInterfacePerson); + } else { + relatedPersonnel.setEngineeringInterfacePerson(dutyPerson); + } + } else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue())) { + if (relatedPersonnel.getEngineerLawSet() != null) { + String engineerLawSet = dutyPerson + "," + relatedPersonnel.getEngineerLawSet(); + relatedPersonnel.setEngineerLawSet(engineerLawSet); + } else { + relatedPersonnel.setEngineerLawSet(dutyPerson); + } + } else if (roleCode1.equals(com.jero.modules.project.enums.ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())) { + if (relatedPersonnel.getEngineerAttSet() != null) { + String engineerAttSet = dutyPerson + "," + relatedPersonnel.getEngineerAttSet(); + relatedPersonnel.setEngineerAttSet(engineerAttSet); + } else { + relatedPersonnel.setEngineerAttSet(dutyPerson); + } + } } } } } + + updatePrpEoList.addAll(projectRelatedPersonnelList); } + this.projectRelatedPersonnelService.updateBatchById(updatePrpEoList); } - - list.addAll(projectRelatedPersonnelList); -// this.projectRelatedPersonnelService.updateBatchById(projectRelatedPersonnelList); } - this.projectRelatedPersonnelService.updateBatchById(list); - - projectLawsInventoryEOList.forEach(projectLawsInventory -> { //更新三个符合性流程中的处理人。 this.updateFlowInfo(projectLawsInventory);