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

相关人员校验修改

Browse Source
This commit is contained in:
xiejunyu
2022-06-09 11:50:02 +08:00
parent ef37e16d76
commit 49b9f6de19
1 changed files with 9 additions and 9 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
+9 -9
View File
@@ -545,7 +545,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
} }
Row rowExplain = sheet.createRow(1); Row rowExplain = sheet.createRow(1);
short height = (short) (7 * 252); short height = (short) (7 * 200);
rowExplain.setHeight((short) height); rowExplain.setHeight((short) height);
Cell cell = rowExplain.createCell(0); Cell cell = rowExplain.createCell(0);
cell.setCellValue(explain); cell.setCellValue(explain);
@@ -653,7 +653,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
} }
Row rowExplain = sheet.createRow(1); Row rowExplain = sheet.createRow(1);
short height = (short) (7 * 252); short height = (short) (7 * 200);
rowExplain.setHeight((short) height); rowExplain.setHeight((short) height);
Cell cell = rowExplain.createCell(0); Cell cell = rowExplain.createCell(0);
cell.setCellValue(explain); cell.setCellValue(explain);
@@ -761,13 +761,13 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
} }
} }
} }
}else if(i!=1 && columHeadNos != 5) { }/*else if(i!=1 && columHeadNos != 5) {
if (CutEnum.CN.getValue().equals(cut)) { if (CutEnum.CN.getValue().equals(cut)) {
throw new JeroBootException("导入的列数不对,请按照模板格式填写内容"); throw new JeroBootException("导入的列数不对,请按照模板格式填写内容");
} else { } else {
throw new JeroBootException("The number of imported columns is wrong. Please fill in the contents according to the template format."); throw new JeroBootException("The number of imported columns is wrong. Please fill in the contents according to the template format.");
} }
} }*/
}else{ }else{
if (CutEnum.CN.getValue().equals(cut)) { if (CutEnum.CN.getValue().equals(cut)) {
throw new JeroBootException("导入的数据不能为空,请检查"); throw new JeroBootException("导入的数据不能为空,请检查");
@@ -814,18 +814,18 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
projectRelatedPersonnel.setLawEngineerName(lawEngineerName); projectRelatedPersonnel.setLawEngineerName(lawEngineerName);
projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringInterfacePersonName); projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringInterfacePersonName);
projectRelatedPersonnel.setCertificationEngineerName(certificationEngineerName); projectRelatedPersonnel.setCertificationEngineerName(certificationEngineerName);
}else if(StringUtils.isBlank(lawEngineerName) || StringUtils.isBlank(engineeringInterfacePersonName) || StringUtils.isBlank(certificationEngineerName)) { }else if(StringUtils.isBlank(lawEngineerName) && StringUtils.isBlank(engineeringInterfacePersonName) && StringUtils.isBlank(certificationEngineerName)) {
//除了责任领域,其他的可以全为空->可以 //除了责任领域,其他的可以全为空->可以
projectRelatedPersonnel.setLawEngineerName(""); projectRelatedPersonnel.setLawEngineerName("");
projectRelatedPersonnel.setEngineeringInterfacePersonName(""); projectRelatedPersonnel.setEngineeringInterfacePersonName("");
projectRelatedPersonnel.setCertificationEngineerName(""); projectRelatedPersonnel.setCertificationEngineerName("");
}/*else {//除了责任领域,备注,有一个为空都报错 }else {//除了责任领域,备注,有一个为空都报错
if(CutEnum.CN.getValue().equals(cut)){ if(CutEnum.CN.getValue().equals(cut)){
throw new JeroBootException("请填写必填字段内容,带*的为必填.请检查第 "+ (i+1) + "行"); throw new JeroBootException("法规工程师、工程接口人、认证工程师三个为必填字段.请检查第 "+ (i+1) + "行");
}else{ }else{
throw new JeroBootException("Please fill in the required fields marked with * .Please check line" + (i+1)); throw new JeroBootException("Regulation Engineer,Engineering Interface and Homologation Engineer are required fields..Please check line" + (i+1));
} }
}*/ }
//导入的备注为数字,被识别成小数点后一位 //导入的备注为数字,被识别成小数点后一位
Cell remarkCell = row.getCell(4, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK); Cell remarkCell = row.getCell(4, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);