From 00b9c782322ad546dd6bd37e6ee27f357557a676 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 24 七月 2020 15:46:57 +0800
Subject: [PATCH] #当前本版十分完美、冻结

---
 src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java |   22 ++++++++++------------
 1 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
index c83f61c..b8636f2 100644
--- a/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
+++ b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
@@ -6,6 +6,7 @@
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.MatCode;
 import com.zy.asrs.service.MatCodeService;
+import com.zy.asrs.utils.VersionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -53,25 +54,22 @@
         MatCodeService matCodeService = SpringUtils.getBean(MatCodeService.class);
         if (matCodeService.selectById(data.getMatNo()) == null) {
             MatCode matCode = new MatCode();
-            matCode.setMatNo(data.getMatNo());
-            matCode.setMatName(data.getMatName());
-            matCode.setBarcode(data.getBarcode());
-            matCode.setStr1(data.getStr1());
+            VersionUtils.setMatCode(matCode, data);
             matCode.setModiTime(new Date());
             matCode.setModiUser(this.userId);
             matCode.setAppeTime(new Date());
             matCode.setAppeUser(this.userId);
-            list.add(matCode);
+            if (!matCodeService.insert(matCode)) {
+                throw new CoolException("瀵煎叆鏁版嵁寮傚父");
+            }
             total ++;
         }
         // 杈惧埌BATCH_COUNT浜嗭紝闇�瑕佸幓瀛樺偍涓�娆℃暟鎹簱锛岄槻姝㈡暟鎹嚑涓囨潯鏁版嵁鍦ㄥ唴瀛橈紝瀹规槗OOM
-        if (list.size() >= BATCH_COUNT) {
-            if (!matCodeService.insertBatch(list)) {
-                throw new CoolException("瀵煎叆鏁版嵁寮傚父");
-            }
-            // 瀛樺偍瀹屾垚娓呯悊 list
-            list.clear();
-        }
+//        if (list.size() >= BATCH_COUNT) {
+//
+//            // 瀛樺偍瀹屾垚娓呯悊 list
+//            list.clear();
+//        }
     }
 
     /**

--
Gitblit v1.9.1