From aa310a47a05110a393c508921c92fa17ea95b491 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 01 三月 2024 13:08:12 +0800
Subject: [PATCH] 导入修改

---
 src/main/java/com/zy/asrs/utils/PlaExcelListener.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/PlaExcelListener.java b/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
index 18fb046..fff1643 100644
--- a/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
@@ -18,10 +18,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created by vincent on 2019-11-25
@@ -35,6 +32,7 @@
 
     private int total = 0;
     private int index = 1;
+    private String recordLog = "";
     private Long userId;
 
     public PlaExcelListener() {
@@ -69,9 +67,11 @@
         MatService matService = SpringUtils.getBean(MatService.class);
         Date now = new Date();
 
+
+
         // 鍟嗗搧
         if(Cools.isEmpty(excel.getBatch()) || Cools.isEmpty(excel.getPackageNo())){
-            return;
+            throw new CoolException("绗�" +  index++ + "鏁版嵁閿欒锛屽寘鍙锋垨鑰呮壒鍙蜂负绌�");
         }
         Pla pla = plaService.selectByBatchAndPackageNo(excel.getBatch(),excel.getPackageNo());
         if (pla == null) {
@@ -98,6 +98,7 @@
             pla = plaCreate(pla,excel,matService,nodeService);
             try {
                 plaService.updateById(pla);
+                recordLog = recordLog + index + "," + pla.getBatch() + "," + pla.getPackageNo() + ";" ;
             }catch (Exception e){
                 log.error("淇濆瓨鍟嗗搧淇℃伅澶辫触锛屾壒鍙凤細" + excel.getBatch() + ", 鍖呭彿锛�" + excel.getPackageNo() + "鍘熷洜涓猴細" + e.getMessage());
                 throw new CoolException("淇濆瓨鍟嗗搧淇℃伅澶辫触锛屾壒鍙凤細" + excel.getBatch() + ", 鍖呭彿锛�" + excel.getPackageNo() + "鍘熷洜涓猴細" + e.getMessage());

--
Gitblit v1.9.1