From 1f74918c7ff392ef4610766c6e8152dd90a1e615 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Fri, 12 Nov 2021 15:59:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=8Eexcel=E4=B8=AD=E5=88=86=E8=A7=A3?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ImportExcelDatas/comment/Analysis.java    | 22 +++++++++++++++----
 .../controller/ImportExcelController.java     |  1 +
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/Analysis.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/Analysis.java
index a9b06720..48282495 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/Analysis.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/Analysis.java
@@ -25,6 +25,9 @@ public class Analysis {
 
     private static final Logger logger = LoggerFactory.getLogger(Contrast.class);
 
+    private int sortColumn=0;
+
+
     public void run(MultipartFile file, MultipartFile sort) throws IOException {
 
         InputStream inputStream = file.getInputStream();
@@ -37,7 +40,7 @@ public class Analysis {
         for (Row row : sheet) {
             if (row.getCell(1)!=null){
                 //获取表1的标准号
-                String value = row.getCell(1).toString().trim();
+                String value = row.getCell(1).toString();
                 Cell sortCell = row.createCell(11);
                 Cell sortNumber = row.createCell(12);
                 Cell sortYear = row.createCell(13);
@@ -96,13 +99,24 @@ public class Analysis {
                 }
             }
         }
-        File result = new File("C:\\Users\\22501\\Desktop\\foton标准数据\\拆分标准号-海外.xlsx");
+        File result = new File("C:\\Users\\22501\\Desktop\\foton标准数据\\拆分标准号-企标.xlsx");
         FileOutputStream os = new FileOutputStream(result);
         workbook.write(os);
 //        HashMap<String, String> map = new HashMap<>();
 
     }
 
+
+    public void setSortColumn(int sortColumn){
+        this.sortColumn=sortColumn;
+    }
+
+    /**
+     * 获取标准类别set集合
+     * @param file
+     * @return
+     * @throws IOException
+     */
     private HashSet<String> getSet(MultipartFile file) throws IOException {
         InputStream inputStream = file.getInputStream();
         XSSFWorkbook workbook = new XSSFWorkbook(inputStream);
@@ -114,8 +128,8 @@ public class Analysis {
         HashSet<String> stringHashSet= new HashSet<>();
 
         for (Row row : sheet) {
-            if (row.getCell(0)!=null){
-                stringHashSet.add(row.getCell(0).toString().trim());
+            if (row.getCell(sortColumn)!=null){
+                stringHashSet.add(row.getCell(sortColumn).toString());
             }
         }
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java
index 61a7187b..407751ae 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java
@@ -152,6 +152,7 @@ public class ImportExcelController extends BaseController<ImportDto> {
     @PostMapping("/analysis")
     public void analysis(MultipartFile exclFile,MultipartFile standSort) throws IOException {
         Analysis analysis = new Analysis();
+        analysis.setSortColumn(1);
         analysis.run(exclFile,standSort);
     }
 }