农村三资数据填报

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

@@ -181,7 +181,8 @@ public class FarmerHouseholdExcelExporter
                     continue;
                 }
                 String text = formatter.formatCellValue(cell);
-                if (StringUtils.isEmpty(text) || !text.contains("年"))
+                // 跳过填表人/填表时间行，避免把「XXXX年X月」先改成统计年导致填表日期无法落到当月
+                if (StringUtils.isEmpty(text) || !text.contains("年") || isFillerMetaText(text))
                 {
                     continue;
                 }
@@ -205,6 +206,9 @@ public class FarmerHouseholdExcelExporter
         }
     }
 
+    /**
+     * 将填表人、填表时间/日期写为当前登录用户与<strong>系统当月</strong>（非导出统计年月）。
+     */
     static void updateFiller(Sheet sheet, String fillerName)
     {
         java.time.LocalDate today = java.time.LocalDate.now();
@@ -231,7 +235,7 @@ public class FarmerHouseholdExcelExporter
                     continue;
                 }
                 String text = formatter.formatCellValue(cell);
-                if (StringUtils.isEmpty(text) || (!text.contains("填表人") && !text.contains("填表时间")))
+                if (StringUtils.isEmpty(text) || !isFillerMetaText(text))
                 {
                     continue;
                 }
@@ -240,9 +244,12 @@ public class FarmerHouseholdExcelExporter
                 {
                     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);
                 }
@@ -251,6 +258,11 @@ public class FarmerHouseholdExcelExporter
         }
     }
 
+    private static boolean isFillerMetaText(String text)
+    {
+        return text.contains("填表人") || text.contains("填表时间") || text.contains("填表日期");
+    }
+
     private static void clearDataCells(Row row)
     {
         short lastCell = row.getLastCellNum();

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

@@ -171,7 +171,8 @@ public class VaccinationDataExcelExporter
                     continue;
                 }
                 String text = formatter.formatCellValue(cell);
-                if (StringUtils.isEmpty(text) || !text.contains("年"))
+                // 跳过填表人/填表时间行，避免把「XXXX年X月」先改成统计年导致填表日期无法落到当月
+                if (StringUtils.isEmpty(text) || !text.contains("年") || isFillerMetaText(text))
                 {
                     continue;
                 }
@@ -195,6 +196,9 @@ public class VaccinationDataExcelExporter
         }
     }
 
+    /**
+     * 将填表人、填表时间/日期写为当前登录用户与<strong>系统当月</strong>（非导出统计年月）。
+     */
     static void updateFiller(Sheet sheet, String fillerName)
     {
         java.time.LocalDate today = java.time.LocalDate.now();
@@ -221,7 +225,7 @@ public class VaccinationDataExcelExporter
                     continue;
                 }
                 String text = formatter.formatCellValue(cell);
-                if (StringUtils.isEmpty(text) || (!text.contains("填表人") && !text.contains("填表时间")))
+                if (StringUtils.isEmpty(text) || !isFillerMetaText(text))
                 {
                     continue;
                 }
@@ -230,13 +234,25 @@ public class VaccinationDataExcelExporter
                 {
                     updated = updated.replace("登录用户名称", fillerName);
                 }
-                updated = updated.replaceAll("填表时间：\\s*XXXX年X月", "填表时间：" + fillTime);
-                updated = updated.replaceAll("填表时间：\\s*\\d{4}年\\d{1,2}月", "填表时间：" + fillTime);
+                // 兼容「填表时间」「填表日期」及占位 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);
+                }
                 cell.setCellValue(updated);
             }
         }
     }
 
+    private static boolean isFillerMetaText(String text)
+    {
+        return text.contains("填表人") || text.contains("填表时间") || text.contains("填表日期");
+    }
+
     private static Row getOrCreateRow(Sheet sheet, int rowIndex)
     {
         Row row = sheet.getRow(rowIndex);

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

@@ -0,0 +1,51 @@
+package com.ruoyi.web.modules.industryservice.support;
+
+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.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.BizFarmerHousehold;
+
+@DisplayName("FarmerHouseholdExcelExporter")
+class FarmerHouseholdExcelExporterTest
+{
+    private final FarmerHouseholdExcelExporter exporter = new FarmerHouseholdExcelExporter();
+
+    @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();
+
+        BizFarmerHousehold row = new BizFarmerHousehold();
+        row.setTownName("雅安镇");
+        row.setVillageDeptId(201L);
+        row.setVillageName("雅安镇荣嘎村");
+
+        byte[] bytes = exporter.export(exportYear, exportMonth, Collections.singletonList(row), "测试用户");
+        try (Workbook wb = WorkbookFactory.create(new ByteArrayInputStream(bytes)))
+        {
+            Sheet sheet = FarmerHouseholdExcelParser.resolveSheet(wb);
+            Row fillerRow = sheet.getRow(1);
+            assertNotNull(fillerRow);
+            String fillerText = FarmerHouseholdExcelParser.cellString(fillerRow, 0);
+            assertNotNull(fillerText);
+            assertTrue(fillerText.contains("测试用户"), fillerText);
+            assertTrue(fillerText.contains(expectedFill), "填表时间应为当月: " + fillerText);
+            assertTrue(!fillerText.contains("X月"), fillerText);
+            String title = FarmerHouseholdExcelParser.cellString(sheet.getRow(0), 0);
+            assertTrue(title.contains(exportYear + "年"), title);
+            assertTrue(title.contains("（" + exportMonth + "月）"), title);
+        }
+    }
+}

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

@@ -0,0 +1,53 @@
+package com.ruoyi.web.modules.industryservice.support;
+
+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.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.BizVaccinationData;
+
+@DisplayName("VaccinationDataExcelExporter")
+class VaccinationDataExcelExporterTest
+{
+    private final VaccinationDataExcelExporter exporter = new VaccinationDataExcelExporter();
+
+    @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();
+
+        BizVaccinationData row = new BizVaccinationData();
+        row.setTownName("雅安镇");
+        row.setVillageDeptId(201L);
+        row.setVillageName("雅安镇荣嘎村");
+        row.setShouldVaccinateCount(100);
+        row.setActualVaccinateCount(90);
+
+        byte[] bytes = exporter.export(exportYear, exportMonth, Collections.singletonList(row), "测试用户");
+        try (Workbook wb = WorkbookFactory.create(new ByteArrayInputStream(bytes)))
+        {
+            Sheet sheet = VaccinationDataExcelParser.resolveSheet(wb);
+            Row fillerRow = sheet.getRow(1);
+            assertNotNull(fillerRow);
+            String fillerText = VaccinationDataExcelParser.cellString(fillerRow, 0);
+            assertNotNull(fillerText);
+            assertTrue(fillerText.contains("测试用户"), fillerText);
+            assertTrue(fillerText.contains(expectedFill), "填表时间应为当月: " + fillerText);
+            assertTrue(!fillerText.contains("X月"), fillerText);
+            String title = VaccinationDataExcelParser.cellString(sheet.getRow(0), 0);
+            assertTrue(title.contains(exportYear + "年"), title);
+            assertTrue(title.contains("（" + exportMonth + "月）"), title);
+        }
+    }
+}