From 4c0e27a66397915560df43ad82cb4b840ce58e55 Mon Sep 17 00:00:00 2001
From: 15856 <15856818120@163.com>
Date: Wed, 12 Feb 2025 14:38:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=98=E8=82=83=E5=A4=96=E5=8C=85=E5=95=86?=
 =?UTF-8?q?=E8=AF=84=E4=BB=B7bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ViolationController.java          |  6 +++---
 .../outsourceEnterpriseList.html                 | 16 +++++++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/controller/ViolationController.java b/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/controller/ViolationController.java
index f5f408f..35a853c 100644
--- a/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/controller/ViolationController.java
+++ b/src/main/java/com/bonus/gs/sub/evaluate/outsourceEnterprise/controller/ViolationController.java
@@ -38,7 +38,7 @@ import java.util.regex.Pattern;
 @Controller
 @RequestMapping("/backstage/violations/")
 public class ViolationController extends BaseController<ViolationBean> {
-	
+
 	@Autowired
 	private ViolationService service;
 	@Autowired
@@ -252,7 +252,7 @@ public class ViolationController extends BaseController<ViolationBean> {
 						return ar;
 					}
 				}else {
-					ar.setFailMsg("第" + errorNum + "行数据有误字段不能为空，导入失败");
+					ar.setFailMsg("第" + (errorNum-1) + "行数据有误字段不能为空，导入失败");
 				}
 			}
 			if (wb != null) {
@@ -276,7 +276,7 @@ public class ViolationController extends BaseController<ViolationBean> {
 			String idCard = getValue(sheetRow.getCell(4)).trim();
 			String phone = translateToPlainStr(getValue(sheetRow.getCell(5)).trim());
 			if (StringUtils.isBlank(enterpriseName) || StringUtils.isBlank(socialCreditCode) || StringUtils.isBlank(setTime) || StringUtils.isBlank(corporateName) || StringUtils.isBlank(idCard) || StringUtils.isBlank(phone)) {
-				ar.setFailMsg("第" + rownum + "行数据有误字段不能为空，导入失败");
+				ar.setFailMsg("第" + (rownum-1) + "行数据有误字段不能为空，导入失败");
 				ar.setRes(2);
 			}
 		} catch (Exception e) {
diff --git a/src/main/resources/static/pages/evaluate/outsourceEnterprise/outsourceEnterpriseList.html b/src/main/resources/static/pages/evaluate/outsourceEnterprise/outsourceEnterpriseList.html
index c3cad13..e926810 100644
--- a/src/main/resources/static/pages/evaluate/outsourceEnterprise/outsourceEnterpriseList.html
+++ b/src/main/resources/static/pages/evaluate/outsourceEnterprise/outsourceEnterpriseList.html
@@ -299,11 +299,21 @@
             // 告诉jQuery不要去设置Content-Type请求头
             contentType: false,
             success: function (data) {
-                layer.close(idx);
+               /* layer.close(idx);
                 layer.msg('导入成功', {icon: 1, time: 2000});
-                search(1)
+                search(1)*/
+                if (data.res === 0) {
+                    layer.close(idx);
+                    layer.msg('导入失败' + data.resMsg, { icon: 1, time: 2000 });
+                } else {
+                    layer.close(idx);
+                    layer.msg('导入成功', { icon: 1, time: 2000 });
+                    search(1)
+                }
             },
-            error: function (XMLHttpRequest, textStatus, errorThrown) {
+            error: function (data) {
+                alert(data);
+                console.log("我不好",data)
                 layer.close(idx);
                 layer.msg('导入成功', {icon: 2, time: 2000});
             }