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:54:07 +08:00
parent c03c978717
commit fbdb09056d
1 changed files with 72 additions and 29 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/PlatformProjectCertificationInventoryEOServiceImpl.java
+72 -29
View File
@@ -4553,11 +4553,11 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
public void importData(MultipartFile file, ProjectCertificationInventoryEO projectCertificationInventoryEO) { public void importData(MultipartFile file, ProjectCertificationInventoryEO projectCertificationInventoryEO) {
String title = ""; String title = "";
if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
title = "*类别,*检验项目,*配置项,*认证类型,*WVTA ID," + title = "*类别,*检验项目,*认证类型,*WVTA ID," +
"*标准编号,*责任领域,*工程接口人,*责任人," + "*标准编号,*责任领域,*工程接口人,*责任人," +
"交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称"; "交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称";
}else { }else {
title = "*Category,*Inspection Items,*Configuration Item,*Certification Type,*WVTA ID," + title = "*Category,*Inspection Items,*Certification Type,*WVTA ID," +
"*Standard No,*Responsible Field,*Eng. Interface,*Assignee," + "*Standard No,*Responsible Field,*Eng. Interface,*Assignee," +
"Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer"; "Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer";
} }
@@ -4675,7 +4675,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
if (i == 0) { if (i == 0) {
cell.setCellType(HSSFCell.CELL_TYPE_STRING); cell.setCellType(HSSFCell.CELL_TYPE_STRING);
headerSb.append(cell.getStringCellValue() + ","); headerSb.append(cell.getStringCellValue() + ",");
if(j == 15){ if(j == 14){
break; break;
} }
} else if(i > 1){ } else if(i > 1){
@@ -4719,7 +4719,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
ProjectCertificationInventoryEO projectCertificationInventoryEOTemp = JSON.parseObject(JSON.toJSONString(stringStringMap), ProjectCertificationInventoryEO.class); ProjectCertificationInventoryEO projectCertificationInventoryEOTemp = JSON.parseObject(JSON.toJSONString(stringStringMap), ProjectCertificationInventoryEO.class);
projectCertificationInventoryEOTemp.setCut(projectCertificationInventoryEO.getCut()); projectCertificationInventoryEOTemp.setCut(projectCertificationInventoryEO.getCut());
projectCertificationInventoryEOTemp.setProjectLibraryId(projectCertificationInventoryEO.getProjectLibraryId()); projectCertificationInventoryEOTemp.setProjectLibraryId(projectCertificationInventoryEO.getProjectLibraryId());
projectCertificationInventoryEOTemp.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); projectCertificationInventoryEOTemp.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
projectCertificationInventoryEOTemp.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue()); projectCertificationInventoryEOTemp.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue());
datas.add(projectCertificationInventoryEOTemp); datas.add(projectCertificationInventoryEOTemp);
} }
@@ -4746,7 +4746,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
for(int k = 0 ; k <datas.size(); k++){ for(int k = 0 ; k <datas.size(); k++){
if(((datas.get(k).getCategory() == null)||(StringUtils.equals("",datas.get(k).getCategory()))) || if(((datas.get(k).getCategory() == null)||(StringUtils.equals("",datas.get(k).getCategory()))) ||
((datas.get(k).getInspectionItem() == null)||(StringUtils.equals("",datas.get(k).getInspectionItem()))) || ((datas.get(k).getInspectionItem() == null)||(StringUtils.equals("",datas.get(k).getInspectionItem()))) ||
((datas.get(k).getConfigItem() == null)||(StringUtils.equals("",datas.get(k).getConfigItem()))) || // ((datas.get(k).getConfigItem() == null)||(StringUtils.equals("",datas.get(k).getConfigItem()))) ||
((datas.get(k).getWvtaId() == null)||(StringUtils.equals("",datas.get(k).getWvtaId()))) || ((datas.get(k).getWvtaId() == null)||(StringUtils.equals("",datas.get(k).getWvtaId()))) ||
((datas.get(k).getSerialNumber() == null)||(StringUtils.equals("",datas.get(k).getSerialNumber()))) || ((datas.get(k).getSerialNumber() == null)||(StringUtils.equals("",datas.get(k).getSerialNumber()))) ||
((datas.get(k).getDutyTerritoryName() == null)||(StringUtils.equals("",datas.get(k).getDutyTerritoryName()))) || ((datas.get(k).getDutyTerritoryName() == null)||(StringUtils.equals("",datas.get(k).getDutyTerritoryName()))) ||
@@ -4767,7 +4767,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
for(int k = 0 ; k <datas.size(); k++){ for(int k = 0 ; k <datas.size(); k++){
if(((datas.get(k).getCategory() == null)||(StringUtils.equals("",datas.get(k).getCategory()))) || if(((datas.get(k).getCategory() == null)||(StringUtils.equals("",datas.get(k).getCategory()))) ||
((datas.get(k).getInspectionItem() == null)||(StringUtils.equals("",datas.get(k).getInspectionItem()))) || ((datas.get(k).getInspectionItem() == null)||(StringUtils.equals("",datas.get(k).getInspectionItem()))) ||
((datas.get(k).getConfigItem() == null)||(StringUtils.equals("",datas.get(k).getConfigItem()))) || // ((datas.get(k).getConfigItem() == null)||(StringUtils.equals("",datas.get(k).getConfigItem()))) ||
((datas.get(k).getWvtaId() == null)||(StringUtils.equals("",datas.get(k).getWvtaId()))) || ((datas.get(k).getWvtaId() == null)||(StringUtils.equals("",datas.get(k).getWvtaId()))) ||
((datas.get(k).getSerialNumber() == null)||(StringUtils.equals("",datas.get(k).getSerialNumber()))) || ((datas.get(k).getSerialNumber() == null)||(StringUtils.equals("",datas.get(k).getSerialNumber()))) ||
((datas.get(k).getDutyTerritoryName() == null)||(StringUtils.equals("",datas.get(k).getDutyTerritoryName()))) || ((datas.get(k).getDutyTerritoryName() == null)||(StringUtils.equals("",datas.get(k).getDutyTerritoryName()))) ||
@@ -4866,6 +4866,21 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
//编号验证 //编号验证
verifySerialNumber(datas,projectCertificationInventoryEOTemp); verifySerialNumber(datas,projectCertificationInventoryEOTemp);
List<String> userIdList = new ArrayList<>();
if(ObjectUtils.isNotEmpty(datas)){
//sdtName
List<String> collect1 = datas.stream().filter(e -> StringUtils.isNotBlank(e.getSdtName()))
.map(ProjectCertificationInventoryEO::getSdtName).distinct().collect(Collectors.toList());
if(ObjectUtils.isNotEmpty(collect1)){
userIdList.addAll(collect1);
}
}
List<SysUser> userList = new ArrayList<>();
if(ObjectUtils.isNotEmpty(userIdList)){
userList = sysUserService.queryUserIdListByNameList(userIdList);
}
for (ProjectCertificationInventoryEO projectCertificationInventoryEO : datas) { for (ProjectCertificationInventoryEO projectCertificationInventoryEO : datas) {
i++; i++;
String errorMsg = ""; String errorMsg = "";
@@ -4992,7 +5007,9 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
nameCn = "工程接口人"; nameCn = "工程接口人";
nameEn = "Eng. Interface "; nameEn = "Eng. Interface ";
//验证人员是否存在 //验证人员是否存在
personnelVerify(projectCertificationInventoryEO, errorMsg, msgList, sdt, mapPersonList,nameCn,nameEn, com.jero.modules.project.enums.ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue()); List<SysUser> sysUsers = userList.stream().filter(e -> sdt.equals(e.getUsername())).collect(Collectors.toList());
personnelVerify(projectCertificationInventoryEO, errorMsg, msgList, sdt, sysUsers,nameCn,nameEn, com.jero.modules.project.enums.ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue());
// personnelVerify(projectCertificationInventoryEO, errorMsg, msgList, sdt, mapPersonList,nameCn,nameEn, com.jero.modules.project.enums.ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue());
} }
//责任人 //责任人
@@ -5294,7 +5311,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
} }
private void personnelVerify(ProjectCertificationInventoryEO projectCertificationInventoryEO, private void personnelVerify(ProjectCertificationInventoryEO projectCertificationInventoryEO,
String errorMsg, List<String> msgList, String regulationOwnerId, String errorMsg, List<String> msgList, String regulationOwnerId,
List<Map<String, String>> mapList, String nameCn, String nameEn, String fieldNumber) { List<SysUser> sysUserList, String nameCn, String nameEn, String fieldNumber) {
//单选 //单选
if(regulationOwnerId.contains(",")){ if(regulationOwnerId.contains(",")){
if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
@@ -5305,35 +5322,61 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
msgList.add(errorMsg); msgList.add(errorMsg);
} }
if(mapList.size() != 0){ if(ObjectUtils.isNotEmpty(sysUserList)){
int count = 0; if(com.jero.modules.project.enums.ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue().equals(fieldNumber)){
for (Map<String, String> stringStringMap : mapList) { projectCertificationInventoryEO.setSdt(sysUserList.get(0).getId());
String name = stringStringMap.get("name");
if(regulationOwnerId.equals(name)){
count ++;
if(com.jero.modules.project.enums.ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue().equals(fieldNumber)){
projectCertificationInventoryEO.setSdt(stringStringMap.get("value"));
}
break;
}
}
if(count == 0){
if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
errorMsg += nameCn+regulationOwnerId+"与相关人员名单中责任领域下的人员不匹配";
}else{
errorMsg += nameEn+regulationOwnerId+"does not match a person under the Responsible Field in the relevant person list";
}
msgList.add(errorMsg);
} }
}else{ }else{
if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
errorMsg += nameCn+regulationOwnerId+"与相关人员名单中责任领域下的人员不匹配"; errorMsg += nameCn+regulationOwnerId+"不存在";
}else{ }else{
errorMsg += nameEn+regulationOwnerId+"does not match a person under the Responsible Field in the relevant person list"; errorMsg += nameEn+regulationOwnerId+"absent";
} }
msgList.add(errorMsg); msgList.add(errorMsg);
} }
} }
// private void personnelVerify(ProjectCertificationInventoryEO projectCertificationInventoryEO,
// String errorMsg, List<String> msgList, String regulationOwnerId,
// List<Map<String, String>> mapList, String nameCn, String nameEn, String fieldNumber) {
// //单选
// if(regulationOwnerId.contains(",")){
// if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
// errorMsg += nameCn + "导入只能填写一个用户名";
// }else{
// errorMsg += "Only one user name can be entered for"+ nameEn +"import";
// }
// msgList.add(errorMsg);
// }
//
// if(mapList.size() != 0){
// int count = 0;
// for (Map<String, String> stringStringMap : mapList) {
// String name = stringStringMap.get("name");
// if(regulationOwnerId.equals(name)){
// count ++;
// if(com.jero.modules.project.enums.ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue().equals(fieldNumber)){
// projectCertificationInventoryEO.setSdt(stringStringMap.get("value"));
// }
// break;
// }
// }
// if(count == 0){
// if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
// errorMsg += nameCn+regulationOwnerId+"与相关人员名单中责任领域下的人员不匹配";
// }else{
// errorMsg += nameEn+regulationOwnerId+"does not match a person under the Responsible Field in the relevant person list";
// }
// msgList.add(errorMsg);
// }
// }else{
// if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
// errorMsg += nameCn+regulationOwnerId+"与相关人员名单中责任领域下的人员不匹配";
// }else{
// errorMsg += nameEn+regulationOwnerId+"does not match a person under the Responsible Field in the relevant person list";
// }
// msgList.add(errorMsg);
// }
// }
private String pullMore(List<SysDictItem> dictItemList, ProjectCertificationInventoryEO projectCertificationInventoryEO, private String pullMore(List<SysDictItem> dictItemList, ProjectCertificationInventoryEO projectCertificationInventoryEO,
String errorMsg, String value, List<String> msgList, String errorMsg, String value, List<String> msgList,