牦牛出栏数据

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

@@ -34,7 +34,9 @@ public class YakOutboundReportExcelExporter
 
     private static final int COL_SELF_SUBTOTAL = 14;
 
-    private static final Pattern YEAR_IN_TEXT = Pattern.compile("(\\d{4})年");
+    private static final Pattern YEAR_IN_TEXT = Pattern.compile("(\\d{4})\\s*年");
+
+    private static final Pattern SHEET_YEAR_NAME = Pattern.compile("(\\d{2,4})年出栏");
 
     public byte[] export(Integer statYear, List<SysDept> towns, Map<Long, BizYakOutboundReport> reportByTownId)
     {
@@ -72,7 +74,8 @@ public class YakOutboundReportExcelExporter
             {
                 throw new ServiceException("未识别到表头行（乡镇/户数/牦牛）");
             }
-            updateTitleYear(sheet, statYear);
+            updateTitleYear(sheet, statYear, headerRowIndex);
+            updateSheetName(workbook, sheet, statYear);
             int dataStartRow = headerRowIndex + 1;
             clearTemplateDataRegion(sheet, dataStartRow);
             Totals totals = new Totals();
@@ -127,9 +130,15 @@ public class YakOutboundReportExcelExporter
     }
 
     static void updateTitleYear(Sheet sheet, int statYear)
+    {
+        updateTitleYear(sheet, statYear, YakOutboundReportExcelParser.detectHeaderRow(sheet));
+    }
+
+    static void updateTitleYear(Sheet sheet, int statYear, int headerRowIndex)
     {
         DataFormatter formatter = new DataFormatter();
-        int last = Math.min(sheet.getLastRowNum(), 4);
+        int last = Math.max(headerRowIndex + 1, 4);
+        last = Math.min(last, sheet.getLastRowNum());
         for (int r = 0; r <= last; r++)
         {
             Row row = sheet.getRow(r);
@@ -163,6 +172,22 @@ public class YakOutboundReportExcelExporter
         }
     }
 
+    static void updateSheetName(Workbook workbook, Sheet sheet, int statYear)
+    {
+        String suffix = (statYear % 100) + "年出栏";
+        String current = sheet.getSheetName();
+        if (StringUtils.isNotEmpty(current))
+        {
+            Matcher matcher = SHEET_YEAR_NAME.matcher(current);
+            if (matcher.find())
+            {
+                workbook.setSheetName(workbook.getSheetIndex(sheet), matcher.replaceAll(suffix));
+                return;
+            }
+        }
+        workbook.setSheetName(workbook.getSheetIndex(sheet), suffix);
+    }
+
     private static void clearDataCells(Row row)
     {
         short lastCell = row.getLastCellNum();

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

@@ -1,6 +1,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.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -79,6 +80,43 @@ class YakOutboundReportExcelExporterTest
             java.util.List<ParsedRow> rows = YakOutboundReportExcelParser.parse(in);
             assertTrue(rows.stream().anyMatch(r -> Integer.valueOf(1523).equals(r.getYakOutboundCount())));
             assertTrue(rows.stream().anyMatch(r -> Integer.valueOf(488).equals(r.getSelfConsumptionCattleCount())));
+            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);
+                assertEquals("26年出栏", sheet.getSheetName());
+                org.apache.poi.ss.usermodel.DataFormatter fmt = new org.apache.poi.ss.usermodel.DataFormatter();
+                org.apache.poi.ss.usermodel.Row titleRow = sheet.getRow(1);
+                assertTrue(fmt.formatCellValue(titleRow.getCell(0)).contains("2026年"));
+                org.apache.poi.ss.usermodel.Row sectionRow = sheet.getRow(3);
+                assertTrue(fmt.formatCellValue(sectionRow.getCell(4)).contains("2026年"));
+            }
+        }
+    }
+
+    @Test
+    @DisplayName("导出时表头区块年份与 Sheet 名同步替换")
+    void exportUpdatesHeaderSectionYear() throws Exception
+    {
+        byte[] bytes = exporter.export(2024, Collections.singletonList(sampleTown()), Collections.emptyMap());
+        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);
+            assertEquals("24年出栏", sheet.getSheetName());
+            org.apache.poi.ss.usermodel.DataFormatter fmt = new org.apache.poi.ss.usermodel.DataFormatter();
+            String sectionHeader = fmt.formatCellValue(sheet.getRow(3).getCell(4));
+            assertTrue(sectionHeader.contains("2024"), "表头「年牲畜出栏数」区块年份应为 2024，实际=" + sectionHeader);
+            assertFalse(sectionHeader.contains("2026"), "表头不应残留模板年份 2026");
         }
     }
+
+    private static SysDept sampleTown()
+    {
+        SysDept town = new SysDept();
+        town.setDeptId(101L);
+        town.setDeptName("巴青乡");
+        town.setOrderNum(13);
+        return town;
+    }
 }

doc/产业数据模型及服务/牦牛出栏数据填报/牦牛出栏数据填报功能需求.md

@@ -227,7 +227,7 @@ flowchart TD
 | 导出年份 | 用户**必须选择**筛选条件中的「所属年份」（范围 **§2.2**）；未选择时前端提示 |
 | 导出范围 | **巴青县全部乡镇**（**§2.3** 合法乡镇，按 `order_num` 排序），**不受**「所属乡镇」筛选限制 |
 | 模板 | 与导入共用：`baqing-admin/src/main/resources/templates/yak_outbound_report_import_template.xlsx`（业务源文件 `牲畜数据.xlsx` 第 6 Sheet） |
-| 填充规则 | 表头标题中的年份替换为所选年份；每个乡镇一行；有填报数据的乡镇填入全部指标；未填报乡镇仅保留乡镇名称，指标为空 |
+| 填充规则 | 表头标题、表头「年牲畜出栏数」区块及 Sheet 页签中的年份均替换为所选年份；每个乡镇一行；有填报数据的乡镇填入全部指标；未填报乡镇仅保留乡镇名称，指标为空 |
 | 合计行 | 数据区末行输出「合计」，对**已填报乡镇**的数值列求和；出栏小计（K 列）、自食小计（O 列）由分项加总后写入 |
 | 文件格式 | `.xlsx`；文件名示例：`2026年牦牛出栏数据.xlsx` |
 | 与导入关系 | 导出文件列结构与导入模板一致，可再次导入（同年将 upsert） |

doc/产业数据模型及服务/牦牛出栏数据填报/牦牛出栏数据填报技术方案.md

@@ -203,10 +203,11 @@ ORDER BY order_num;
 
 1. 加载 classpath 模板 `YakOutboundReportExcelExporter.TEMPLATE_CLASSPATH`  
 2. 解析出栏 Sheet（`YakOutboundReportExcelParser.resolveSheet`）  
-3. 替换表头中的四位年份为 `statYear`  
-4. 查询 `stat_year = statYear` 的全部记录，按 `town_dept_id` 建 Map  
-5. 遍历 `TownDeptSupport.listReportTowns()`，逐乡镇写行；无数据则仅写乡镇名  
-6. 末行写「合计」，对已填报乡镇数值列求和；K/O 列写入出栏/自食小计  
+3. 替换表头中的四位年份为 `statYear`（含标题行与「年牲畜出栏数」表头区块；年份与「年」之间允许空格）  
+4. 将 Sheet 名称更新为 `{年份后两位}年出栏`（如 2024 → `24年出栏`）  
+5. 查询 `stat_year = statYear` 的全部记录，按 `town_dept_id` 建 Map  
+6. 遍历 `TownDeptSupport.listReportTowns()`，逐乡镇写行；无数据则仅写乡镇名  
+7. 末行写「合计」，对已填报乡镇数值列求和；K/O 列写入出栏/自食小计  
 
 **与 3.9 区别**：`/importTemplate` 返回空白模板；`/export` 返回填充后的全县报表。