From 6f4cdc8cb09cfc6034a899be589d47963fb0f8d0 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 16 Aug 2022 14:03:27 +0800 Subject: [PATCH] =?UTF-8?q?57251=E3=80=8157319=E3=80=8157314=20=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0-=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E6=B5=81=E7=A8=8B-=E5=B8=A6=E5=85=A5=E6=8B=86?= =?UTF-8?q?=E8=A7=A3=E5=8D=95=20=E5=AF=BC=E5=85=A5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsTechnologyEvaluationEOController.java | 3 +- .../ILawsTechnologyEvaluationEOService.java | 2 +- ...LawsTechnologyEvaluationEOServiceImpl.java | 113 +++++++++++++++++- 3 files changed, 113 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java index 7ab5d17ce..9ca5ddf32 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java @@ -208,8 +208,7 @@ public class LawsTechnologyEvaluationEOController extends JeroController importItemExcel(MultipartFile file, @RequestParam(name = "cut") String cut, HttpServletRequest request) throws Exception { - List> result = this.lawsTechnologyEvaluationEOService.importItemExcel(file,cut,request); - return Result.OK(result); + return this.lawsTechnologyEvaluationEOService.importItemExcel(file,cut,request); } @ApiOperation(value="根据id查询明细数据", notes="根据id查询明细数据") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java index a0b58fab0..bac8a0c3c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java @@ -85,7 +85,7 @@ public interface ILawsTechnologyEvaluationEOService extends IService> importItemExcel(MultipartFile file, String cut, HttpServletRequest request)throws Exception; + Result importItemExcel(MultipartFile file, String cut, HttpServletRequest request)throws Exception; List> queryPageDummyById(Map parameter); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java index b02e02d74..98d18c7dc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java @@ -356,7 +356,7 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl> importItemExcel(MultipartFile file, String cut, HttpServletRequest request)throws Exception { + public Result importItemExcel(MultipartFile file, String cut, HttpServletRequest request)throws Exception { //校验文件格式 int pos = file.getOriginalFilename().lastIndexOf("."); String fileSuffixStr = file.getOriginalFilename().substring(pos+1).toLowerCase(); @@ -406,6 +406,7 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl> dataList,String cut){ + //存放数据验证结果信息 + List stringMessage = new ArrayList<>(); + + int i = 0; + + for (Map map : dataList) { + i++; + + int countError = 0; //记录失败数据数量 + String errorMsg = ""; + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg = "第" + i + "行："; + }else{ + errorMsg = i + " line："; + } + + String itemNum = (String) map.get("itemNum"); + String itemName = (String) map.get("itemName"); + String itemContent = (String) map.get("itemContent"); + + if(StringUtils.isEmpty(itemNum)){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + errorMsg += "条款号不能为空;"; + }else if (StringUtils.equals(cut,CutEnum.EN.getValue())){ + errorMsg += "Item num cannot be empty;"; + } + countError++; + }else if(itemNum.length() > 100){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + errorMsg += "条款号长度不能超过100;"; + }else if (StringUtils.equals(cut,CutEnum.EN.getValue())){ + errorMsg += "Item num length of the cannot exceed 100;"; + } + countError++; + } + + if(StringUtils.isEmpty(itemName)){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + errorMsg += "条款名称不能为空;"; + }else if (StringUtils.equals(cut,CutEnum.EN.getValue())){ + errorMsg += "Item name cannot be empty;"; + } + countError++; + }else if(itemName.length() > 100){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + errorMsg += "条款名称长度不能超过100;"; + }else if (StringUtils.equals(cut,CutEnum.EN.getValue())){ + errorMsg += "Item name length of the cannot exceed 100;"; + } + countError++; + } + + if(StringUtils.isEmpty(itemContent)){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + errorMsg += "条款内容不能为空;"; + }else if (StringUtils.equals(cut,CutEnum.EN.getValue())){ + errorMsg += "Item Contents cannot be empty;"; + } + countError++; + }else if(itemContent.length() > 400){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + errorMsg += "条款内容长度不能超过400;"; + }else if (StringUtils.equals(cut,CutEnum.EN.getValue())){ + errorMsg += "Item Contents length of the cannot exceed 400;"; + } + countError++; + } + + if (countError > 0) { + stringMessage.add(errorMsg); + } + } + + Map result = new HashMap(); + + if(CollectionUtils.isEmpty(dataList)){ + result.put("result", false); + String message = ""; + if (StringUtils.equals(cut, CutEnum.CN.getValue())) { + message = "不能导入空的模板，请检查！"; + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + message = "Cannot import empty template, please check!"; + } + result.put("message", message); + }else if (stringMessage.isEmpty()) { + result.put("result", true); + result.put("resultList", dataList); + result.put("message", ""); + } else { + result.put("result", false); + String html = ""; + for (String message : stringMessage) { + html += message + "
"; + } + result.put("message", html); + } + return result; + } }