diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java index 1cbd1987d..b0132be73 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java @@ -1744,17 +1744,17 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl list = Arrays.asList(title.split(",")); int index = 0; if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){ - index = list.indexOf("*交付物类型") + 1; + index = list.indexOf("交付物模板") + 1; }else{ - index = list.indexOf("*Deliverable Type") + 1; + index = list.indexOf("Deliverable Template") + 1; } //创建临时文件夹 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java index e6917e2ca..e8372affe 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java @@ -237,7 +237,7 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl authDummyInventoryInfoEOList = this.authDummyInventoryInfoEOService.list(authDummyInfoQueryWrap); if(CollectionUtils.isNotEmpty(authDummyInventoryInfoEOList)){ + // 获取该项目相关人员名单信息,用于根据责任领域配置数据 自动设置责任人、接口人。 + QueryWrapper prpQueryWrap = new QueryWrapper<>(); + prpQueryWrap.lambda().eq(ProjectRelatedPersonnel::getProjectId,projectLibraryId); + List prpEoList = this.projectRelatedPersonnelService.list(prpQueryWrap); + QueryWrapper lawsInventoryEOQueryWrap = new QueryWrapper<>(); lawsInventoryEOQueryWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); List projectLawsInventoryEOList = this.projectLawsInventoryEOService.list(lawsInventoryEOQueryWrap); @@ -2849,6 +2854,42 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl prpEoListTemp = prpEoList.stream().filter(prpEo -> { + boolean flag = false; + if (StringUtils.equals(prpEo.getDutyTerritory(), dutyTerritory)) { + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(prpEoListTemp)){ + List engineeringInterfacePersonIdList = new ArrayList<>(); + ProjectRelatedPersonnel prpEo = prpEoListTemp.get(0); + if(StringUtils.isNotBlank(prpEo.getEngineeringInterfacePerson())){ + List engineeringInterfacePersonList = Arrays.asList(prpEo.getEngineeringInterfacePerson().split(",")); + engineeringInterfacePersonIdList.addAll(engineeringInterfacePersonList); + } + if(StringUtils.isNotBlank(prpEo.getEngineerAttSet())){ + List engineerAttSetList = Arrays.asList(prpEo.getEngineerAttSet().split(",")); + engineeringInterfacePersonIdList.addAll(engineerAttSetList); + } + if(StringUtils.isNotBlank(prpEo.getEngineerLawSet())){ + List engineerLawSetList = Arrays.asList(prpEo.getEngineerLawSet().split(",")); + engineeringInterfacePersonIdList.addAll(engineerLawSetList); + } + + engineeringInterfacePersonIdList = engineeringInterfacePersonIdList.stream().distinct().collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(engineeringInterfacePersonIdList) && engineeringInterfacePersonIdList.size() == 1){ + projectCertificationInventoryEOTemp.setSdt(engineeringInterfacePersonIdList.get(0)); + projectCertificationInventoryEOTemp.setDutyPerson(engineeringInterfacePersonIdList.get(0)); + } + } + } + } + projectCertificationInventoryEOTemp.setId(UUID.randomUUID().toString().replace("-", "")); projectCertificationInventoryEOTemp.setProjectLibraryId(projectLibraryId); projectCertificationInventoryEOTemp.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 66e74beb3..bcf2f4e85 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -725,9 +725,9 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl可以 // if(StringUtils.isNotBlank(lawEngineerName) && StringUtils.isNotBlank(engineeringInterfacePersonName) && StringUtils.isNotBlank(certificationEngineerName)) { // projectRelatedPersonnel.setLawEngineerName(lawEngineerName); @@ -1112,7 +1114,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl certificationEngineerNameList = Arrays.asList(projectRelatedPersonnel.getCertificationEngineerName().split(",")); //校验是否为项目基础表设定的认证工程师 - List baseCertificationEngineerList = queryCertificationEngineer(projectId); + /*List baseCertificationEngineerList = queryCertificationEngineer(projectId); List baseCertificationEngineerNameList = baseCertificationEngineerList.stream().map(e -> e.getCertificationEngineerName()).collect(Collectors.toList()); //转为小写后在判断 List baseCertificationEngineerNameListTemp = new ArrayList<>(); @@ -1375,7 +1377,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl{{$t('viewFile')}}--> -- + + + {{$t('viewFile')}} + + -- + + + + {{$t('viewFile')}} + + -- +
{{$t('total')+' '+this.dataSource.length+' '+ $t('strip')}} @@ -293,6 +309,7 @@ + @@ -1619,6 +1677,14 @@ ::v-deep .ant-table-thead > tr > th .ant-table-header-column { max-width: none !important; } + .viewFile { + color: #00B3BE; + cursor: pointer; + } + ::v-deep .ant-table-thead > tr > th[colspan]:not([colspan='1']){ + text-align: left; + padding-left: 16px!important; + }