共同富裕

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/support/YakOutboundReportExcelExporter.java

@@ -79,6 +79,8 @@ public class YakOutboundReportExcelExporter
             updateTitleYearMonth(sheet, statYear, statMonth);
             updateFiller(sheet, fillerName);
             int dataStartRow = headerRowIndex + 1;
+            CellStyle[] dataRowStyles = captureDataRowStyles(sheet, dataStartRow);
+            Float dataRowHeight = captureRowHeight(sheet, dataStartRow);
             clearTemplateDataRegion(sheet, dataStartRow);
             Totals totals = new Totals();
             int rowIndex = dataStartRow;
@@ -96,6 +98,7 @@ public class YakOutboundReportExcelExporter
                     setIntegerCell(row, COL_SEQ, seq++);
                     setStringCell(row, YakOutboundReportExcelParser.COL_TOWN, report.getTownName());
                     fillDataRow(row, report);
+                    applyDataRowStyles(row, dataRowStyles, dataRowHeight);
                     if (report.getVillageDeptId() != null || report.getYakOutboundCount() != null
                             || report.getFarmerHouseholdCount() != null)
                     {
@@ -107,8 +110,9 @@ public class YakOutboundReportExcelExporter
             Row totalRow = getOrCreateRow(sheet, rowIndex);
             clearDataCells(totalRow);
             setStringCell(totalRow, COL_SEQ, "合计");
-            mergeTotalLabelCells(sheet, rowIndex);
             totals.writeToRow(totalRow);
+            applyDataRowStyles(totalRow, dataRowStyles, dataRowHeight);
+            mergeTotalLabelCells(sheet, rowIndex);
             removeRowsAfter(sheet, rowIndex);
             workbook.write(out);
             return out.toByteArray();
@@ -346,6 +350,62 @@ public class YakOutboundReportExcelExporter
         return row;
     }
 
+    /** 从模板样例数据行捕获各列样式，供数据行与合计行复用（避免第 3 行起/合计行丢边框） */
+    private static CellStyle[] captureDataRowStyles(Sheet sheet, int styleSourceRow)
+    {
+        CellStyle[] styles = new CellStyle[YakOutboundReportExcelParser.COL_LAST + 1];
+        Row src = sheet.getRow(styleSourceRow);
+        if (src == null)
+        {
+            return styles;
+        }
+        for (int col = 0; col < styles.length; col++)
+        {
+            Cell cell = src.getCell(col);
+            if (cell != null)
+            {
+                styles[col] = cell.getCellStyle();
+            }
+        }
+        return styles;
+    }
+
+    private static Float captureRowHeight(Sheet sheet, int styleSourceRow)
+    {
+        Row src = sheet.getRow(styleSourceRow);
+        if (src == null)
+        {
+            return null;
+        }
+        return src.getHeightInPoints();
+    }
+
+    private static void applyDataRowStyles(Row row, CellStyle[] styles, Float rowHeight)
+    {
+        if (row == null || styles == null)
+        {
+            return;
+        }
+        if (rowHeight != null && rowHeight > 0)
+        {
+            row.setHeightInPoints(rowHeight);
+        }
+        for (int col = 0; col < styles.length; col++)
+        {
+            CellStyle style = styles[col];
+            if (style == null)
+            {
+                continue;
+            }
+            Cell cell = row.getCell(col);
+            if (cell == null)
+            {
+                cell = row.createCell(col);
+            }
+            cell.setCellStyle(style);
+        }
+    }
+
     private static void fillDataRow(Row row, BizYakOutboundReport report)
     {
         setStringCell(row, YakOutboundReportExcelParser.COL_VILLAGE_NAME, report.getVillageName());

baqing-admin/src/test/java/com/ruoyi/web/modules/industryservice/support/YakOutboundReportExcelExporterTest.java

@@ -2,6 +2,7 @@ package com.ruoyi.web.modules.industryservice.support;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -141,6 +142,47 @@ class YakOutboundReportExcelExporterTest
         }
     }
 
+    @Test
+    @DisplayName("第3数据行及合计行复用模板数据行边框样式")
+    void exportThirdDataRowAndTotalKeepBorders() throws Exception
+    {
+        java.util.List<BizYakOutboundReport> list = new java.util.ArrayList<>();
+        for (int i = 0; i < 3; i++)
+        {
+            list.add(sample("雅安镇", "测试村" + i, 10 + i, 100 + i));
+        }
+        byte[] bytes = exporter.export(2026, 6, list, "admin");
+        try (org.apache.poi.ss.usermodel.Workbook wb = org.apache.poi.ss.usermodel.WorkbookFactory.create(
+                new ByteArrayInputStream(bytes)))
+        {
+            org.apache.poi.ss.usermodel.Sheet sheet = YakOutboundReportExcelParser.resolveSheet(wb);
+            int header = YakOutboundReportExcelParser.detectHeaderRow(sheet);
+            int dataStart = header + 1;
+            org.apache.poi.ss.usermodel.Row first = sheet.getRow(dataStart);
+            org.apache.poi.ss.usermodel.Row third = sheet.getRow(dataStart + 2);
+            org.apache.poi.ss.usermodel.Row total = sheet.getRow(dataStart + list.size());
+            assertNotNull(first);
+            assertNotNull(third);
+            assertNotNull(total);
+            org.apache.poi.ss.usermodel.BorderStyle expected =
+                    first.getCell(0).getCellStyle().getBorderBottom();
+            assertNotEquals(org.apache.poi.ss.usermodel.BorderStyle.NONE, expected);
+            for (int col = 0; col <= 2; col++)
+            {
+                assertEquals(expected, third.getCell(col).getCellStyle().getBorderBottom(),
+                        "第3数据行列 " + col + " 应有边框");
+            }
+            for (int col = 0; col <= YakOutboundReportExcelParser.COL_LAST; col++)
+            {
+                org.apache.poi.ss.usermodel.Cell cell = total.getCell(col);
+                assertNotNull(cell, "合计行列 " + col + " 应存在");
+                assertNotEquals(org.apache.poi.ss.usermodel.BorderStyle.NONE,
+                        cell.getCellStyle().getBorderBottom(),
+                        "合计行列 " + col + " 应有下边框");
+            }
+        }
+    }
+
     private static BizYakOutboundReport sample(String town, String village, int households, int yak)
     {
         BizYakOutboundReport report = new BizYakOutboundReport();