From 79c0991698839bfa5ab11975497189719c0ea802 Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Mon, 20 Jan 2025 17:50:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=AF=BC=E5=87=BA=E6=97=B6?=
 =?UTF-8?q?=E5=AF=B9=E4=BA=8E=E6=B2=A1=E6=9C=89=E7=9A=84=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E8=BF=9B=E8=A1=8C=E5=8D=95=E5=85=83=E6=A0=BC?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/common/biz/config/PoiOutPage.java   | 45 ++++++++++---------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/config/PoiOutPage.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/config/PoiOutPage.java
index 204907ab..061fb7c1 100644
--- a/bonus-common-biz/src/main/java/com/bonus/common/biz/config/PoiOutPage.java
+++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/config/PoiOutPage.java
@@ -230,7 +230,8 @@ public class PoiOutPage {
             rowNum = createDataRows(sheet, rowNum, result, contentStyle, list.size());
         } else {
             // 如果没有数据，则仅显示表头
-            rowNum++;
+//            rowNum++;
+            rowNum = createDataRows(sheet, rowNum, result, contentStyle, list.size());
         }
         rowNum = createTotalRow(sheet, rowNum, list, totalCost, headerStyle);
         return workbook;
@@ -269,26 +270,11 @@ public class PoiOutPage {
             rowNum = createDataRows(sheet, rowNum, resultLease, contentStyle, listLease.size());
         } else {
             // 如果没有数据，则仅显示表头
-            rowNum++;
+//            rowNum++;
+            rowNum = createDataRows(sheet, rowNum, resultLease, contentStyle, listLease.size());
         }
         rowNum = createTotalRow(sheet, rowNum, listLease, totalCostLease, headerStyle);
 
-        /**
-         * 丢失费用明细
-         */
-        // 填充标题行
-        rowNum = createTitleRowStyleCost(sheet, rowNum, "丢失费用明细", titleStyle, listLose.size());
-        // 填充表头
-        rowNum = createHeaderRow(sheet, rowNum, listLose, headerStyle);
-        // 填充数据行
-        if (resultLose!= null &&!resultLose.isEmpty()) {
-            rowNum = createDataRows(sheet, rowNum, resultLose, contentStyle, listLose.size());
-        } else {
-            // 如果没有数据，则仅显示表头
-            rowNum++;
-        }
-        rowNum = createTotalRow(sheet, rowNum, listLose, totalCostLose, headerStyle);
-
         /**
          * 维修费用明细
          */
@@ -301,7 +287,8 @@ public class PoiOutPage {
             rowNum = createDataRows(sheet, rowNum, resultRepair, contentStyle, listRepair.size());
         } else {
             // 如果没有数据，则仅显示表头
-            rowNum++;
+//            rowNum++;
+            rowNum = createDataRows(sheet, rowNum, resultRepair, contentStyle, listRepair.size());
         }
         rowNum = createTotalRow(sheet, rowNum, listRepair, totalCostRepair, headerStyle);
 
@@ -317,10 +304,28 @@ public class PoiOutPage {
             rowNum = createDataRows(sheet, rowNum, resultScrap, contentStyle, listScrap.size());
         } else {
             // 如果没有数据，则仅显示表头
-            rowNum++;
+//            rowNum++;
+            rowNum = createDataRows(sheet, rowNum, resultScrap, contentStyle, listScrap.size());
         }
         rowNum = createTotalRow(sheet, rowNum, listScrap, totalCostScrap, headerStyle);
 
+        /**
+         * 丢失费用明细
+         */
+        // 填充标题行
+        rowNum = createTitleRowStyleCost(sheet, rowNum, "丢失费用明细", titleStyle, listLose.size());
+        // 填充表头
+        rowNum = createHeaderRow(sheet, rowNum, listLose, headerStyle);
+        // 填充数据行
+        if (resultLose!= null &&!resultLose.isEmpty()) {
+            rowNum = createDataRows(sheet, rowNum, resultLose, contentStyle, listLose.size());
+        } else {
+            // 如果没有数据，则仅显示表头
+//            rowNum++;
+            rowNum = createDataRows(sheet, rowNum, resultLose, contentStyle, listLose.size());
+        }
+        rowNum = createTotalRow(sheet, rowNum, listLose, totalCostLose, headerStyle);
+
         //合计
         BigDecimal totalCostAll = totalCostLease.add(totalCostLose).add(totalCostRepair).add(totalCostScrap);
         rowNum = createTotalRowAll(sheet, rowNum, listScrap, totalCostAll, headerStyle);