农村三资数据填报

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

@@ -78,6 +78,8 @@ public class LivestockOwnershipHouseholdExcelExporter
             updateTitleYearMonth(sheet, statYear, statMonth);
             updateFiller(sheet, fillerName);
             int dataStartRow = headerRowIndex + 2;
+            CellStyle[] dataRowStyles = captureDataRowStyles(sheet, dataStartRow);
+            Float dataRowHeight = captureRowHeight(sheet, dataStartRow);
             clearTemplateDataRegion(sheet, dataStartRow);
             Totals totals = new Totals();
             int rowIndex = dataStartRow;
@@ -95,6 +97,7 @@ public class LivestockOwnershipHouseholdExcelExporter
                     setIntegerCell(row, LivestockOwnershipHouseholdExcelParser.COL_SEQ, seq++);
                     setStringCell(row, LivestockOwnershipHouseholdExcelParser.COL_TOWN, report.getTownName());
                     fillDataRow(row, report);
+                    applyDataRowStyles(row, dataRowStyles, dataRowHeight);
                     totals.add(report);
                     rowIndex++;
                 }
@@ -102,8 +105,9 @@ public class LivestockOwnershipHouseholdExcelExporter
             Row totalRow = getOrCreateRow(sheet, rowIndex);
             clearDataCells(totalRow);
             setStringCell(totalRow, LivestockOwnershipHouseholdExcelParser.COL_SEQ, "合计");
-            mergeTotalLabelCells(sheet, rowIndex);
             totals.writeToRow(totalRow);
+            applyDataRowStyles(totalRow, dataRowStyles, dataRowHeight);
+            mergeTotalLabelCells(sheet, rowIndex);
             removeRowsAfter(sheet, rowIndex);
             workbook.write(out);
             return out.toByteArray();
@@ -186,7 +190,8 @@ public class LivestockOwnershipHouseholdExcelExporter
                     continue;
                 }
                 String text = formatter.formatCellValue(cell);
-                if (StringUtils.isEmpty(text) || !text.contains("年"))
+                // 跳过填表人/填表时间行，避免把「XXXX年X月」先改成统计年导致填表日期无法落到当月
+                if (StringUtils.isEmpty(text) || !text.contains("年") || isFillerMetaText(text))
                 {
                     continue;
                 }
@@ -210,6 +215,9 @@ public class LivestockOwnershipHouseholdExcelExporter
         }
     }
 
+    /**
+     * 将填表人、填表时间/日期写为当前登录用户与<strong>系统当月</strong>（非导出统计年月）。
+     */
     static void updateFiller(Sheet sheet, String fillerName)
     {
         java.time.LocalDate today = java.time.LocalDate.now();
@@ -236,7 +244,7 @@ public class LivestockOwnershipHouseholdExcelExporter
                     continue;
                 }
                 String text = formatter.formatCellValue(cell);
-                if (StringUtils.isEmpty(text) || (!text.contains("填表人") && !text.contains("填表时间")))
+                if (StringUtils.isEmpty(text) || !isFillerMetaText(text))
                 {
                     continue;
                 }
@@ -245,9 +253,12 @@ public class LivestockOwnershipHouseholdExcelExporter
                 {
                     updated = updated.replace("登录用户名称", fillerName);
                 }
-                updated = updated.replaceAll("填表时间：\\s*XXXX年X月", "填表时间：" + fillTime);
-                updated = updated.replaceAll("填表时间：\\s*\\d{4}年\\d{1,2}月", "填表时间：" + fillTime);
-                if (updated.contains("XXXX年") && updated.contains("填表时间"))
+                // 兼容「填表时间」「填表日期」及占位 XXXX年X月 / 已被误替换的 yyyy年X月
+                updated = updated.replaceAll("(填表时间|填表日期)：\\s*XXXX年X月", "$1：" + fillTime);
+                updated = updated.replaceAll("(填表时间|填表日期)：\\s*\\d{4}年X月", "$1：" + fillTime);
+                updated = updated.replaceAll("(填表时间|填表日期)：\\s*\\d{4}年\\d{1,2}月", "$1：" + fillTime);
+                if (updated.contains("XXXX年")
+                        && (updated.contains("填表时间") || updated.contains("填表日期")))
                 {
                     updated = updated.replaceFirst("XXXX年X?月?", fillTime);
                 }
@@ -256,6 +267,66 @@ public class LivestockOwnershipHouseholdExcelExporter
         }
     }
 
+    private static boolean isFillerMetaText(String text)
+    {
+        return text.contains("填表人") || text.contains("填表时间") || text.contains("填表日期");
+    }
+
+    private static CellStyle[] captureDataRowStyles(Sheet sheet, int styleSourceRow)
+    {
+        CellStyle[] styles = new CellStyle[LivestockOwnershipHouseholdExcelParser.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 mergeTotalLabelCells(Sheet sheet, int rowIndex)
     {
         int firstCol = LivestockOwnershipHouseholdExcelParser.COL_SEQ;

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

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.DataFormatter;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -73,8 +74,11 @@ public class VaccinationDataExcelExporter
             }
             updateTitleYearMonth(sheet, statYear, statMonth);
             updateFiller(sheet, fillerName);
-            // 官方模板：主表头 + 子表头，数据从 header+HEADER_SPAN 起
+            // 官方模板：主表头 + 子表头，数据从 header+HEADER_SPAN 起（Excel 约第 5 行）
             int dataStartRow = headerRowIndex + VaccinationDataExcelParser.HEADER_SPAN;
+            // 模板样例行带边框；清空/新建单元格会丢样式，需先捕获再回写
+            CellStyle[] dataRowStyles = captureDataRowStyles(sheet, dataStartRow);
+            Float dataRowHeight = captureRowHeight(sheet, dataStartRow);
             clearTemplateDataRegion(sheet, dataStartRow);
             int rowIndex = dataStartRow;
             int seq = 1;
@@ -96,10 +100,12 @@ public class VaccinationDataExcelExporter
                     setIntegerCell(row, VaccinationDataExcelParser.COL_ACTUAL, report.getActualVaccinateCount());
                     setStringCell(row, VaccinationDataExcelParser.COL_RATE,
                             VaccinationDataDerivedSupport.formatImmunityRatePercent(report.getImmunityRate()));
+                    applyDataRowStyles(row, dataRowStyles, dataRowHeight);
                     rowIndex++;
                 }
             }
-            removeRowsAfter(sheet, Math.max(dataStartRow - 1, rowIndex - 1));
+            int lastKeepRow = rowIndex > dataStartRow ? rowIndex - 1 : dataStartRow - 1;
+            removeRowsAfter(sheet, lastKeepRow);
             workbook.write(out);
             return out.toByteArray();
         }
@@ -253,6 +259,63 @@ public class VaccinationDataExcelExporter
         return text.contains("填表人") || text.contains("填表时间") || text.contains("填表日期");
     }
 
+    /** 捕获模板数据行各列样式（边框等），供导出行复用。 */
+    private static CellStyle[] captureDataRowStyles(Sheet sheet, int styleSourceRow)
+    {
+        CellStyle[] styles = new CellStyle[VaccinationDataExcelParser.COL_RATE + 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 Row getOrCreateRow(Sheet sheet, int rowIndex)
     {
         Row row = sheet.getRow(rowIndex);
@@ -266,26 +329,38 @@ public class VaccinationDataExcelExporter
             Cell cell = row.getCell(c);
             if (cell != null)
             {
-                row.removeCell(cell);
+                cell.setBlank();
             }
         }
     }
 
     private static void setStringCell(Row row, int col, String value)
     {
-        if (value == null)
+        Cell cell = row.getCell(col);
+        if (cell == null)
         {
+            cell = row.createCell(col);
+        }
+        if (StringUtils.isEmpty(value))
+        {
+            cell.setBlank();
             return;
         }
-        row.createCell(col).setCellValue(value);
+        cell.setCellValue(value);
     }
 
     private static void setIntegerCell(Row row, int col, Integer value)
     {
+        Cell cell = row.getCell(col);
+        if (cell == null)
+        {
+            cell = row.createCell(col);
+        }
         if (value == null)
         {
+            cell.setBlank();
             return;
         }
-        row.createCell(col).setCellValue(value.doubleValue());
+        cell.setCellValue(value.doubleValue());
     }
 }

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

@@ -0,0 +1,86 @@
+package com.ruoyi.web.modules.industryservice.support;
+
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.ByteArrayInputStream;
+import java.util.Collections;
+import org.apache.poi.ss.usermodel.BorderStyle;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.WorkbookFactory;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import com.ruoyi.web.modules.industryservice.domain.BizLivestockOwnershipHousehold;
+
+@DisplayName("LivestockOwnershipHouseholdExcelExporter")
+class LivestockOwnershipHouseholdExcelExporterTest
+{
+    private final LivestockOwnershipHouseholdExcelExporter exporter = new LivestockOwnershipHouseholdExcelExporter();
+
+    @Test
+    @DisplayName("导出填表时间默认为系统当月，且标题统计月与填表月可不同")
+    void exportFillerDateDefaultsToCurrentMonth() throws Exception
+    {
+        java.time.LocalDate today = java.time.LocalDate.now();
+        String expectedFill = today.getYear() + "年" + today.getMonthValue() + "月";
+        int exportMonth = today.getMonthValue() == 1 ? 12 : today.getMonthValue() - 1;
+        int exportYear = today.getMonthValue() == 1 ? today.getYear() - 1 : today.getYear();
+
+        BizLivestockOwnershipHousehold row = new BizLivestockOwnershipHousehold();
+        row.setTownName("雅安镇");
+        row.setVillageDeptId(201L);
+        row.setVillageName("雅安镇荣嘎村");
+        row.setWithLivestockHouseholdCount(36);
+        row.setWithoutLivestockHouseholdCount(12);
+
+        byte[] bytes = exporter.export(exportYear, exportMonth, Collections.singletonList(row), "测试用户");
+        try (Workbook wb = WorkbookFactory.create(new ByteArrayInputStream(bytes)))
+        {
+            Sheet sheet = LivestockOwnershipHouseholdExcelParser.resolveSheet(wb);
+            Row fillerRow = sheet.getRow(1);
+            assertNotNull(fillerRow);
+            String fillerText = LivestockOwnershipHouseholdExcelParser.cellString(fillerRow, 0);
+            assertNotNull(fillerText);
+            assertTrue(fillerText.contains("测试用户"), fillerText);
+            assertTrue(fillerText.contains(expectedFill), "填表时间应为当月: " + fillerText);
+            assertTrue(!fillerText.contains("X月"), fillerText);
+            String title = LivestockOwnershipHouseholdExcelParser.cellString(sheet.getRow(0), 0);
+            assertTrue(title.contains(exportYear + "年"), title);
+            assertTrue(title.contains("（" + exportMonth + "月）"), title);
+        }
+    }
+
+    @Test
+    @DisplayName("导出合计行应保留边框")
+    void exportTotalRowKeepsBorders() throws Exception
+    {
+        BizLivestockOwnershipHousehold row = new BizLivestockOwnershipHousehold();
+        row.setTownName("雅安镇");
+        row.setVillageDeptId(201L);
+        row.setVillageName("雅安镇荣嘎村");
+        row.setWithLivestockHouseholdCount(36);
+        row.setWithoutLivestockHouseholdCount(12);
+
+        byte[] bytes = exporter.export(2026, 6, Collections.singletonList(row), "测试用户");
+        try (Workbook wb = WorkbookFactory.create(new ByteArrayInputStream(bytes)))
+        {
+            Sheet sheet = LivestockOwnershipHouseholdExcelParser.resolveSheet(wb);
+            int headerRowIndex = LivestockOwnershipHouseholdExcelParser.detectHeaderRow(sheet);
+            int totalRowIndex = headerRowIndex + 3;
+            Row totalRow = sheet.getRow(totalRowIndex);
+            assertNotNull(totalRow);
+            assertTrue("合计".equals(LivestockOwnershipHouseholdExcelParser.cellString(totalRow, 0)));
+            for (int col = 0; col <= LivestockOwnershipHouseholdExcelParser.COL_LAST; col++)
+            {
+                Cell cell = totalRow.getCell(col);
+                assertNotNull(cell, "合计行列 " + col + " 应存在");
+                assertNotEquals(BorderStyle.NONE, cell.getCellStyle().getBorderBottom(),
+                        "合计行列 " + col + " 应有下边框");
+            }
+        }
+    }
+}

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

@@ -1,10 +1,13 @@
 package com.ruoyi.web.modules.industryservice.support;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.ByteArrayInputStream;
+import java.util.Arrays;
 import java.util.Collections;
+import org.apache.poi.ss.usermodel.BorderStyle;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
@@ -27,12 +30,7 @@ class VaccinationDataExcelExporterTest
         int exportMonth = today.getMonthValue() == 1 ? 12 : today.getMonthValue() - 1;
         int exportYear = today.getMonthValue() == 1 ? today.getYear() - 1 : today.getYear();
 
-        BizVaccinationData row = new BizVaccinationData();
-        row.setTownName("雅安镇");
-        row.setVillageDeptId(201L);
-        row.setVillageName("雅安镇荣嘎村");
-        row.setShouldVaccinateCount(100);
-        row.setActualVaccinateCount(90);
+        BizVaccinationData row = sample("雅安镇", "雅安镇荣嘎村", 100, 90);
 
         byte[] bytes = exporter.export(exportYear, exportMonth, Collections.singletonList(row), "测试用户");
         try (Workbook wb = WorkbookFactory.create(new ByteArrayInputStream(bytes)))
@@ -50,4 +48,48 @@ class VaccinationDataExcelExporterTest
             assertTrue(title.contains("（" + exportMonth + "月）"), title);
         }
     }
+
+    @Test
+    @DisplayName("导出第5、6行（数据行）保留模板边框")
+    void exportDataRowsKeepBorders() throws Exception
+    {
+        BizVaccinationData a = sample("雅安镇", "雅安镇荣嘎村", 12000, 11800);
+        BizVaccinationData b = sample("雅安镇", "雅安镇公随村", 13000, 12695);
+        byte[] bytes = exporter.export(2026, 7, Arrays.asList(a, b), "admin");
+        try (Workbook wb = WorkbookFactory.create(new ByteArrayInputStream(bytes)))
+        {
+            Sheet sheet = VaccinationDataExcelParser.resolveSheet(wb);
+            int header = VaccinationDataExcelParser.detectHeaderRow(sheet);
+            int dataStart = header + VaccinationDataExcelParser.HEADER_SPAN;
+            // Excel 第 5、6 行（1-based）即 dataStart / dataStart+1
+            assertEquals(4, dataStart);
+            Row row5 = sheet.getRow(dataStart);
+            Row row6 = sheet.getRow(dataStart + 1);
+            assertNotNull(row5);
+            assertNotNull(row6);
+            assertHasBorder(row5, "第5行");
+            assertHasBorder(row6, "第6行");
+        }
+    }
+
+    private static void assertHasBorder(Row row, String label)
+    {
+        for (int col = 0; col <= VaccinationDataExcelParser.COL_RATE; col++)
+        {
+            assertNotNull(row.getCell(col), label + " 列" + col + " 单元格为空");
+            BorderStyle bottom = row.getCell(col).getCellStyle().getBorderBottom();
+            assertTrue(bottom != BorderStyle.NONE, label + " 列" + col + " 缺少下边框");
+        }
+    }
+
+    private static BizVaccinationData sample(String town, String village, int should, int actual)
+    {
+        BizVaccinationData row = new BizVaccinationData();
+        row.setTownName(town);
+        row.setVillageDeptId((long) village.hashCode());
+        row.setVillageName(village);
+        row.setShouldVaccinateCount(should);
+        row.setActualVaccinateCount(actual);
+        return row;
+    }
 }