From 6b95799a24aabdc7387879af3aa1ffcb6d7a04d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Sun, 2 Apr 2023 15:26:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/modules/ota/controller/OtaBaCxAqcsController.java  | 1 +
 .../com/jero/modules/ota/controller/OtaBaCxJbxxController.java  | 1 +
 .../jero/modules/ota/controller/OtaBaCxJsfzbacsController.java  | 1 +
 .../jero/modules/ota/controller/OtaBaCxKsjjsmccsController.java | 1 +
 .../jero/modules/ota/controller/OtaBaCxKsjxtmccsController.java | 1 +
 .../com/jero/modules/ota/controller/OtaBaCxListController.java  | 2 +-
 .../jero/modules/ota/controller/OtaBaCxZxsjyqController.java    | 1 +
 .../jero/modules/ota/controller/OtaBaSjGgnrfsController.java    | 1 +
 .../com/jero/modules/ota/controller/OtaBaSjListController.java  | 1 +
 .../jero/modules/ota/controller/OtaBaSjSjfzbhController.java    | 1 +
 .../jero/modules/ota/controller/OtaBaSjSjmbclController.java    | 1 +
 .../jero/modules/ota/controller/OtaBaSjSjmbcxController.java    | 1 +
 .../jero/modules/ota/controller/OtaBaSjSjxtbhController.java    | 1 +
 .../jero/modules/ota/controller/OtaBaSjSjyxpgController.java    | 1 +
 .../main/java/com/jero/modules/ota/utils/ImportFileUtil.java    | 2 +-
 15 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java
index 6fc60dfed..5dbbca72c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java
@@ -204,6 +204,7 @@ public class OtaBaCxAqcsController extends JeroController<OtaBaCxAqcs, IOtaBaCxA
                                 @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
         OtaBaCxAqcs res;
         StringBuilder errMsg = new StringBuilder();
+        errMsg.append("导入成功！");
         try {
             String[] params = otaId.split("\\?");
             otaId = params[0].equals("null") ? "" : params[0];
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java
index c7d4f16a2..94362cb24 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java
@@ -197,6 +197,7 @@ public class OtaBaCxJbxxController extends JeroController<OtaBaCxJbxx, IOtaBaCxJ
                                 @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
         OtaBaCxJbxx res;
         StringBuilder errMsg = new StringBuilder();
+        errMsg.append("导入成功！");
         try {
             String[] params = otaId.split("\\?");
             otaId = params[0].equals("null") ? "" : params[0];
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJsfzbacsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJsfzbacsController.java
index b35764eba..583ffec3b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJsfzbacsController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJsfzbacsController.java
@@ -200,6 +200,7 @@ public class OtaBaCxJsfzbacsController extends JeroController<OtaBaCxJsfzbacs, I
                                 @RequestParam(value = "cut", required = false) String cut,
                                 @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
         StringBuilder errMsg = new StringBuilder();
+        errMsg.append("导入成功！");
         try {
             String[] params = otaId.split("\\?");
             otaId = params[0].equals("null") ? "" : params[0];
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjjsmccsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjjsmccsController.java
index 8e5842398..2ed67e3c1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjjsmccsController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjjsmccsController.java
@@ -201,6 +201,7 @@ public class OtaBaCxKsjjsmccsController extends JeroController<OtaBaCxKsjjsmccs,
                                 @RequestParam(value = "cut", required = false) String cut,
                                 @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
         StringBuilder errMsg = new StringBuilder();
+        errMsg.append("导入成功！");
         try {
             String[] params = otaId.split("\\?");
             otaId = params[0].equals("null") ? "" : params[0];
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjxtmccsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjxtmccsController.java
index 1f711357d..076dd69a7 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjxtmccsController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjxtmccsController.java
@@ -203,6 +203,7 @@ public class OtaBaCxKsjxtmccsController extends JeroController<OtaBaCxKsjxtmccs,
                                 @RequestParam(value = "cut", required = false) String cut,
                                 @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
         StringBuilder errMsg = new StringBuilder();
+        errMsg.append("导入成功！");
         try {
             String[] params = otaId.split("\\?");
             otaId = params[0].equals("null") ? "" : params[0];
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java
index 7c5fe7bef..640480670 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java
@@ -238,7 +238,7 @@ public class OtaBaCxListController extends JeroController<OtaBaCxList, IOtaBaCxL
     public Result<?> importData(@RequestParam(value = "file", required = false) MultipartFile file,
                                 @RequestParam(value = "cut", required = false) String cut) throws Exception {
         StringBuilder errMsg = new StringBuilder();
-        errMsg.append("导入成功！ 提示信息:");
+        errMsg.append("导入成功！ ");
         try {
             this.otaBaCxListService.importData(file, cut, errMsg);
         } catch (Exception e) {
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxZxsjyqController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxZxsjyqController.java
index d43f3164e..deb7099f1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxZxsjyqController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxZxsjyqController.java
@@ -198,6 +198,7 @@ public class OtaBaCxZxsjyqController extends JeroController<OtaBaCxZxsjyq, IOtaB
                                 @RequestParam(value = "cut", required = false) String cut,
                                 @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
         StringBuilder errMsg = new StringBuilder();
+        errMsg.append("导入成功！");
         OtaBaCxZxsjyq res;
         try {
             String[] params = otaId.split("\\?");
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGgnrfsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGgnrfsController.java
index 028a45963..9c897ed29 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGgnrfsController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGgnrfsController.java
@@ -203,6 +203,7 @@ public class OtaBaSjGgnrfsController extends JeroController<OtaBaSjGgnrfs, IOtaB
 								 @RequestParam(value = "cut", required = false) String cut,
 								 @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
 		 StringBuilder errMsg = new StringBuilder();
+		 errMsg.append("导入成功！");
 		 try {
 			 String[] params = otaId.split("\\?");
 			 otaId = params[0].equals("null") ? "" : params[0];
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java
index 4bcd03f36..2203ca2b7 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java
@@ -234,6 +234,7 @@ public class OtaBaSjListController extends JeroController<OtaBaSjList, IOtaBaSjL
     public Result<?> importData(@RequestParam(value = "file", required = false) MultipartFile file,
                                 @RequestParam(value = "cut", required = false) String cut) throws Exception {
         StringBuilder errMsg = new StringBuilder();
+        errMsg.append("导入成功！");
         try {
             this.otaBaSjListService.importData(file, cut, errMsg);
         } catch (Exception e) {
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjfzbhController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjfzbhController.java
index 53b0b05ee..3b147c89d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjfzbhController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjfzbhController.java
@@ -201,6 +201,7 @@ public class OtaBaSjSjfzbhController extends JeroController<OtaBaSjSjfzbh, IOtaB
 								 @RequestParam(value = "cut", required = false) String cut,
 								 @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
 		 StringBuilder errMsg = new StringBuilder();
+		 errMsg.append("导入成功！");
 		 try {
 			 String[] params = otaId.split("\\?");
 			 otaId = params[0].equals("null") ? "" : params[0];
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbclController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbclController.java
index f72893bd1..c7f3f9249 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbclController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbclController.java
@@ -196,6 +196,7 @@ public class OtaBaSjSjmbclController extends JeroController<OtaBaSjSjmbcl, IOtaB
                                 @RequestParam(value = "cut", required = false) String cut,
                                 @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
         StringBuilder errMsg = new StringBuilder();
+        errMsg.append("导入成功！");
         OtaBaSjSjmbcl res;
         try {
             String[] params = otaId.split("\\?");
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbcxController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbcxController.java
index aad8350d5..54ee382d8 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbcxController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbcxController.java
@@ -197,6 +197,7 @@ public class OtaBaSjSjmbcxController extends JeroController<OtaBaSjSjmbcx, IOtaB
 								 @RequestParam(value = "cut", required = false) String cut,
 								 @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
 		 StringBuilder errMsg = new StringBuilder();
+		 errMsg.append("导入成功！");
 		 OtaBaSjSjmbcx res;
 		 try {
 			 String[] params = otaId.split("\\?");
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java
index 93a1d106a..2bfb4a716 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java
@@ -203,6 +203,7 @@ public class OtaBaSjSjxtbhController extends JeroController<OtaBaSjSjxtbh, IOtaB
                                 @RequestParam(value = "cut", required = false) String cut,
                                 @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
         StringBuilder errMsg = new StringBuilder();
+        errMsg.append("导入成功！");
         try {
             String[] params = otaId.split("\\?");
             otaId = params[0].equals("null") ? "" : params[0];
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjyxpgController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjyxpgController.java
index f869ab979..eb537590e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjyxpgController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjyxpgController.java
@@ -202,6 +202,7 @@ public class OtaBaSjSjyxpgController extends JeroController<OtaBaSjSjyxpg, IOtaB
                                 @RequestParam(value = "cut", required = false) String cut,
                                 @RequestParam(value = "otaId", required = false) String otaId) throws Exception {
         StringBuilder errMsg = new StringBuilder();
+        errMsg.append("导入成功！");
         OtaBaSjSjyxpg res;
         try {
             String[] params = otaId.split("\\?");
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java
index 6660a0eef..549ca6f99 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java
@@ -155,7 +155,7 @@ public class ImportFileUtil {
         return "";
     }
 
-    public static Integer getCellValueYesOrNoInt(Cell cell, Workbook workbook) throws Exception {
+    public static Integer getCellValueHaveOrNotInt(Cell cell, Workbook workbook) throws Exception {
         Integer res = null;
         String str = getCellValueYesOrNo(cell, workbook);
         if (StringUtils.isNotEmpty(str)) {