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

UAT问题清单，序号1修改。

Browse Source
This commit is contained in:
wangzhijiang
2023-04-06 13:07:06 +08:00
parent d39216a666
commit a52f4a0b38
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+18 -16
View File
@@ -725,9 +725,9 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
try { try {
String titleOne = ""; String titleOne = "";
if(CutEnum.CN.getValue().equals(cut)){ if(CutEnum.CN.getValue().equals(cut)){
titleOne = "责任领域,法规工程师,工程接口人,认证工程师,备注"; titleOne = "责任领域,法规工程师,工程接口人,工程接口人-法规工程师设置,工程接口人-认证工程师设置,备注";
}else{ }else{
titleOne = "Responsible Field,Regulation Engineer,Engineering Interface,Homologation Engineer,Comments"; titleOne = "Responsible Field,Regulation Engineer,Engineering Interface,Project Interface Person Regulation Engineer Setting,Project Interface Person Certification Engineer Setting,Comments";
} }
//创建临时文件夹 //创建临时文件夹
@@ -799,8 +799,10 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
dataRow.createCell(0).setCellValue(dataList.get(j - 2).getDutyTerritory()); dataRow.createCell(0).setCellValue(dataList.get(j - 2).getDutyTerritory());
dataRow.createCell(1).setCellValue(dataList.get(j - 2).getLawEngineerName()); dataRow.createCell(1).setCellValue(dataList.get(j - 2).getLawEngineerName());
dataRow.createCell(2).setCellValue(dataList.get(j - 2).getEngineeringInterfacePersonName()); dataRow.createCell(2).setCellValue(dataList.get(j - 2).getEngineeringInterfacePersonName());
dataRow.createCell(3).setCellValue(dataList.get(j - 2).getCertificationEngineerName()); //dataRow.createCell(3).setCellValue(dataList.get(j - 2).getCertificationEngineerName());
dataRow.createCell(4).setCellValue(dataList.get(j - 2).getRemark()); dataRow.createCell(3).setCellValue(dataList.get(j - 2).getEngineerLawSetName());
dataRow.createCell(4).setCellValue(dataList.get(j - 2).getEngineerAttSetName());
dataRow.createCell(5).setCellValue(dataList.get(j - 2).getRemark());
} }
} }
@@ -1076,7 +1078,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
String lawEngineerName = row.getCell(1, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString(); String lawEngineerName = row.getCell(1, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
String engineeringInterfacePersonName = row.getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString(); String engineeringInterfacePersonName = row.getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
String certificationEngineerName = row.getCell(3,Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString(); // String certificationEngineerName = row.getCell(3,Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
if(StringUtils.isBlank(lawEngineerName)){ if(StringUtils.isBlank(lawEngineerName)){
projectRelatedPersonnel.setLawEngineerName(""); projectRelatedPersonnel.setLawEngineerName("");
@@ -1088,11 +1090,11 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
}else{ }else{
projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringInterfacePersonName); projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringInterfacePersonName);
} }
if(StringUtils.isBlank(certificationEngineerName)){ /*if(StringUtils.isBlank(certificationEngineerName)){
projectRelatedPersonnel.setCertificationEngineerName(""); projectRelatedPersonnel.setCertificationEngineerName("");
}else{ }else{
projectRelatedPersonnel.setCertificationEngineerName(certificationEngineerName); projectRelatedPersonnel.setCertificationEngineerName(certificationEngineerName);
} }*/
// //除了责任领域全有值->可以 // //除了责任领域全有值->可以
// if(StringUtils.isNotBlank(lawEngineerName) && StringUtils.isNotBlank(engineeringInterfacePersonName) && StringUtils.isNotBlank(certificationEngineerName)) { // if(StringUtils.isNotBlank(lawEngineerName) && StringUtils.isNotBlank(engineeringInterfacePersonName) && StringUtils.isNotBlank(certificationEngineerName)) {
// projectRelatedPersonnel.setLawEngineerName(lawEngineerName); // projectRelatedPersonnel.setLawEngineerName(lawEngineerName);
@@ -1112,7 +1114,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
// } // }
//导入的备注为数字,被识别成小数点后一位 //导入的备注为数字,被识别成小数点后一位
Cell remarkCell = row.getCell(4, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); Cell remarkCell = row.getCell(3, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
remarkCell.setCellType(CellType.STRING); remarkCell.setCellType(CellType.STRING);
String remark = remarkCell.toString(); String remark = remarkCell.toString();
if(StringUtils.isNotEmpty(remark)) { if(StringUtils.isNotEmpty(remark)) {
@@ -1358,7 +1360,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
if (StringUtils.isNotBlank(projectRelatedPersonnel.getCertificationEngineerName())){ if (StringUtils.isNotBlank(projectRelatedPersonnel.getCertificationEngineerName())){
List<String> certificationEngineerNameList = Arrays.asList(projectRelatedPersonnel.getCertificationEngineerName().split(",")); List<String> certificationEngineerNameList = Arrays.asList(projectRelatedPersonnel.getCertificationEngineerName().split(","));
//校验是否为项目基础表设定的认证工程师 //校验是否为项目基础表设定的认证工程师
List<ProjectRelatedPersonnel> baseCertificationEngineerList = queryCertificationEngineer(projectId); /*List<ProjectRelatedPersonnel> baseCertificationEngineerList = queryCertificationEngineer(projectId);
List<String> baseCertificationEngineerNameList = baseCertificationEngineerList.stream().map(e -> e.getCertificationEngineerName()).collect(Collectors.toList()); List<String> baseCertificationEngineerNameList = baseCertificationEngineerList.stream().map(e -> e.getCertificationEngineerName()).collect(Collectors.toList());
//转为小写后在判断 //转为小写后在判断
List<String> baseCertificationEngineerNameListTemp = new ArrayList<>(); List<String> baseCertificationEngineerNameListTemp = new ArrayList<>();
@@ -1375,7 +1377,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
} }
break; break;
} }
} }*/
// for(String certificationEngineerName : certificationEngineerNameList){ // for(String certificationEngineerName : certificationEngineerNameList){
// if(!baseCertificationEngineerNameList.contains(certificationEngineerName.toLowerCase())){ // if(!baseCertificationEngineerNameList.contains(certificationEngineerName.toLowerCase())){
// //中英切换提示语 // //中英切换提示语
@@ -1641,25 +1643,25 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
//法规工程师异常提示语 //法规工程师异常提示语
if(ProjectRoleEnum.REGULATI_ENGINEER.getValue().equals(personnelType)){ if(ProjectRoleEnum.REGULATI_ENGINEER.getValue().equals(personnelType)){
if(CutEnum.CN.getValue().equals(cut)) { if(CutEnum.CN.getValue().equals(cut)) {
message.append("导入的工程接口人姓名有误,请检查第" + row + "行"); message.append("导入的法规工程师姓名有误,请检查第" + row + "行。");
}else{ }else{
message.append("The imported engineering interface person is wrong.Please check line " + row ); message.append("The imported Regulatory engineer is wrong.Please check line " + row +".");
} }
} }
//认证工程师异常提示语 //认证工程师异常提示语
if(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(personnelType)){ if(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(personnelType)){
if(CutEnum.CN.getValue().equals(cut)) { if(CutEnum.CN.getValue().equals(cut)) {
message.append("导入的认证工程师姓名有误,请检查第" + row + "行"); message.append("导入的认证工程师姓名有误,请检查第" + row + "行。");
}else { }else {
message.append("The imported certification engineer is wrong.Please check line " + row ); message.append("The imported certification engineer is wrong.Please check line " + row +".");
} }
} }
//工程接口人异常提示语 //工程接口人异常提示语
if(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue().equals(personnelType)){ if(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue().equals(personnelType)){
if(CutEnum.CN.getValue().equals(cut)) { if(CutEnum.CN.getValue().equals(cut)) {
message.append("导入的工程接口人姓名有误,请检查第" + row + "行"); message.append("导入的工程接口人姓名有误,请检查第" + row + "行。");
}else{ }else{
message.append("The imported engineering interface person is wrong.Please check line " + row ); message.append("The imported engineering interface person is wrong.Please check line " + row +".");
} }
} }
}else{ }else{