From 8428a44461bbec185cb1af4c9dd178a041b1258b Mon Sep 17 00:00:00 2001
From: "BF-202309241046\\Administrator" <tan_jing_song@126.com>
Date: Sun, 10 Dec 2023 10:30:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BAexcel=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/excel/ExportDeviceHelper.java      | 50 ++++++++++++-------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/ExportDeviceHelper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/ExportDeviceHelper.java
index 794a43bb..e729b1de 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/ExportDeviceHelper.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/ExportDeviceHelper.java
@@ -308,25 +308,20 @@ public class ExportDeviceHelper {
         }
 
         List<ImportExcelField> items = new ArrayList<>();
-        for (OptionalEbomImportVO item1 : listTable) {
-            String opParentName = item1.getOptionName();
-            String optionParentDrawingNoName = item1.getOptionDrawingNo();
-            List<OptionalEbomImportVO> list2 = item1.getChild();
-            List<String> cellList = new ArrayList<>();
-            cellList.add(opParentName);
+        String opParentName="";
+        String  optionParentDrawingNoName="";
+
+        for ( int row =0;row< listTable.size();row++    ) {
+
+             OptionalEbomImportVO     item1=listTable.get(row);
+              opParentName = item1.getOptionName();
+              optionParentDrawingNoName = item1.getOptionDrawingNo();
+
+          List<OptionalEbomImportVO> list2 = item1.getChild();
+//            List<String> cellList = new ArrayList<>();
+//            cellList.add(opParentName);
+
 
-            if (CollectionUtil.isNotEmpty(items)) {
-                tableNoCounting.getAndIncrement();
-                WriteTable table = EasyExcel.writerTable(tableNoCounting.get())
-                        .head(getHeader(opParentName))
-                        .needHead(Boolean.TRUE)//需要Header
-                        .registerWriteHandler(EasyExcelUtil.getDefaultStyle())//传入自定义样式
-                        .registerWriteHandler(new HeaderStyleCustomCellWriteHandler())
-                        .registerWriteHandler(new ColumnMergeStrategy(0, new int[]{0, 1}))
-                        .build();
-                writer.write(items, sheet, table);
-                items.clear();
-            }
 
 
             for (OptionalEbomImportVO item2 : list2) {
@@ -344,6 +339,25 @@ public class ExportDeviceHelper {
                     }
                 }
             }
+
+
+
+            if (CollectionUtil.isNotEmpty(items)) {
+                tableNoCounting.getAndIncrement();
+                WriteTable table = EasyExcel.writerTable(tableNoCounting.get())
+                        .head(getHeader(opParentName))
+                        .needHead(Boolean.TRUE)//需要Header
+                        .registerWriteHandler(EasyExcelUtil.getDefaultStyle())//传入自定义样式
+                        .registerWriteHandler(new HeaderStyleCustomCellWriteHandler())
+                        .registerWriteHandler(new ColumnMergeStrategy(0, new int[]{0, 1}))
+                        .build();
+                writer.write(items, sheet, table);
+                items.clear();
+            }
+
+
+
+
         }