From f6508c6e1a47cd8f77f607781e10630a413b4ef8 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 20 Oct 2021 14:51:05 +0800
Subject: [PATCH] =?UTF-8?q?TODO=E6=A0=87=E5=87=86excl=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ImportExcelServiceImpl.java  | 50 ++++++++++---------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java
index 98ded226..2cb63faa 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java
@@ -51,7 +51,9 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
 //    private SarBussionessStandServiceImpl sarBussionessStandService;
 
 
-
+    /**
+     * 标准类别
+     */
     private final static String GN = "GB,GB/T,QC/T,GJB,JB,JT,HG,YV,SY,SH,GA,HJ,QB,JG,NB,JC,YS/T,FZ/T,TB/T,JJG,SJ/T,T/TBPS" +
             ",NB/T,CJ/T,YS/T,SJ/T,BB/T,SN/T,SB/T,MH/T,DB11,SZDB/Z,HKG,T/ZSA,CSAE,T/CAS,T/CADA,T/CHTS,T/ITS,T/BJQC";
     private final static String QB = "Q/QCBFC,Q/FT,Q/FL,Q/QCFLC,Q/BQB,Q/SGT," +
@@ -335,7 +337,7 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
          */
 
 
-        importListMap.get("HWBZ").forEach(item -> {
+        /*importListMap.get("HWBZ").forEach(item -> {
             if (true ) {
                 String standID = UUIDUtils.randomUUID20();
 
@@ -394,14 +396,14 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
 
 
 
-        });
+        });*/
 
 
         /**
          * 国内标准
          */
 
-        importListMap.get("GNBZ").forEach(item -> {
+        /*importListMap.get("GNBZ").forEach(item -> {
 
 
             if (true) {
@@ -457,7 +459,7 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
 
             }
 
-        });
+        });*/
 
 
         /**
@@ -742,25 +744,27 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
             result.put("sort", sort);
             result.put("number", number);
             result.put("year", year);
-            //标准类别不存在,新增标准类别
+            /**
+             *  标准类别不存在,新增标准类别
+             */
 //            List<DicTypeEO> isExist = dicTypeEOService.getTypeIdByDicIdAndTypeName("JKSADFH564S", null, sort, null);
-            if (!sarSort.contains(sort)){
-
-                DicTypeEO dicTypeVO = new DicTypeEO();
-                dicTypeVO.setId(null);
-                dicTypeVO.setDicId("JKSADFH564S");
-                dicTypeVO.setDicTypeCode(sort);
-                dicTypeVO.setDicTypeName(sort);
-                dicTypeVO.setShowIndex(1);
-                Integer dicTypeEO = dicTypeEOService.saveDictype(dicTypeVO);
-                if (dicTypeEO>0){
-                    sarSort.add(sort);
-                    importDto.setErrorStr("标准类别不存在,已新增");
-                }else {
-                    importDto.setErrorStr("标准类别不存在,新增失败");
-                }
-                error.add(importDto);
-            }
+//            if (!sarSort.contains(sort)){
+//
+//                DicTypeEO dicTypeVO = new DicTypeEO();
+//                dicTypeVO.setId(null);
+//                dicTypeVO.setDicId("JKSADFH564S");
+//                dicTypeVO.setDicTypeCode(sort);
+//                dicTypeVO.setDicTypeName(sort);
+//                dicTypeVO.setShowIndex(1);
+//                Integer dicTypeEO = dicTypeEOService.saveDictype(dicTypeVO);
+//                if (dicTypeEO>0){
+//                    sarSort.add(sort);
+//                    importDto.setErrorStr("标准类别不存在,已新增");
+//                }else {
+//                    importDto.setErrorStr("标准类别不存在,新增失败");
+//                }
+//                error.add(importDto);
+//            }