'commit'

src/main/java/com/dsideal/base/Tools/ExportExcel.java

@@ -146,6 +146,16 @@ public class ExportExcel {
                         districtMergeStartRow, rowNum - 1, 0, 0));
             }
 
+            // 合并表头中的"年份"列
+            sheet.addMergedRegion(new CellRangeAddress(0, 0, 1, 2));
+
+            // 为合并后的单元格重新设置样式（避免合并后样式丢失）
+            Cell mergedCell = headerRow.getCell(1);
+            if (mergedCell != null) {
+                mergedCell.setCellValue("年份");
+                mergedCell.setCellStyle(headerStyle);
+            }
+
             // 保存文件
             try (FileOutputStream fileOut = new FileOutputStream(filePath)) {
                 workbook.write(fileOut);

src/main/resources/Sql/ExportExcel.sql

@@ -154,7 +154,9 @@
 FROM excel_学前幼儿在园总量_c04222fd74
 WHERE 区域分类 = '乡村'
 GROUP BY 行政区划)
+
 UNION ALL
+
 (SELECT
     行政区划,
     '在园幼儿数' as 类型,
@@ -178,14 +180,13 @@
 ORDER BY 行政区划,
 CASE 类型
     WHEN '入园数' THEN 1
-            WHEN '在园数' THEN 2
+    WHEN '在园幼儿数' THEN 2
 END,
 CASE 分类
-            WHEN '总入园数' THEN 1
+    WHEN '城区' THEN 1
-            WHEN '总在园数' THEN 1
+    WHEN '镇区' THEN 2
-            WHEN '城区' THEN 2
+    WHEN '乡村' THEN 3
-            WHEN '镇区' THEN 3
+    WHEN '总数' THEN 4
-            WHEN '乡村' THEN 4
 END;
     #end
 #end