From c2289cb65e5531413a2a3bb61ef483518c87cacc Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Wed, 4 Sep 2024 19:34:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E9=AA=8C=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  4 +--
 .../basis/controller/DownLoadController.java  | 26 ++++++++++++++-----
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4491378..839b455 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,7 +134,7 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>3.11</version>
+            <version>3.17</version>
         </dependency>
         <!--mq-->
         <dependency>
@@ -146,7 +146,7 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>3.11</version>
+            <version>3.17</version>
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
diff --git a/src/main/java/com/bonus/aqgqj/basis/controller/DownLoadController.java b/src/main/java/com/bonus/aqgqj/basis/controller/DownLoadController.java
index e78d679..5e8b237 100644
--- a/src/main/java/com/bonus/aqgqj/basis/controller/DownLoadController.java
+++ b/src/main/java/com/bonus/aqgqj/basis/controller/DownLoadController.java
@@ -459,9 +459,15 @@ public class DownLoadController {
         }
         for (int i = 0; i < cellIndexArr.length; i++) {
             if (i % 2 == 0) {
-                sheet.addMergedRegion(new CellRangeAddress(4, 4, cellIndexArr[i], cellIndexArr[i]));
+                if(cellIndexArr[i] != cellIndexArr[i]){
+                    sheet.addMergedRegion(new CellRangeAddress(4, 4, cellIndexArr[i], cellIndexArr[i]));
+                }
+//                sheet.addMergedRegion(new CellRangeAddress(4, 4, cellIndexArr[i], cellIndexArr[i]));
             } else {
-                sheet.addMergedRegion(new CellRangeAddress(4, 4, cellIndexArr[i - 1] + 1, cellIndexArr[i]));
+                if(cellIndexArr[i - 1] + 1 !=cellIndexArr[i]){
+                    sheet.addMergedRegion(new CellRangeAddress(4, 4, cellIndexArr[i - 1] + 1, cellIndexArr[i]));
+                }
+//                sheet.addMergedRegion(new CellRangeAddress(4, 4, cellIndexArr[i - 1] + 1, cellIndexArr[i]));
             }
         }
         sheet.addMergedRegion(new CellRangeAddress(3, 4, 0, 0));
@@ -540,7 +546,10 @@ public class DownLoadController {
             ConfigItemsVo itemsVo = configItemsVos.get(i);
             itemsIndex += itemsVo.getExperNum();
             r6 = setCellValueAndStyle(r6, csItemsIndex, itemsVo.getExperTypeName(), commonStyle);
-            sheet.addMergedRegion(new CellRangeAddress(6, 6, csItemsIndex, itemsIndex));
+            if(csItemsIndex != itemsIndex){
+                sheet.addMergedRegion(new CellRangeAddress(6, 6, csItemsIndex, itemsIndex));
+            }
+//            sheet.addMergedRegion(new CellRangeAddress(6, 6, csItemsIndex, itemsIndex));
             for (int j = csItemsIndex + 1; j < csItemsIndex + itemsVo.getExperNum(); j++) {
                 r6 = setCellValueAndStyle(r6, j, "", commonStyle);
             }
@@ -568,9 +577,9 @@ public class DownLoadController {
         r7 = setCellValueAndStyle(r7, 4, "生产日期", commonStyle);
         r7 = setCellValueAndStyle(r7, 5, "型号", commonStyle);
         r7 = setCellValueAndStyle(r7, 6, "", commonStyle);
-        sheet.addMergedRegion(new CellRangeAddress(7, 7, 3, 3));
-        sheet.addMergedRegion(new CellRangeAddress(7, 7, 4, 4));
-        sheet.addMergedRegion(new CellRangeAddress(7, 7, 5, 5));
+//        sheet.addMergedRegion(new CellRangeAddress(7, 7, 3, 3));
+//        sheet.addMergedRegion(new CellRangeAddress(7, 7, 4, 4));
+//        sheet.addMergedRegion(new CellRangeAddress(7, 7, 5, 5));
         // 设置编号、客户自编号、样品信息等位置
         sheet.addMergedRegion(new CellRangeAddress(6, 7, 0, 1));
         sheet.addMergedRegion(new CellRangeAddress(6, 7, 2, 2));
@@ -584,7 +593,10 @@ public class DownLoadController {
             for (int j = 0; j < itemList.size(); j++) {
                 ConfigItemVo itemVo = itemList.get(j);
                 r7 = setCellValueAndStyle(r7, csItemIndex, itemVo.getItemName(), commonStyle);
-                sheet.addMergedRegion(new CellRangeAddress(7, 7, csItemIndex, csItemIndex));
+                if(csItemIndex!=csItemIndex){
+                    sheet.addMergedRegion(new CellRangeAddress(7, 7, csItemIndex, csItemIndex));
+                }
+//                sheet.addMergedRegion(new CellRangeAddress(7, 7, csItemIndex, csItemIndex));
                 csItemIndex++;
             }
         }