From 98107f592f1a383befd6fdb5ae3bb14e001cf477 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 27 Sep 2023 14:44:28 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=87=E6=B3=A8=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laws/standard/controller/LawsDomesticController.java | 6 +++++- .../laws/standard/controller/LawsEnterpriseController.java | 6 +++++- .../laws/standard/controller/LawsOverseasController.java | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java index ba135197..43a8ad8c 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java @@ -166,7 +166,11 @@ public class LawsDomesticController { @ApiOperation(value="国内法规标准-导入", notes="国内法规标准-导入") @PostMapping("/importExcelWithData") public Result importExcelWithData(@RequestParam("file") MultipartFile file) { - return Result.OK(lawsCommonService.importExcelWithData(file, MODULE_VALUE)); + List errorMessages = lawsCommonService.importExcelWithData(file, TableNameEnum.ENTERPRISE_STANDARDS.getValue()); + if (errorMessages.size() > 0) { + return Result.error("导入失败", errorMessages); + } + return Result.OK(); } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java index cf0465f1..61974964 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java @@ -219,7 +219,11 @@ public class LawsEnterpriseController { @ApiOperation(value="企业法规标准-导入", notes="企业法规标准-导入") @PostMapping("/importExcelWithData") public Result importExcelWithData(@RequestParam("file") MultipartFile file) { - return Result.OK(lawsCommonService.importExcelWithData(file, TableNameEnum.ENTERPRISE_STANDARDS.getValue())); + List errorMessages = lawsCommonService.importExcelWithData(file, TableNameEnum.ENTERPRISE_STANDARDS.getValue()); + if (errorMessages.size() > 0) { + return Result.error("导入失败", errorMessages); + } + return Result.OK(); } /** diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java index 2b08cb5c..bf45f44f 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java @@ -166,6 +166,10 @@ public class LawsOverseasController { @ApiOperation(value="海外法规标准-导入", notes="海外法规标准-导入") @PostMapping("/importExcelWithData") public Result importExcelWithData(@RequestParam("file") MultipartFile file) { - return Result.OK(lawsCommonService.importExcelWithData(file, MODULE_VALUE)); + List errorMessages = lawsCommonService.importExcelWithData(file, TableNameEnum.ENTERPRISE_STANDARDS.getValue()); + if (errorMessages.size() > 0) { + return Result.error("导入失败", errorMessages); + } + return Result.OK(); } }