WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

平台件导入-处理法规工程师和工程接口人

Browse Source
This commit is contained in:
zhn
2023-09-27 20:11:25 +08:00
parent 75045db527
commit c03c978717
1 changed files with 69 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+69 -2
View File
@@ -5440,6 +5440,24 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
userNameList.addAll(Arrays.asList(verifyDutyIds.split(",")));
List<SysUser> sysUserList = this.sysUserService.querySysUserByUserNameList(userNameList);
List<String> userIdList = new ArrayList<>();
if(ObjectUtils.isNotEmpty(dataList)){
//regulationOwnerId engineeringInterfacePerson
List<String> collect1 = dataList.stream().filter(e -> StringUtils.isNotBlank(e.getRegulationOwnerId()))
.map(ProjectLawsInventoryEO::getRegulationOwnerId).distinct().collect(Collectors.toList());
List<String> 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<SysUser> 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<Platf
if (StringUtils.isNotBlank(regulationOwnerId)) {
nameCn = "法规工程师";
nameEn = "regulatory engineer";
List<SysUser> 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<Platf
nameCn = "工程接口人";
nameEn = "Engineering Interface ";
//验证人员是否存在
personnelVerify(projectLawsInventoryEO, errorMsg, msgList, engineeringInterfacePerson, mapPersonList, nameCn, nameEn, ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue());
List<SysUser> 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<Platf
msgList.add(errorMsg);
}
}
private void personnelVerifyTemp(ProjectLawsInventoryEO projectLawsInventoryEO,
String errorMsg, List<String> msgList,
String regulationOwnerId,
List<SysUser> 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<String> msgList,