From c03c978717ead3d5060cff3f4da1c6bd77595491 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 27 Sep 2023 20:11:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E5=AF=BC=E5=85=A5-?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=B3=95=E8=A7=84=E5=B7=A5=E7=A8=8B=E5=B8=88?= =?UTF-8?q?=E5=92=8C=E5=B7=A5=E7=A8=8B=E6=8E=A5=E5=8F=A3=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...formProjectLawsInventoryEOServiceImpl.java | 71 ++++++++++++++++++- 1 file changed, 69 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java index 412ed239c..917180cee 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java @@ -5440,6 +5440,24 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl sysUserList = this.sysUserService.querySysUserByUserNameList(userNameList); + List userIdList = new ArrayList<>(); + if(ObjectUtils.isNotEmpty(dataList)){ + //regulationOwnerId engineeringInterfacePerson + List collect1 = dataList.stream().filter(e -> StringUtils.isNotBlank(e.getRegulationOwnerId())) + .map(ProjectLawsInventoryEO::getRegulationOwnerId).distinct().collect(Collectors.toList()); + List collect2 = dataList.stream().filter(e -> StringUtils.isNotBlank(e.getEngineeringInterfacePerson())) + .map(ProjectLawsInventoryEO::getEngineeringInterfacePerson).distinct().collect(Collectors.toList()); + if(ObjectUtils.isNotEmpty(collect1)){ + userIdList.addAll(collect1); + } + if(ObjectUtils.isNotEmpty(collect2)){ + userIdList.addAll(collect2); + } + } + List userList = new ArrayList<>(); + if(ObjectUtils.isNotEmpty(userIdList)){ + userList = sysUserService.queryUserIdListByNameList(userIdList); + } //编号验证 verifySerialNumber(dataList, projectLawsInventoryEOTemp, dataSource); for (ProjectLawsInventoryEO projectLawsInventoryEO : dataList) { @@ -5594,8 +5612,9 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl sysUsers = userList.stream().filter(e -> regulationOwnerId.equals(e.getUsername())).collect(Collectors.toList()); //验证人员是否存在 - personnelVerify(projectLawsInventoryEO, errorMsg, msgList, regulationOwnerId, mapLawList, nameCn, nameEn, ProjectRoleEnum.REGULATI_ENGINEER.getValue()); + personnelVerifyTemp(projectLawsInventoryEO, errorMsg, msgList, regulationOwnerId, sysUsers, nameCn, nameEn, ProjectRoleEnum.REGULATI_ENGINEER.getValue()); } //认证工程师 @@ -5611,7 +5630,10 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl sysUsers = userList.stream().filter(e -> engineeringInterfacePerson.equals(e.getUsername())).collect(Collectors.toList()); + //验证人员是否存在 + personnelVerifyTemp(projectLawsInventoryEO, errorMsg, msgList, engineeringInterfacePerson, sysUsers, nameCn, nameEn, ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue()); +// personnelVerify(projectLawsInventoryEO, errorMsg, msgList, engineeringInterfacePerson, mapPersonList, nameCn, nameEn, ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue()); } } } @@ -6258,6 +6280,51 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl msgList, + String regulationOwnerId, + List sysUserList, + String nameCn, String nameEn, + String fieldNumber) { + //单选 + if (regulationOwnerId.contains(",")) { + if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { + errorMsg += nameCn + "导入只能填写一个用户名, "; + } else { + errorMsg += "Only one user name can be entered for" + nameEn + "import, "; + } + msgList.add(errorMsg); + } + + if (ObjectUtils.isNotEmpty(sysUserList)) { + if (ProjectRoleEnum.REGULATI_ENGINEER.getValue().equals(fieldNumber)) { + projectLawsInventoryEO.setRegulationOwnerId(sysUserList.get(0).getId()); + } else if (ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(fieldNumber)) { + projectLawsInventoryEO.setHomologationEngineerId(sysUserList.get(0).getId()); + } else if (ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue().equals(fieldNumber)) { + projectLawsInventoryEO.setEngineeringInterfacePerson(sysUserList.get(0).getId()); + } else if (ProjectRoleEnum.DESIGNINITIATOR.getValue().equals(fieldNumber)) { + projectLawsInventoryEO.setDesignInitiatorId(sysUserList.get(0).getId()); + } else if (ProjectRoleEnum.DESIGNDUTY.getValue().equals(fieldNumber)) { + projectLawsInventoryEO.setDesignDutyId(sysUserList.get(0).getId()); + } else if (ProjectRoleEnum.PREHOMOINITIATOR.getValue().equals(fieldNumber)) { + projectLawsInventoryEO.setPrehomoInitiatorId(sysUserList.get(0).getId()); + } else if (ProjectRoleEnum.PREHOMODUTY.getValue().equals(fieldNumber)) { + projectLawsInventoryEO.setPrehomoDutyId(sysUserList.get(0).getId()); + } else if (ProjectRoleEnum.VERIFYINITIATOR.getValue().equals(fieldNumber)) { + projectLawsInventoryEO.setVerifyInitiatorId(sysUserList.get(0).getId()); + } else if (ProjectRoleEnum.VERIFYDUTY.getValue().equals(fieldNumber)) { + projectLawsInventoryEO.setVerifyDutyId(sysUserList.get(0).getId()); + } + }else{ + if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { + errorMsg += nameCn + regulationOwnerId + "不存在， "; + } else { + errorMsg += nameEn + regulationOwnerId + "absent, "; + } + msgList.add(errorMsg); + } + } private boolean dateVerify(ProjectLawsInventoryEO projectLawsInventoryEO, String errorMsg, Date field, List msgList,