From 941270e0f7deeabb783ea7d66e627b50c71671bd Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Fri, 13 May 2022 18:13:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=AD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectRelatedPersonnelController.java    |  5 +-
 .../IProjectRelatedPersonnelService.java      |  4 +-
 .../ProjectRelatedPersonnelServiceImpl.java   | 47 ++++++++-----------
 3 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java
index b01a8aebc..b85d34da2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java
@@ -166,11 +166,10 @@ public class ProjectRelatedPersonnelController extends JeroController<ProjectRel
 	@AutoLog(value = "项目库-相关人员维护表-通过excel导入数据")
 	@ApiOperation(value="项目库-相关人员维护表-通过excel导入数据", notes="项目库-相关人员维护表-通过excel导入数据")
 	@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-	public Result<?> importExcel(MultipartFile file,
+	public void importExcel(MultipartFile file,
 									  @RequestParam(name="projectId",required=true) String projectId,
 									  @RequestParam(name="cut",required=true) String cut) throws IOException, InvalidFormatException {
-		String message = projectRelatedPersonnelService.importExcel(file, ProjectRelatedPersonnel.class, projectId, cut);
-		return Result.OK(message);
+		 projectRelatedPersonnelService.importExcel(file, ProjectRelatedPersonnel.class, projectId, cut);
 	}
 
 	/**
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java
index b1961c559..7455c6f05 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java
@@ -80,10 +80,10 @@ public interface IProjectRelatedPersonnelService extends IService<ProjectRelated
 	/**设置导出模板*/
 	void exportTemplate(ProjectRelatedPersonnel projectRelatedPersonnel, HttpServletResponse response, HttpServletRequest request);
 
-	String importExcel(MultipartFile file, Class<ProjectRelatedPersonnel> clazz, String projectId, String cut) throws IOException, InvalidFormatException;
+	void importExcel(MultipartFile file, Class<ProjectRelatedPersonnel> clazz, String projectId, String cut) throws IOException, InvalidFormatException;
 
 
-	String oppositeDisposeData(List<ProjectRelatedPersonnel> records, String projectId, String cut);
+	void oppositeDisposeData(List<ProjectRelatedPersonnel> records, String projectId, String cut);
 
 	ProjectRelatedPersonnel queryByProjectIdAndDutyTerritory(String projectId, String dutyTerritory);
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
index 32169ac6d..27dc08239 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
@@ -648,12 +648,11 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 	/**
 	 * 导入excel数据
 	 *
-	 * @return
 	 */
 	@Override
-	public String importExcel(MultipartFile file,
-							  Class<ProjectRelatedPersonnel> clazz, String projectId, String cut) throws IOException, InvalidFormatException {
-		String message = "";
+	public void importExcel(MultipartFile file,
+							Class<ProjectRelatedPersonnel> clazz, String projectId, String cut) throws IOException, InvalidFormatException {
+
 		String explainInfo= null;
 		String titleOne = "";
 
@@ -706,41 +705,38 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 								if (i == 0){
 									if (i == 0 && !cell.getStringCellValue().equals(titleOneList.get(j))) {//检查表头
 										if (CutEnum.CN.getValue().equals(cut)) {
-											message="读取失败.请检查第 " + (i+1) + " 行表头,请严格按照模板文件导入数据";
+											throw new JeroBootException("读取失败.请检查第 " + (i+1) + " 行表头,请严格按照模板文件导入数据");
 										} else {
-											message="The data fails to be read.Please check header in line " + (i+1) + " .Import data strictly according to the template file.";
+											throw new JeroBootException("The data fails to be read.Please check header in line " + (i+1) + " .Import data strictly according to the template file.");
 										}
-										return message;
 									}
 								}
 							}
 						}else if((i!=1 && columNos != 5) || (i==2 && columNos !=1)){
 							if (CutEnum.CN.getValue().equals(cut)) {
-								message="导入的列数不对,请检查";
+								throw new JeroBootException("导入的列数不对,请检查");
 							} else {
-								message="The number of imported columns is wrong. Please check!";
+								throw new JeroBootException("The number of imported columns is wrong. Please check!");
 							}
-							return message;
 						}
 					}else{
 						if (CutEnum.CN.getValue().equals(cut)) {
-							message="导入的数据不能为空,请检查";
+							throw new JeroBootException("导入的数据不能为空,请检查");
 						} else {
-							message="The imported data of cannot be empty. Please check!";
+							throw new JeroBootException("The imported data of cannot be empty. Please check!");
 						}
-						return message;
 					}
 					if (i == 1) {//校验填写说明
 						row = sheet.getRow(i);
 						int columNos = row.getLastCellNum();
 						if(columNos != 1 /*|| (!row.getCell(0).getStringCellValue().equals(explainInfo))*/){
 							if (CutEnum.CN.getValue().equals(cut)) {
-								message="填写说明列数不对,请严格按照模板文件导入数据";
+								throw new JeroBootException("填写说明列数不对,请严格按照模板文件导入数据");
 							}else{
-								message="The number of columns of filling explanation is wrong. Please import data strictly according to the template file.";
+								throw new JeroBootException("The number of columns of filling explanation is wrong. Please import data strictly according to the template file.");
 							}
-							return message;
 						}
+
 					}
 					if (i > 1) {//读取数据
 						//获取每一行数据
@@ -753,11 +749,10 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 							projectRelatedPersonnel.setDutyTerritory(row.getCell(0).toString());
 						}else{//责任领域不能为空,报错
 							if(CutEnum.CN.getValue().equals(cut)){
-								message="请填写责任领域,带*的为必填.请检查第 "+ (i+1) + "行";
+								throw new JeroBootException("请填写责任领域,带*的为必填.请检查第 "+ (i+1) + "行");
 							}else{
-								message="Please fill in the Responsible Field and those marked with * are required. .Please check  line" + (i+1);
+								throw new JeroBootException("Please fill in the Responsible Field and those marked with * are required. .Please check  line" + (i+1));
 							}
-							return message;
 						}
 
 						String lawEngineerName = row.getCell(1, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
@@ -776,11 +771,10 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 							projectRelatedPersonnel.setCertificationEngineerName("");
 						}else {//除了责任领域,备注,有一个为空都报错
 							if(CutEnum.CN.getValue().equals(cut)){
-								message="请填写必填字段内容,带*的为必填.请检查第 "+ (i+1) + "行";
+								throw new JeroBootException("请填写必填字段内容,带*的为必填.请检查第 "+ (i+1) + "行");
 							}else{
-								message="Please fill in the required fields marked with * .Please check  line" + (i+1);
+								throw new JeroBootException("Please fill in the required fields marked with * .Please check  line" + (i+1));
 							}
-							return message;
 						}
 
 						String remark = row.getCell(4, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
@@ -796,17 +790,16 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 		}
 		workbook.close();
 		//把数据翻译成id,并保存
-		message = oppositeDisposeData(list, projectId, cut);
-		return message;
+	oppositeDisposeData(list, projectId, cut);
+
 	}
 
 	/**
 	 * 把导入的数据翻译成对应的id,校验,不存
 	 * 若除责任领域外的导入数据不能为空
-	 * @return
 	 */
 	@Override
-	public String oppositeDisposeData(List<ProjectRelatedPersonnel> records, String projectId, String cut) {
+	public void oppositeDisposeData(List<ProjectRelatedPersonnel> records, String projectId, String cut) {
 		int row=3;
 		StringBuilder message = new StringBuilder();
 		for (ProjectRelatedPersonnel projectRelatedPersonnel:records) {
@@ -974,7 +967,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 				message.append("Import succeeded.");
 			}
 		}
-		return message.toString();
+		throw new JeroBootException(message.toString());
 	}
 
 	@Override