质量单 导入

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/controller/SyCarryController.java

@@ -199,12 +199,10 @@ public class SyCarryController {
           params.setNeedSave(true);
           try {
               List<SyCarryPage> list = ExcelImportUtil.importExcel(file.getInputStream(), SyCarryPage.class, params);
-              for (SyCarryPage page : list) {
-                  SyCarry po = new SyCarry();
-                  BeanUtils.copyProperties(page, po);
-                  syCarryService.saveMain(po, page.getSyCarryBList());
-              }
-              return Result.ok("文件导入成功！数据行数:" + list.size());
+              Result<List<SyCarryPage>> result = new Result<>();
+              result.setMessage("文件导入成功！数据行数:" + list.size());
+              result.setResult(list);
+              return result;
           } catch (Exception e) {
               log.error(e.getMessage(),e);
               return Result.error("文件导入失败:"+e.getMessage());
@@ -220,6 +218,46 @@ public class SyCarryController {
   }
 
 
+	 /**
+	  * 通过excel导入数据
+	  *
+	  * @param request
+	  * @param response
+	  * @return
+	  */
+	 @RequestMapping(value = "/importExceladd", method = RequestMethod.POST)
+	 public Result<?> importExceladd(HttpServletRequest request, HttpServletResponse response) {
+		 MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+		 Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+		 for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+			 MultipartFile file = entity.getValue();// 获取上传文件对象
+			 ImportParams params = new ImportParams();
+			 params.setTitleRows(2);
+			 params.setHeadRows(1);
+			 params.setNeedSave(true);
+			 try {
+				 List<SyCarryPage> list = ExcelImportUtil.importExcel(file.getInputStream(), SyCarryPage.class, params);
+				 for (SyCarryPage page : list) {
+					 SyCarry po = new SyCarry();
+					 BeanUtils.copyProperties(page, po);
+					 syCarryService.saveMain(po, page.getSyCarryBList());
+				 }
+				 return Result.ok("文件导入成功！数据行数:" + list.size());
+			 } catch (Exception e) {
+				 log.error(e.getMessage(),e);
+				 return Result.error("文件导入失败:"+e.getMessage());
+			 } finally {
+				 try {
+					 file.getInputStream().close();
+				 } catch (IOException e) {
+					 e.printStackTrace();
+				 }
+			 }
+		 }
+		 return Result.ok("文件导入失败！");
+	 }
+
+
 	 /**
 	  * 批量审批
 	  * @param ids

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/controller/SyCottonYarnController.java

@@ -199,12 +199,10 @@ public class SyCottonYarnController {
           params.setNeedSave(true);
           try {
               List<SyCottonYarnPage> list = ExcelImportUtil.importExcel(file.getInputStream(), SyCottonYarnPage.class, params);
-              for (SyCottonYarnPage page : list) {
-                  SyCottonYarn po = new SyCottonYarn();
-                  BeanUtils.copyProperties(page, po);
-                  syCottonYarnService.saveMain(po, page.getSyCottonYarnBList());
-              }
-              return Result.ok("文件导入成功！数据行数:" + list.size());
+			  Result<List<SyCottonYarnPage>> result = new Result<>();
+			  result.setMessage("文件导入成功！数据行数:" + list.size());
+			  result.setResult(list);
+			  return result;
           } catch (Exception e) {
               log.error(e.getMessage(),e);
               return Result.error("文件导入失败:"+e.getMessage());
@@ -219,6 +217,45 @@ public class SyCottonYarnController {
       return Result.ok("文件导入失败！");
   }
 
+	 /**
+	  * 通过excel导入数据
+	  *
+	  * @param request
+	  * @param response
+	  * @return
+	  */
+	 @RequestMapping(value = "/importExceladd", method = RequestMethod.POST)
+	 public Result<?> importExceladd(HttpServletRequest request, HttpServletResponse response) {
+		 MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+		 Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+		 for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+			 MultipartFile file = entity.getValue();// 获取上传文件对象
+			 ImportParams params = new ImportParams();
+			 params.setTitleRows(2);
+			 params.setHeadRows(1);
+			 params.setNeedSave(true);
+			 try {
+				 List<SyCottonYarnPage> list = ExcelImportUtil.importExcel(file.getInputStream(), SyCottonYarnPage.class, params);
+				 for (SyCottonYarnPage page : list) {
+					 SyCottonYarn po = new SyCottonYarn();
+					 BeanUtils.copyProperties(page, po);
+					 syCottonYarnService.saveMain(po, page.getSyCottonYarnBList());
+				 }
+				 return Result.ok("文件导入成功！数据行数:" + list.size());
+			 } catch (Exception e) {
+				 log.error(e.getMessage(),e);
+				 return Result.error("文件导入失败:"+e.getMessage());
+			 } finally {
+				 try {
+					 file.getInputStream().close();
+				 } catch (IOException e) {
+					 e.printStackTrace();
+				 }
+			 }
+		 }
+		 return Result.ok("文件导入失败！");
+	 }
+
 
 	 /**
 	  * 计划员批量签名