From ea7cc07ceb578d50d9ff83eb6d7e173f5b1cce1d Mon Sep 17 00:00:00 2001
From: zhizhijie <zhizhijie@users.noreply.gitee.com>
Date: 星期日, 13 九月 2026 13:17:49 +0800
Subject: [PATCH] feat: 汇总大表四页(城市汇总/城市分市州/中口径分析/道路运输周转量)随报表期数据驱动刷新至 1-8月

---
 traffic-audit-server/src/main/java/com/trafficaudit/reportexport/service/ReportExportService.java | 1009 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 958 insertions(+), 51 deletions(-)

diff --git a/traffic-audit-server/src/main/java/com/trafficaudit/reportexport/service/ReportExportService.java b/traffic-audit-server/src/main/java/com/trafficaudit/reportexport/service/ReportExportService.java
index c3301d0..b006de5 100644
--- a/traffic-audit-server/src/main/java/com/trafficaudit/reportexport/service/ReportExportService.java
+++ b/traffic-audit-server/src/main/java/com/trafficaudit/reportexport/service/ReportExportService.java
@@ -29,6 +29,9 @@
 import com.trafficaudit.dataimport.mapper.PassengerEnterpriseMonthlyMapper;
 import com.trafficaudit.dataimport.mapper.PassengerIndividualMonthlyMapper;
 import com.trafficaudit.dataimport.mapper.ScaleSplitTransportMapper;
+import com.trafficaudit.reportexport.calc.MidCalc;
+import com.trafficaudit.reportexport.calc.PaxCalc;
+import com.trafficaudit.reportexport.calc.SummaryWorkbookFiller;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
@@ -50,6 +53,7 @@
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -92,6 +96,8 @@
     private CityBusMonthlyMapper cityBusMapper;
     @Resource
     private CityTaxiMonthlyMapper cityTaxiMapper;
+    @Resource
+    private SummaryWorkbookFiller summaryWorkbookFiller;
     @Resource
     private AuditResultMapper auditResultMapper;
     @Resource
@@ -334,12 +340,7 @@
                     if (resolveSummaryMother(period, mode) == null) {
                         problems.add("docs/鐢熸垚姹囨�诲ぇ琛� 涓嬬己灏戝彲澶嶅埗鐨勬瘝鐗堟眹鎬昏〃");
                     } else {
-                        Map<Integer, Map<String, double[]>> busM = loadCityBusByMonth(yearPrefix, month);
-                        Map<Integer, Map<String, double[]>> taxiM = loadCityTaxiByMonth(yearPrefix, month);
-                        Map<String, double[]> bc = busM.get(month);
-                        Map<String, double[]> tc = taxiM.get(month);
-                        if (bc != null && bc.get("鍏ㄧ渷") != null) addSum(summary, "鍩庡競鍏氦瀹㈣繍閲忥紙鍏ㄧ渷褰撴湀锛�", bc.get("鍏ㄧ渷")[0], "涓囦汉");
-                        if (tc != null && tc.get("鍏ㄧ渷") != null) addSum(summary, "宸℃父鍑虹瀹㈣繍閲忥紙鍏ㄧ渷褰撴湀锛�", tc.get("鍏ㄧ渷")[0], "涓囦汉");
+                        summaryWorkbookPreview(period, yearNum, month, summary, problems);
                     }
                 } catch (Exception ex) {
                     problems.add(ex.getMessage());
@@ -441,6 +442,118 @@
             sb.append(m).append("鏈�");
         }
         return sb.toString();
+    }
+
+    /** 姹囨�绘暣鏈叧閿寚鏍囬瑙堬細璐ц繍閲�/鍛ㄨ浆閲忋�佸煄甯傚杩愩�佷腑鍙e緞鐨� 褰撴湀銆�1..M 绱銆佸綋鏈堝悓姣斻�佺疮璁″悓姣旓紙鍚屾瘮鍙栧簱鍐呭幓骞村悓鏈燂紝缂哄垯鏄剧ず鈥旓級 */
+    private void summaryWorkbookPreview(String period, int year, int month,
+                                        List<Map<String, Object>> summary, List<String> problems) {
+        String yearPrefix = year + "-";
+        // ---- 璐ц繍锛堥噺=妯℃澘_璐ц繍閲忓懆杞噺鍏ㄧ渷琛岋紱鍛ㄨ浆閲�=瑙勪笂瑙勪笅鎷嗗垎琛ㄥ叏鐪佽锛� ----
+        FreightTurnoverImport ft = loadFreightTurnover(period).get("婀栧寳鐪�");
+        Double fm = ft == null ? null : freightMonth(ft, month);
+        Double fcum = ft == null ? null : freightCum(ft, month);
+        Double fy = ft == null ? null : freightYoy(ft, month);
+        Double fcy = ft == null ? null : freightCumYoy(ft, month);
+        addKpi(summary, "鍏ㄧ渷璐ц繍閲�", fm, fcum, fy, fcy, "涓囧惃");
+        if (fm != null && fy == null) {
+            problems.add((year - 1) + "-" + String.format("%02d", month) + " 鍚屾湡璐ц繍閲忔暟鎹湭瀵煎叆搴擄紝璐ц繍閲忓綋鏈�/绱鍚屾瘮鏆備笉鏄剧ず锛屽緟 2025 骞村畾绋挎暟鎹鍏ュ悗鑷姩鍑虹幇");
+        }
+        ScaleSplitTransport tm = loadProvinceMonthMap(period).get(month);
+        ScaleSplitTransport tc = getProvinceCumulative(period);
+        Double tvM = tm == null ? null : tm.getTotalTurnover();
+        Double tvC = tc == null ? null : tc.getTotalTurnover();
+        Double tvMY = tm == null ? null : getYoyMetric(tm, "turnover", "total");
+        Double tvCY = tc == null ? null : getYoyMetric(tc, "turnover", "total");
+        addKpi(summary, "鍏ㄧ渷璐х墿鍛ㄨ浆閲�", tvM, tvC, tvMY, tvCY, "涓囧惃鍏噷");
+        if (fm == null) problems.add("妯℃澘_璐ц繍閲忓懆杞噺缂� " + period + " 褰撴湀鏁版嵁锛岃揣杩愰噺浠呰兘鎻愪緵鎴嚦鏈�杩戝鍏ユ湀鐨勭疮璁�");
+        if (tvM == null) problems.add("瑙勪笂瑙勪笅鎷嗗垎缂� " + period + " 褰撴湀鏁版嵁锛屽懆杞噺/瑙勪笂瑙勪笅褰撴湀缂猴紝绱涓烘埅鑷虫渶杩戝鍏ユ湀");
+
+        // ---- 鍩庡競瀹㈣繍锛堝叕浜�+鍑虹+杞ㄩ亾+杞浮 鍏ㄧ渷灏忚锛涙寚鏍囦綅 0/2/4/6=瀹㈣繍锛�1/3/5/7=鍛ㄨ浆锛� ----
+        double[] cumM = cityCumProv(yearPrefix, month);
+        double[] cumPrev = cityCumProv(yearPrefix, month - 1);
+        double[] monthVec = diff8(cumM, cumPrev);
+        double cityPaxM = sumIdx(monthVec, new int[]{0, 2, 4, 6});
+        double cityTurnM = sumIdx(monthVec, new int[]{1, 3, 5, 7});
+        double cityPaxC = sumIdx(cumM, new int[]{0, 2, 4, 6});
+        double cityTurnC = sumIdx(cumM, new int[]{1, 3, 5, 7});
+        double[] lastCumM = cityCumProv((year - 1) + "-", month);
+        double[] lastCumPrev = cityCumProv((year - 1) + "-", month - 1);
+        double[] lastVec = diff8(lastCumM, lastCumPrev);
+        double lastPaxM = sumIdx(lastVec, new int[]{0, 2, 4, 6});
+        double lastPaxC = sumIdx(lastCumM, new int[]{0, 2, 4, 6});
+        double lastTurnM = sumIdx(lastVec, new int[]{1, 3, 5, 7});
+        double lastTurnC = sumIdx(lastCumM, new int[]{1, 3, 5, 7});
+        addKpiRaw(summary, "鍩庡競瀹㈣繍閲�", cityPaxM, cityPaxC, lastPaxM, lastPaxC, "涓囦汉娆�");
+        addKpiRaw(summary, "鍩庡競瀹㈣繍鍛ㄨ浆閲�", cityTurnM, cityTurnC, lastTurnM, lastTurnC, "涓囦汉鍏噷");
+
+        // ---- 涓彛寰勶紙鍏矾鏃呭浼佷笟 H203-1 鍏ㄧ渷锛屽崟浣嶆崲绠� /10000锛� ----
+        Map<Integer, Map<String, PassengerAgg>> data = loadPassengerAggMap();
+        double paxM = 0.0, paxC = 0.0, turnM = 0.0, turnC = 0.0;
+        double lastPaxM2 = 0.0, lastPaxC2 = 0.0, lastTurnM2 = 0.0, lastTurnC2 = 0.0;
+        for (int m = 1; m <= month; m++) {
+            PassengerAgg agg = aggOf(data, year, m, "婀栧寳鐪�");
+            if (agg != null) {
+                double pax = agg.passengerTotal / 10000.0;
+                double turn = agg.turnoverTotal / 10000.0;
+                if (m == month) { paxM = pax; turnM = turn; }
+                paxC += pax;
+                turnC += turn;
+            }
+            PassengerAgg last = aggOf(data, year - 1, m, "婀栧寳鐪�");
+            if (last != null) {
+                double lp = last.passengerTotal / 10000.0;
+                double lt = last.turnoverTotal / 10000.0;
+                if (m == month) { lastPaxM2 = lp; lastTurnM2 = lt; }
+                lastPaxC2 += lp;
+                lastTurnC2 += lt;
+            }
+        }
+        addKpiRaw(summary, "涓彛寰勫杩愰噺", paxM, paxC, lastPaxM2, lastPaxC2, "涓囦汉娆�");
+        addKpiRaw(summary, "涓彛寰勫懆杞噺", turnM, turnC, lastTurnM2, lastTurnC2, "涓囦汉鍏噷");
+
+        if (paxM <= 0 && paxC <= 0 && cityPaxC <= 0 && fm == null) {
+            problems.add("璐ц繍閲忓懆杞噺/瑙勪笂瑙勪笅/鍏矾鏃呭/鍩庡競瀹㈣繍褰撴湀鏁版嵁鍧囩己澶�");
+        }
+        if (cityPaxC > 0 && lastPaxC <= 0) {
+            problems.add((year - 1) + "-" + String.format("%02d", month) + " 鍚屾湡鍩庡競瀹㈣繍鏁版嵁鏈鍏ュ簱锛屽煄甯傚杩愬悓姣旀殏涓嶆樉绀猴紝寰� 2025 骞村畾绋挎暟鎹鍏ュ悗鑷姩鍑虹幇");
+        }
+        if (paxC > 0 && lastPaxC2 <= 0) {
+            problems.add((year - 1) + "-" + String.format("%02d", month) + " 鍚屾湡鍏矾鏃呭鏁版嵁鏈鍏ュ簱锛屼腑鍙e緞鍚屾瘮鏆備笉鏄剧ず锛屽緟 2025 骞村畾绋挎暟鎹鍏ュ悗鑷姩鍑虹幇");
+        }
+    }
+
+    /** 鍩庡競瀹㈣繍鍏ㄧ渷绱鍚戦噺锛�8 鎸囨爣锛氬叕浜ゅ杩�/鍛ㄨ浆銆佸嚭绉熷杩�/鍛ㄨ浆銆佽建閬撳杩�/鍛ㄨ浆銆佽疆娓″杩�/鍛ㄨ浆锛� */
+    private double[] cityCumProv(String yearPrefix, int month) {
+        if (month <= 0) return new double[8];
+        return loadCityPassengerCumulative(yearPrefix, month).getOrDefault("鍏ㄧ渷", new double[8]);
+    }
+
+    private double[] diff8(double[] a, double[] b) {
+        double[] out = new double[8];
+        for (int i = 0; i < 8; i++) out[i] = a[i] - b[i];
+        return out;
+    }
+
+    private double sumIdx(double[] arr, int[] idx) {
+        double sum = 0.0;
+        for (int i : idx) sum += (i < arr.length ? arr[i] : 0.0);
+        return sum;
+    }
+
+    /** 鐧惧垎姣斿悓姣旓紙鍊煎凡涓烘瘮鐜� 0.xx锛夛細杈撳嚭鍥涜 褰撴湀/绱/褰撴湀鍚屾瘮/绱鍚屾瘮 */
+    private void addKpi(List<Map<String, Object>> summary, String name, Double m, Double cum, Double yoyM, Double yoyC, String unit) {
+        if (m != null) addSum(summary, name + "路褰撴湀", round(m, 2), unit);
+        if (cum != null) addSum(summary, name + "路绱", round(cum, 2), unit);
+        if (yoyM != null) addSum(summary, name + "路褰撴湀鍚屾瘮", round(yoyM * 100.0, 1), "%");
+        if (yoyC != null) addSum(summary, name + "路绱鍚屾瘮", round(yoyC * 100.0, 1), "%");
+    }
+
+    /** 鍘熷鏁板�肩増锛堟湀/绱涓� 0 瑙嗕负鏃犳暟鎹笉鍑鸿锛� */
+    private void addKpiRaw(List<Map<String, Object>> summary, String name, double m, double cum, double lastM, double lastC, String unit) {
+        if (m > 0) addSum(summary, name + "路褰撴湀", round(m, 2), unit);
+        if (cum > 0) addSum(summary, name + "路绱", round(cum, 2), unit);
+        if (m > 0 && lastM > 0) addSum(summary, name + "路褰撴湀鍚屾瘮", round((m - lastM) / lastM * 100.0, 1), "%");
+        if (cum > 0 && lastC > 0) addSum(summary, name + "路绱鍚屾瘮", round((cum - lastC) / lastC * 100.0, 1), "%");
     }
 
     private void addSum(List<Map<String, Object>> summary, String label, Double value, String unit) {
@@ -3232,13 +3345,821 @@
                 log.info("姹囨�诲伐浣滅翱瑁佸壀鑷� {} 鏈堝畬鎴愶紝娓呯┖/鏀瑰啓鍗曞厓鏍兼暟={}", toMonth, trimmed);
             }
             dynamicSummaryYear(wb, year);
-            applyTwoDecimalFormat(wb); // 姹囨�诲ぇ琛ㄤ繚鐣欎汉宸ユ瘝鐗堝垪瀹�/鐗堝紡锛氫笉鍋� autoFit锛堥暱鍏紡浼氭妸鍒楀椤剁垎锛�
+            cleanSummarySheetPresentation(wb); // 鍙栨秷鍚勯〉绛涢�夈�佽繕鍘熼殣钘忚锛堝惁鍒欌�滅彮绾垮寘杞︹�濈瓑椤电湅璧锋潵鍍忕己鏁版嵁锛�
+            int effMonth = (toMonth != null && toMonth > 0 && toMonth < month) ? toMonth : month;
+            List<String> dbProblems = new ArrayList<>();
+            String effPeriod = String.format("%04d-%02d", year, effMonth);
+            int dbFilled = summaryWorkbookFiller.fillMonthlyLedger(wb, effPeriod, year, effMonth, dbProblems);
+            int yoyFilled = summaryWorkbookFiller.ensureMonthYoyFormulas(wb, year, effMonth);
+            int monthFormulaFilled = summaryWorkbookFiller.ensureMonthFormulas(wb, year, effMonth);
+            int rankRefreshed = refreshSummaryRankSheets(wb, effPeriod, "month");
+            int cumulativeRefreshed = refreshSummaryCumulativeSheets(wb, year, effMonth); // 鍥涘紶璺ㄩ〉鍚堟垚椤甸殢鎶ヨ〃鏈熷埛鏂�
+            int widthApplied = applySummaryReferenceLayout(wb);
+            log.info("姹囨�诲伐浣滅翱鏁版嵁椹卞姩鍥炲~瀹屾垚锛氬啓鍏ュ綋鏈堝�兼牸鏁�={}锛岃ˉ鍐欏綋鏈堝悓姣斿叕寮忔牸鏁�={}锛岃ˉ鍐欏綋鏈堝悎璁″叕寮忔牸鏁�={}锛�"
+                    + "鍒锋柊鎺掑悕椤垫暟鍊兼牸鏁�={}锛屽埛鏂板洓椤碉紙鍩庡競姹囨��/鍩庡競鍒嗗競宸�/涓彛寰勫垎鏋�/閬撹矾杩愯緭鍛ㄨ浆閲忥級鏁板�兼牸鏁�={}锛�"
+                    + "鎸夈�婄敓鎴恄閬撹矾杩愯緭閲忔眹鎬昏〃銆嬪榻愬垪瀹藉垪鏁�={}锛岀己鏁版彁绀�={}",
+                    dbFilled, yoyFilled, monthFormulaFilled, rankRefreshed, cumulativeRefreshed, widthApplied, dbProblems);
+            applyTwoDecimalFormat(wb); // 鏁板�兼樉绀轰袱浣嶅皬鏁帮紙淇濈暀鍏ㄧ簿搴︼級锛�% / 鏃ユ湡绛夋棦鏈夋牱寮忎笉鏀瑰彉
             if (!wb.getCTWorkbook().isSetCalcPr()) wb.getCTWorkbook().addNewCalcPr();
             wb.getCTWorkbook().getCalcPr().setFullCalcOnLoad(true); // 杩樺師/鏀瑰啓鍏紡鍚庢墦寮�鍗抽噸绠�
             return toBytes(wb);
         } finally {
             ZipSecureFile.setMinInflateRatio(savedZipRatio);
         }
+    }
+
+    /**
+     * 鐗堝紡瀵归綈锛氭寜 docs/鐢熸垚姹囨�诲ぇ琛�/銆婄敓鎴恄閬撹矾杩愯緭閲忔眹鎬昏〃.xlsx銆嬶紙鐢ㄦ埛鎻愪緵鐨勭増寮忓弬鐓э級閫愬垪濂楃敤鍒楀涓庨殣钘忔爣璁帮紝
+     * 浣跨敓鎴愪欢涓庡弬鐓т欢鈥滄牸寮忓畬鍏ㄤ竴鑷粹�濓紝骞惰姣嶇増娌″畾涔夊搴︾殑鈥滃悗缁墿鍒椻�濓紙濡� 8 鏈堝垪锛変篃鏈変笌 8 鏈堜竴鑷寸殑鍒楀銆�
+     * 鍙傜収浠剁己澶辨椂闈欓粯璺宠繃锛堣繑鍥� 0锛夛紝涓嶅奖鍝嶅師鏈夊鍑恒��
+     */
+    private int applySummaryReferenceLayout(XSSFWorkbook wb) {
+        File ref;
+        try {
+            ref = resolveSummaryLayoutRef();
+        } catch (Exception e) {
+            return 0;
+        }
+        if (ref == null) return 0;
+        double savedZipRatio = ZipSecureFile.getMinInflateRatio();
+        ZipSecureFile.setMinInflateRatio(0.0001);
+        int applied = 0;
+        try (InputStream in = new FileInputStream(ref); XSSFWorkbook rwb = new XSSFWorkbook(in)) {
+            for (int i = 0; i < rwb.getNumberOfSheets(); i++) {
+                org.apache.poi.xssf.usermodel.XSSFSheet rs = rwb.getSheetAt(i);
+                if (rs == null) continue;
+                org.apache.poi.xssf.usermodel.XSSFSheet ts = wb.getSheet(rs.getSheetName());
+                if (ts == null) continue;
+                int maxCol = Math.min(usedColumnCount(rs), usedColumnCount(ts) + 4);
+                if (maxCol <= 0) continue;
+                double[] width = new double[maxCol];
+                boolean[] hasWidth = new boolean[maxCol];
+                boolean[] hidden = new boolean[maxCol];
+                for (org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCols cols : rs.getCTWorksheet().getColsArray()) {
+                    for (org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCol col : cols.getColArray()) {
+                        long min = col.getMin();
+                        long max = col.getMax();
+                        for (long c = min; c <= max; c++) {
+                            int idx = (int) (c - 1);
+                            if (idx < 0 || idx >= maxCol) {
+                                if (idx >= maxCol) break;
+                                continue;
+                            }
+                            if (col.isSetWidth()) {
+                                width[idx] = col.getWidth();
+                                hasWidth[idx] = true;
+                            }
+                            hidden[idx] = col.isSetHidden() && col.getHidden();
+                        }
+                    }
+                }
+                for (int c = 0; c < maxCol; c++) {
+                    if (hasWidth[c]) {
+                        int w = (int) Math.round(width[c] * 256d);
+                        if (ts.getColumnWidth(c) != w) {
+                            ts.setColumnWidth(c, w);
+                            applied++;
+                        }
+                    }
+                    if (hidden[c] != ts.isColumnHidden(c)) ts.setColumnHidden(c, hidden[c]);
+                }
+            }
+            log.info("姹囨�诲伐浣滅翱鐗堝紡瀵归綈銆婄敓鎴恄閬撹矾杩愯緭閲忔眹鎬昏〃銆嬪畬鎴愶細濂楃敤鍒楀 {} 鍒楋紙鍙傜収浠讹細{}锛�", applied, ref.getName());
+        } catch (Exception e) {
+            log.warn("姹囨�诲伐浣滅翱鐗堝紡瀵归綈澶辫触锛堝拷鐣ワ紝缁х画鎸夋瘝鐗堢増寮忚緭鍑猴級锛歿}", e.getMessage());
+            return 0;
+        } finally {
+            ZipSecureFile.setMinInflateRatio(savedZipRatio);
+        }
+        return applied;
+    }
+
+    /** 涓�椤靛凡鐢ㄥ埌鐨勬渶澶у垪鏁帮紙0 鍩鸿鏁帮級 */
+    private int usedColumnCount(org.apache.poi.ss.usermodel.Sheet sh) {
+        int max = 0;
+        for (int r = sh.getFirstRowNum(); r <= sh.getLastRowNum(); r++) {
+            org.apache.poi.ss.usermodel.Row row = sh.getRow(r);
+            if (row == null) continue;
+            if (row.getLastCellNum() > max) max = row.getLastCellNum();
+        }
+        return max;
+    }
+
+    // ==================== 姹囨�诲伐浣滅翱鍐呯殑鎺掑悕椤靛埛鏂� ====================
+
+    /**
+     * 姹囨�诲伐浣滅翱閲岀殑銆岃揣杩愰噺鎺掑悕 / 璐ц繍鍛ㄨ浆閲忔帓鍚� / 涓彛寰勬帓鍚嶃�嶅湪姣嶇増閲屾槸涓婁竴鎶ヨ〃鏈熺殑闈欐�佸�硷紝
+     * 瀵煎嚭鏃剁敤鐙珛鎺掑悕琛紙銆婄敓鎴恄璐ц繍閲忔帓鍚嶃�嬨�婄敓鎴恄鍛ㄨ浆閲忔帓鍚嶃�嬨�婄敓鎴恄涓彛寰勬帓鍚嶃�嬶紝涓庣敤鎴锋棩甯告牳瀵圭殑鍙e緞涓�鑷达級
+     * 鐨勭粨鏋滃埛鏂版暟鍊硷紝閬垮厤姹囨�昏〃閲岀殑鎺掑悕椤靛仠鐣欏湪鏃ф湀浠姐��
+     * 鏁板�兼牸鎼�笺�佸叕寮忔牸鎸夊亸绉诲钩绉诲叕寮忓悗鍐欏叆锛涚洰鏍囨牸鏈韩宸叉槸鍏紡鐨勶紙SUM/RANK/鍗犳瘮/琛ユ暟锛変繚鐣欎笉鍔紝鎵撳紑鏃舵寜鏂版暟鎹噸绠椼��
+     */
+    private int refreshSummaryRankSheets(XSSFWorkbook wb, String period, String mode) throws Exception {
+        int n = 0;
+        n += copyRankValues(wb, "璐ц繍閲忔帓鍚�", exportFreightRank(period, mode), new int[][]{{0, 0}, {22, 0}});
+        n += copyRankValues(wb, "璐ц繍鍛ㄨ浆閲忔帓鍚�", exportTurnoverRank(period, mode), new int[][]{{0, 0}, {22, 0}});
+        n += copyRankValues(wb, "涓彛寰勬帓鍚�", exportPassengerMidRank(period, mode), new int[][]{{0, 0}, {0, 10}});
+        return n;
+    }
+
+    /**
+     * 鎶婄嫭绔嬫帓鍚嶈〃鐨勫悇涓潡鎸夋爣棰樺榻愭惉杩涙眹鎬诲ぇ琛ㄥ搴旈〉銆�
+     * srcBlocks[i] = 婧愬潡 i 鐨勮捣濮� {琛�, 鍒梷锛�0 鍩猴級锛涚洰鏍囧潡鎸夋爣棰橀『搴忥紙绱鍧楀湪鍓嶃�佸綋鏈堝潡鍦ㄥ悗锛夊搴斻��
+     * 鏁板�兼牸鐩存帴鎼�硷紱婧愪晶鏄叕寮忕殑锛堟帓鍚�/鍗犳瘮绛夛級鎸夌洰鏍囧潡鍋忕Щ鏁翠綋骞崇Щ鍚庡啓鍏ュ叕寮忥紝鎵撳紑鏃舵寜姹囨�昏〃鑷韩鏁版嵁閲嶇畻銆�
+     */
+    private int copyRankValues(XSSFWorkbook dstWb, String dstSheetName, byte[] srcBytes, int[][] srcBlocks) throws Exception {
+        XSSFSheet dst = dstWb.getSheet(dstSheetName);
+        if (dst == null) return 0;
+        List<XSSFCell> dstTitles = rankTitleCells(dst);
+        if (dstTitles.isEmpty()) return 0;
+        int copied = 0;
+        FormulaEvaluator dstEv = dstWb.getCreationHelper().createFormulaEvaluator();
+        try (InputStream sin = new ByteArrayInputStream(srcBytes);
+             XSSFWorkbook srcWb = new XSSFWorkbook(sin)) {
+            XSSFSheet src = srcWb.getSheetAt(0);
+            FormulaEvaluator ev = srcWb.getCreationHelper().createFormulaEvaluator();
+            int blocks = Math.min(srcBlocks.length, dstTitles.size());
+            for (int b = 0; b < blocks; b++) {
+                int sr0 = srcBlocks[b][0];
+                int sc0 = srcBlocks[b][1];
+                XSSFCell dstTitle = dstTitles.get(b);
+                int rowOff = dstTitle.getRowIndex() - sr0;
+                int colOff = dstTitle.getColumnIndex() - sc0;
+                int h = rankBlockHeight(src, sr0, sc0);
+                int w = rankBlockWidth(src, sr0, sc0);
+                for (int r = 0; r < h; r++) {
+                    Row srcRow = src.getRow(sr0 + r);
+                    if (srcRow == null) continue;
+                    Row dstRow = dst.getRow(sr0 + r + rowOff);
+                    if (dstRow == null) dstRow = dst.createRow(sr0 + r + rowOff);
+                    for (int c = 0; c < w; c++) {
+                        Cell sc = srcRow.getCell(sc0 + c);
+                        if (sc == null) continue;
+                        int dc = sc0 + c + colOff;
+                        if (r == 0) {
+                            // 鏍囬琛岋細鍚屾鍧楁爣棰樻枃妗堛�傛瘝鐗堟爣棰樻槸 inlineStr锛孭OI 鐨� setCellValue 鍙啓 <v>銆�
+                            // 涓嶆洿鏂� <is>锛孍xcel 浼氱户缁樉绀烘棫鏈堜唤锛屽繀椤诲厛 setBlank 娓呮帀鍐嶅啓銆�
+                            Cell dt = dstRow.getCell(dc);
+                            if (dt == null) dt = rankCell(dstRow, dc);
+                            if (sc.getCellType() == CellType.STRING && dt.getCellType() != CellType.FORMULA) {
+                                String text = sc.getStringCellValue();
+                                String old = dt.getCellType() == CellType.STRING ? dt.getStringCellValue() : null;
+                                if (text != null && !text.equals(old)) {
+                                    dt.setBlank();
+                                    dt.setCellValue(text);
+                                }
+                            }
+                            continue;
+                        }
+                        Cell dcCell = dstRow.getCell(dc);
+                        if (dcCell != null && dcCell.getCellType() == CellType.FORMULA) continue; // 淇濈暀姣嶇増鑷繁鐨勫叕寮�
+                        if (sc.getCellType() == CellType.FORMULA) {
+                            // 婧愪晶鍏紡锛堟帓鍚�/鍗犳瘮锛夛細鎸夌洰鏍囧潡鍋忕Щ骞崇Щ鍚庡師鏍峰啓鍏ワ紝鍐嶆寜姹囨�昏〃鑷韩鏁版嵁姹傚�肩紦瀛樸��
+                            // 涓嶇洿鎺ユ惉 POI 瀵规簮琛ㄧ殑姹傚�肩粨鏋滐紙濡� RANK 瀵规墜宸ョ暀绌虹殑鍚屾瘮涓�寰嬭繑鍥� 1锛夈��
+                            String f = sc.getCellFormula();
+                            if (f == null || f.isEmpty()) continue;
+                            String shifted = shiftFormula(f, colOff, rowOff);
+                            if (dcCell == null) dcCell = rankCell(dstRow, dc);
+                            dcCell.setCellFormula(shifted);
+                            try {
+                                dstEv.evaluateFormulaCell(dcCell);
+                            } catch (Exception ignore) {
+                                // 姹傚�煎け璐ヤ笉闃诲瀵煎嚭锛氭墦寮�鏃剁敱 Excel/WPS 閲嶇畻
+                            }
+                            copied++;
+                            continue;
+                        }
+                        Double v = rankNumeric(sc, ev);
+                        if (v == null) continue;
+                        if (dcCell == null) dcCell = rankCell(dstRow, dc);
+                        dcCell.setCellValue(v);
+                        copied++;
+                    }
+                }
+            }
+        }
+        return copied;
+    }
+
+    /** 鐩爣鍧楃己鏍兼椂鏂板缓锛屽苟娌跨敤鍚岃宸﹂偦鏍兼牱寮忥紙闃叉柊鏍间涪杈规/鐧惧垎鏁版牸寮忥級 */
+    private Cell rankCell(Row row, int col) {
+        Cell c = row.createCell(col);
+        Cell left = col > 0 ? row.getCell(col - 1) : null;
+        if (left != null) c.setCellStyle(left.getCellStyle());
+        return c;
+    }
+
+    /** 鍏紡鍐呮墍鏈� A1 寮曠敤鏁翠綋骞崇Щ锛氬垪 +dCol銆佽 +dRow锛圫UM/RANK 绛夊嚱鏁板悕鍚庢帴鎷彿涓嶄細琚尮閰嶏級 */
+    private String shiftFormula(String formula, int dCol, int dRow) {
+        if (formula == null || (dCol == 0 && dRow == 0)) return formula;
+        java.util.regex.Matcher m = java.util.regex.Pattern
+                .compile("(?<![A-Za-z0-9_$])([$]?)([A-Z]{1,3})([$]?)([0-9]+)")
+                .matcher(formula);
+        StringBuffer sb = new StringBuffer();
+        while (m.find()) {
+            String col = m.group(2);
+            int idx = 0;
+            for (int i = 0; i < col.length(); i++) idx = idx * 26 + (col.charAt(i) - 'A' + 1);
+            int nidx = Math.max(1, idx + dCol);
+            StringBuilder nc = new StringBuilder();
+            while (nidx > 0) {
+                int rem = (nidx - 1) % 26;
+                nc.insert(0, (char) ('A' + rem));
+                nidx = (nidx - 1) / 26;
+            }
+            int nrow = Math.max(1, Integer.parseInt(m.group(4)) + dRow);
+            m.appendReplacement(sb, java.util.regex.Matcher.quoteReplacement(m.group(1) + nc + m.group(3) + nrow));
+        }
+        m.appendTail(sb);
+        return sb.toString();
+    }
+
+    /** 鎺掑悕椤甸噷鐨勨�滃潡鏍囬鈥濆崟鍏冩牸锛堝惈鈥滃叏鐪佸垎甯傚窞鈥濈殑璇存槑鏂囧瓧锛夛紝鎸夎銆佸垪椤哄簭杩斿洖 */
+    private List<XSSFCell> rankTitleCells(Sheet sh) {
+        List<XSSFCell> out = new ArrayList<>();
+        for (int r = sh.getFirstRowNum(); r <= sh.getLastRowNum(); r++) {
+            Row row = sh.getRow(r);
+            if (row == null) continue;
+            for (int c = row.getFirstCellNum(); c < row.getLastCellNum(); c++) {
+                Cell cell = row.getCell(c);
+                if (cell == null || cell.getCellType() != CellType.STRING) continue;
+                String t = cell.getStringCellValue();
+                if (t != null && t.contains("鍏ㄧ渷鍒嗗競宸�")) out.add((XSSFCell) cell);
+            }
+        }
+        return out;
+    }
+
+    /** 鍧楅珮搴︼細浠庤捣濮嬭鍚戜笅鐩村埌鏁磋涓虹┖锛堝湪鍧楀垪鑼冨洿鍐咃級 */
+    private int rankBlockHeight(Sheet sh, int r0, int c0) {
+        int h = 0;
+        for (int r = r0; r <= sh.getLastRowNum(); r++) {
+            Row row = sh.getRow(r);
+            boolean any = false;
+            if (row != null) {
+                int last = row.getLastCellNum();
+                for (int c = c0; c < last; c++) {
+                    if (rankHasContent(row.getCell(c))) { any = true; break; }
+                }
+            }
+            if (!any) break;
+            h++;
+        }
+        return h;
+    }
+
+    /** 鍧楀搴︼細浠庤捣濮嬪垪鍚戝彸鐩村埌鏁村垪涓虹┖锛堝湪鍧楄鑼冨洿鍐咃紝鎵弿涓婇檺 40 鍒楋級 */
+    private int rankBlockWidth(Sheet sh, int r0, int c0) {
+        int w = 0;
+        for (int c = c0; c < c0 + 40; c++) {
+            boolean any = false;
+            for (int r = r0; r < r0 + 30; r++) {
+                Row row = sh.getRow(r);
+                if (row != null && rankHasContent(row.getCell(c))) { any = true; break; }
+            }
+            if (!any) break;
+            w++;
+        }
+        return w;
+    }
+
+    private boolean rankHasContent(Cell c) {
+        if (c == null) return false;
+        CellType t = c.getCellType();
+        if (t == CellType.BLANK) return false;
+        if (t == CellType.STRING) {
+            String v = c.getStringCellValue();
+            return v != null && !v.trim().isEmpty();
+        }
+        return true;
+    }
+
+    /** 鍙栧崟鍏冩牸鏁板�硷紙鍏紡鍙栨眰鍊肩粨鏋滐紝绾暟瀛楁枃鏈寜鏁板�艰В鏋愶級锛屽彇涓嶅埌杩斿洖 null */
+    private Double rankNumeric(Cell c, FormulaEvaluator ev) {
+        try {
+            CellType t = c.getCellType();
+            if (t == CellType.NUMERIC) return c.getNumericCellValue();
+            if (t == CellType.FORMULA) {
+                org.apache.poi.ss.usermodel.CellValue cv = ev.evaluate(c);
+                return cv != null && cv.getCellType() == CellType.NUMERIC ? cv.getNumberValue() : null;
+            }
+            if (t == CellType.STRING) {
+                String v = c.getStringCellValue();
+                if (v == null) return null;
+                String x = v.replace(",", "").trim();
+                if (x.isEmpty()) return null;
+                try { return Double.parseDouble(x); } catch (NumberFormatException ignore) { return null; }
+            }
+        } catch (Exception ignore) {
+            return null;
+        }
+        return null;
+    }
+
+    /** 瀹氫綅鐗堝紡鍙傜収浠� docs/鐢熸垚姹囨�诲ぇ琛�/鐢熸垚_閬撹矾杩愯緭閲忔眹鎬昏〃.xlsx锛堜紭鍏堢骇鍚屾瘝鐗堬細閰嶇疆鐩綍 鈫� user.dir 鐩稿 鈫� 涓婄骇锛� */
+    // ==================== 姹囨�诲ぇ琛細鍥涘紶鈥滆法椤靛悎鎴愨�濋〉闅忔姤琛ㄦ湡鍒锋柊 ====================
+    // 鍩庡競姹囨�� / 鍩庡競鍒嗗競宸� / 涓彛寰勫垎鏋� / 閬撹矾杩愯緭鍛ㄨ浆閲� 姝ゅ墠鏁撮〉娌跨敤姣嶇増闈欐�佸�硷紙鏍囬鍋滃湪 1-7 鏈堬級銆�
+    // 鏈鎸� 2026-09-13 宸查獙璇佸彛寰勶紙涓� 8 鏈堟瘝鐗堥�愭牸 0 宸紓锛変粠姣嶇増鍙拌处椤电幇绠楋細
+    //   鍩庡競瀹㈣繍閲�     = 鍩庡競鍐呭叕浜� + 鍩庡競鍐呭贰娓稿嚭绉� + 鍩庡競鍐呯綉绾﹁溅 + 杞ㄩ亾 + 杞浮
+    //   閬撹矾瀹㈣繍鍛ㄨ浆閲� = 鍏矾鐝嚎 + 鍩庨檯鍩庝埂鍏氦 + 鍩庨檯鍩庝埂宸℃父鍑虹 + 鍩庨檯鍩庝埂缃戠害杞�
+    //   閬撹矾璐ц繍鍛ㄨ浆閲� = 璐ц繍椤� 甯傚窞 瑙勪笂璐х墿鍛ㄨ浆閲� + 瑙勪笅璐х墿鍛ㄨ浆閲�
+    // 2026 骞� 1..N 鏈堝彇鍙拌处椤� 2026 鍒楋紙C/E/G鈥︼級锛屽幓骞村悓鏈熷彇姣嶇増缂撳瓨 2025 鍒楋紙V/X/Z鈥︼級鈥斺�斿簱閲屾病鏈� 2025 骞村煄甯傚杩愭暟鎹��
+
+    /** 鍩庡競瀹㈣繍鍙e緞鎸囨爣浣嶏紙0..17 鍩庡競瀹㈣繍锛�18 璐ц繍鍛ㄨ浆閲忥級 */
+    private static final int SM_BUS_PAX = 0, SM_BUS_TURN = 1;
+    private static final int SM_TAXI_PAX = 2, SM_TAXI_TURN = 3;
+    private static final int SM_WYC_PAX = 4, SM_WYC_TURN = 5;
+    private static final int SM_RAIL_PAX = 6, SM_RAIL_TURN = 7;
+    private static final int SM_FERRY_PAX = 8, SM_FERRY_TURN = 9;
+    private static final int SM_BX_PAX = 10, SM_BX_TURN = 11;
+    private static final int SM_BUS_CX_PAX = 12, SM_BUS_CX_TURN = 13;
+    private static final int SM_TAXI_CX_PAX = 14, SM_TAXI_CX_TURN = 15;
+    private static final int SM_WYC_CX_PAX = 16, SM_WYC_CX_TURN = 17;
+    private static final int SM_FREIGHT_TURN = 18;
+    private static final int SM_DIM = 19;
+    /** 2026 骞� 1 鏈堝綋鏈堝�煎垪锛�0 鍩猴紝C 鍒楋級锛�2025 骞� 1 鏈堝綋鏈堝�煎垪锛�0 鍩猴紝V 鍒楋級 */
+    private static final int SM_CUR_COL0 = 2;
+    private static final int SM_LAST_COL0 = 21;
+
+    /**
+     * 鍒锋柊鍥涘紶璺ㄩ〉鍚堟垚椤碉細褰撳勾绱锛�1..month 鏈堬級銆佸綋鏈堬紙month 鏈堬級鍙婂搴斿悓姣旓紱
+     * 2026 涓� 2025 鍚屾湡閮藉彇鑷瘝鐗堝彴璐﹂〉缂撳瓨锛岃繑鍥炲啓鍏ュ崟鍏冩牸鏁般��
+     */
+    private int refreshSummaryCumulativeSheets(XSSFWorkbook wb, int year, int month) {
+        if (wb == null || month <= 0) return 0;
+        int[] cumMonths = new int[month];
+        for (int m = 1; m <= month; m++) cumMonths[m - 1] = m;
+        int[] oneMonth = new int[]{month};
+        Map<String, double[]> curCum = smReadLedgerMetrics(wb, true, cumMonths);
+        Map<String, double[]> lastCum = smReadLedgerMetrics(wb, false, cumMonths);
+        Map<String, double[]> curMon = smReadLedgerMetrics(wb, true, oneMonth);
+        Map<String, double[]> lastMon = smReadLedgerMetrics(wb, false, oneMonth);
+        if (curCum.isEmpty()) {
+            log.warn("姹囨�诲ぇ琛ㄥ洓椤靛埛鏂帮細鍙拌处椤垫湭璇诲埌甯傚窞鏁版嵁锛岃烦杩囷紙淇濇寔姣嶇増鍘熷�硷級");
+            return 0;
+        }
+        double[] pCurCum = smProvinceSum(curCum);
+        double[] pLastCum = smProvinceSum(lastCum);
+        double[] pCurMon = smProvinceSum(curMon);
+        double[] pLastMon = smProvinceSum(lastMon);
+        int n = 0;
+        n += smWriteCitySummary(wb, year, month, pCurCum, pLastCum, pCurMon, pLastMon);
+        n += smWriteCityByRegion(wb, month, curCum, lastCum, curMon, lastMon);
+        n += smWriteMidAnalysis(wb, month, pCurCum, pLastCum, pCurMon, pLastMon);
+        n += smWriteTurnoverSheets(wb, year, month, curCum, lastCum, curMon, lastMon);
+        return n;
+    }
+
+    /** 17 甯傚窞鍚堣锛堜笉鍚彴璐﹂〉鈥滃叏鐪佲�濆叕寮忚锛� */
+    private double[] smProvinceSum(Map<String, double[]> m) {
+        double[] p = new double[SM_DIM];
+        for (String c : RegionUtil.cityList()) {
+            double[] a = m.get(c);
+            if (a == null) continue;
+            for (int i = 0; i < SM_DIM; i++) p[i] += a[i];
+        }
+        return p;
+    }
+
+    /** 鍙拌处椤电疮璁″彇鏁帮細甯傚窞瑙勮寖鍚� -> 19 缁存寚鏍� */
+    private Map<String, double[]> smReadLedgerMetrics(XSSFWorkbook wb, boolean curYear, int[] months) {
+        Map<String, double[]> out = new LinkedHashMap<>();
+        smReadCityPaxPage(wb, "鍏氦", curYear, months, out, SM_BUS_PAX, SM_BUS_TURN, SM_BUS_CX_PAX, SM_BUS_CX_TURN);
+        smReadCityPaxPage(wb, "鍑虹", curYear, months, out, SM_TAXI_PAX, SM_TAXI_TURN, SM_TAXI_CX_PAX, SM_TAXI_CX_TURN);
+        smReadCityPaxPage(wb, "缃戠害杞�", curYear, months, out, SM_WYC_PAX, SM_WYC_TURN, SM_WYC_CX_PAX, SM_WYC_CX_TURN);
+        smReadRailFerry(wb, curYear, months, out);
+        smReadBanxian(wb, curYear, months, out);
+        smReadFreightTurnover(wb, curYear, months, out);
+        return out;
+    }
+
+    /** 鍏氦/鍑虹/缃戠害杞﹂〉锛氭瘡甯傚窞 4 琛岋紙瀹㈣繍閲�/鏃呭鍛ㄨ浆閲�/鍏朵腑鍩庡競鍐呭杩愰噺/鍏朵腑鍩庡競鍐呮梾瀹㈠懆杞噺锛� */
+    private void smReadCityPaxPage(XSSFWorkbook wb, String sheetName, boolean curYear, int[] months,
+                                   Map<String, double[]> out, int paxIdx, int turnIdx, int cxPaxIdx, int cxTurnIdx) {
+        Sheet sh = wb.getSheet(sheetName);
+        if (sh == null) return;
+        int last = sh.getLastRowNum();
+        for (int r = sh.getFirstRowNum(); r <= last; r++) {
+            Row row = sh.getRow(r);
+            if (row == null) continue;
+            String city = smCityOf(row.getCell(0));
+            if (city == null) continue;
+            int paxRow = -1, turnRow = -1, cxPaxRow = -1, cxTurnRow = -1;
+            for (int k = r; k <= Math.min(last, r + 4); k++) {
+                Row kr = sh.getRow(k);
+                if (kr == null) continue;
+                String b = smText(kr.getCell(1));
+                if (b == null || b.contains("涓綋")) continue;
+                boolean inner = b.contains("鍩庡競鍐�");
+                boolean turn = b.contains("鍛ㄨ浆閲�");
+                if (inner) {
+                    if (turn) { if (cxTurnRow < 0) cxTurnRow = k; }
+                    else if (cxPaxRow < 0) cxPaxRow = k;
+                } else {
+                    if (turn) { if (turnRow < 0) turnRow = k; }
+                    else if (paxRow < 0) paxRow = k;
+                }
+            }
+            double totalPax = smSumMonths(sh, paxRow, curYear, months);
+            double totalTurn = smSumMonths(sh, turnRow, curYear, months);
+            double cityPax = smSumMonths(sh, cxPaxRow, curYear, months);
+            double cityTurn = smSumMonths(sh, cxTurnRow, curYear, months);
+            double[] arr = out.computeIfAbsent(city, k -> new double[SM_DIM]);
+            arr[paxIdx] += cityPax;                 // 鍩庡競瀹㈣繍鍙e緞鍙栤�滃煄甯傚唴鈥�
+            arr[turnIdx] += cityTurn;
+            arr[cxPaxIdx] += totalPax - cityPax;    // 鍩庨檯鍩庝埂 = 鎬婚噺 - 鍩庡競鍐�
+            arr[cxTurnIdx] += totalTurn - cityTurn;
+        }
+    }
+
+    /** 杞ㄩ亾銆佽疆娓¢〉锛氳建閬撳潡锛堟姹�/榛勭煶锛�+ 杞浮鍧楋紙姝︽眽锛� */
+    private void smReadRailFerry(XSSFWorkbook wb, boolean curYear, int[] months, Map<String, double[]> out) {
+        Sheet sh = wb.getSheet("杞ㄩ亾銆佽疆娓�");
+        if (sh == null) return;
+        int last = sh.getLastRowNum();
+        int ferryTitle = -1;
+        for (int r = sh.getFirstRowNum(); r <= last; r++) {
+            Row row = sh.getRow(r);
+            if (row == null) continue;
+            String a = smText(row.getCell(0));
+            if (a != null && a.contains("杞浮瀹㈣繍閲�")) { ferryTitle = r; break; }
+        }
+        smReadRailFerryBlock(sh, curYear, months, out, sh.getFirstRowNum(),
+                ferryTitle < 0 ? last : ferryTitle - 1, SM_RAIL_PAX);
+        if (ferryTitle >= 0) smReadRailFerryBlock(sh, curYear, months, out, ferryTitle, last, SM_FERRY_PAX);
+    }
+
+    private void smReadRailFerryBlock(Sheet sh, boolean curYear, int[] months, Map<String, double[]> out,
+                                      int start, int end, int baseIdx) {
+        for (int r = start; r <= end; r++) {
+            Row row = sh.getRow(r);
+            if (row == null) continue;
+            String city = smCityOf(row.getCell(0));
+            if (city == null) continue;
+            int paxRow = -1, turnRow = -1;
+            for (int k = r; k <= Math.min(end, r + 3); k++) {
+                Row kr = sh.getRow(k);
+                if (kr == null) continue;
+                String b = smText(kr.getCell(1));
+                if (b == null) continue;
+                if (b.contains("鍛ㄨ浆閲�")) { if (turnRow < 0) turnRow = k; }
+                else if (paxRow < 0) paxRow = k;
+            }
+            double[] arr = out.computeIfAbsent(city, k -> new double[SM_DIM]);
+            arr[baseIdx] += smSumMonths(sh, paxRow, curYear, months);
+            arr[baseIdx + 1] += smSumMonths(sh, turnRow, curYear, months);
+        }
+    }
+
+    /** 鐝嚎鍖呰溅椤碉細姣忓競宸� 瀹㈣繍閲� / 鏃呭鍛ㄨ浆閲忥紙鈥滃叾涓釜浣撯�濊涓嶉噸澶嶈鍏ワ級 */
+    private void smReadBanxian(XSSFWorkbook wb, boolean curYear, int[] months, Map<String, double[]> out) {
+        Sheet sh = wb.getSheet("鐝嚎鍖呰溅");
+        if (sh == null) return;
+        int last = sh.getLastRowNum();
+        for (int r = sh.getFirstRowNum(); r <= last; r++) {
+            Row row = sh.getRow(r);
+            if (row == null) continue;
+            String city = smCityOf(row.getCell(0));
+            if (city == null) continue;
+            int paxRow = -1, turnRow = -1;
+            for (int k = r; k <= Math.min(last, r + 4); k++) {
+                Row kr = sh.getRow(k);
+                if (kr == null) continue;
+                String b = smText(kr.getCell(1));
+                if (b == null || b.contains("涓綋")) continue;
+                if (b.contains("鍛ㄨ浆閲�")) { if (turnRow < 0) turnRow = k; }
+                else if (b.contains("瀹㈣繍閲�") && paxRow < 0) paxRow = k;
+            }
+            double[] arr = out.computeIfAbsent(city, k -> new double[SM_DIM]);
+            arr[SM_BX_PAX] += smSumMonths(sh, paxRow, curYear, months);
+            arr[SM_BX_TURN] += smSumMonths(sh, turnRow, curYear, months);
+        }
+    }
+
+    /** 璐ц繍椤碉細姣忓競宸� 瑙勪笂璐х墿鍛ㄨ浆閲� + 瑙勪笅璐х墿鍛ㄨ浆閲忥紙鈥滆涓�+瑙勪笅鈥濊鏈韩鏄眰鍜屽叕寮忥紝涓嶇洿鎺ュ彇锛� */
+    private void smReadFreightTurnover(XSSFWorkbook wb, boolean curYear, int[] months, Map<String, double[]> out) {
+        Sheet sh = wb.getSheet(" 璐ц繍");
+        if (sh == null) sh = wb.getSheet("璐ц繍");
+        if (sh == null) return;
+        int last = sh.getLastRowNum();
+        for (int r = sh.getFirstRowNum(); r <= last; r++) {
+            Row row = sh.getRow(r);
+            if (row == null) continue;
+            String city = smCityOf(row.getCell(0));
+            if (city == null) continue;
+            int above = -1, below = -1;
+            for (int k = r; k <= Math.min(last, r + 6); k++) {
+                Row kr = sh.getRow(k);
+                if (kr == null) continue;
+                String b = smText(kr.getCell(1));
+                if (b == null || b.contains("鍏朵腑")) continue;
+                if (b.contains("瑙勪笂璐х墿鍛ㄨ浆閲�")) { if (above < 0) above = k; }
+                else if (b.contains("瑙勪笅璐х墿鍛ㄨ浆閲�")) { if (below < 0) below = k; }
+            }
+            double[] arr = out.computeIfAbsent(city, k -> new double[SM_DIM]);
+            arr[SM_FREIGHT_TURN] += smSumMonths(sh, above, curYear, months) + smSumMonths(sh, below, curYear, months);
+        }
+    }
+
+    private double smSumMonths(Sheet sh, int rowIdx, boolean curYear, int[] months) {
+        if (sh == null || rowIdx < 0) return 0;
+        Row row = sh.getRow(rowIdx);
+        if (row == null) return 0;
+        double s = 0;
+        for (int m : months) {
+            int col = (curYear ? SM_CUR_COL0 : SM_LAST_COL0) + 2 * (m - 1);
+            s += smNum(row.getCell(col));
+        }
+        return s;
+    }
+
+    /** 鍙拌处椤靛崟鍏冩牸鍙栨暟锛堟暟瀛� / 鏁板瓧鏂囨湰 / 鍏紡缂撳瓨锛� */
+    private double smNum(Cell c) {
+        if (c == null) return 0;
+        try {
+            CellType t = c.getCellType();
+            if (t == CellType.NUMERIC) return c.getNumericCellValue();
+            if (t == CellType.FORMULA) {
+                return c.getCachedFormulaResultType() == CellType.NUMERIC ? c.getNumericCellValue() : 0;
+            }
+            if (t == CellType.STRING) {
+                String s = c.getStringCellValue();
+                if (s == null) return 0;
+                s = s.replace(",", "").replace("%", "").trim();
+                if (s.isEmpty()) return 0;
+                return Double.parseDouble(s);
+            }
+        } catch (Exception ignore) {
+            return 0;
+        }
+        return 0;
+    }
+
+    private String smText(Cell c) {
+        if (c == null) return null;
+        try {
+            return c.getCellType() == CellType.STRING ? c.getStringCellValue() : null;
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    /** 鍒� A 鏂囨 -> 瑙勮寖甯傚窞鍚嶏紙鈥滃叏鐪�/婀栧寳鐪佲�濅笌闈炲競宸炶杩斿洖 null锛� */
+    private String smCityOf(Cell a) {
+        String t = smText(a);
+        if (t == null || t.trim().isEmpty()) return null;
+        String norm = RegionUtil.normalizeCityName(t.trim());
+        if (norm == null) return null;
+        return RegionUtil.cityList().contains(norm) ? norm : null;
+    }
+
+    private double smYoy(double cur, double last) {
+        return last == 0.0 ? 0.0 : (cur - last) / last;
+    }
+
+    /** 鍐欏�硷細鍏紡鏍间笉鍔紙淇濈暀姣嶇増鍏紡锛屾墦寮�鍗抽噸绠楋級锛�0 涓斿師涓虹┖鏍煎垯涓嶆柊澧� */
+    private int smSetVal(Sheet sh, int r0, int c0, double v) {
+        Row row = sh.getRow(r0);
+        if (row == null) return 0;
+        Cell c = row.getCell(c0);
+        if (c != null && c.getCellType() == CellType.FORMULA) return 0;
+        if (c == null) {
+            if (v == 0.0) return 0;
+            c = row.createCell(c0);
+            Cell left = row.getCell(c0 - 1);
+            if (left != null) c.setCellStyle(left.getCellStyle());
+        } else if (v == 0.0 && c.getCellType() == CellType.BLANK) {
+            return 0;
+        }
+        c.setBlank();
+        c.setCellValue(v);
+        return 1;
+    }
+
+    private void smSetTitle(Sheet sh, int r0, int c0, String text) {
+        if (sh == null) return;
+        Row row = sh.getRow(r0);
+        if (row == null) return;
+        Cell c = row.getCell(c0);
+        if (c == null || c.getCellType() == CellType.FORMULA) return;
+        c.setBlank();
+        c.setCellValue(text);
+    }
+
+    /** 鍩庡競姹囨�婚〉锛氬潡1锛�1..N 鏈堢疮璁★級琛� 3-9锛屽潡2锛堝綋鏈堬級琛� 14-20锛涘垪 B/C/D/E = 瀹㈣繍閲�/鍚屾瘮/鍛ㄨ浆閲�/鍚屾瘮 */
+    private int smWriteCitySummary(XSSFWorkbook wb, int year, int month,
+                                   double[] pCurCum, double[] pLastCum, double[] pCurMon, double[] pLastMon) {
+        Sheet sh = wb.getSheet("鍩庡競姹囨��");
+        if (sh == null) return 0;
+        smSetTitle(sh, 0, 0, year + "骞�1-" + month + "鏈堝叏鐪佺疮璁″畬鎴愬煄甯傚杩愰噺鎯呭喌");
+        smSetTitle(sh, 11, 0, year + "骞�" + month + "鏈堝叏鐪佸畬鎴愬煄甯傚杩愰噺鎯呭喌");
+        int n = 0;
+        int[] rows = {2, 3, 4, 5, 6, 7, 8};
+        for (int i = 0; i < rows.length; i++) {
+            double[] v = smCitySummaryRow(pCurCum, pLastCum, i);
+            n += smSetVal(sh, rows[i], 1, v[0]);
+            n += smSetVal(sh, rows[i], 2, v[2]);
+            n += smSetVal(sh, rows[i], 3, v[1]);
+            n += smSetVal(sh, rows[i], 4, v[3]);
+        }
+        for (int i = 0; i < rows.length; i++) {
+            double[] v = smCitySummaryRow(pCurMon, pLastMon, i);
+            n += smSetVal(sh, rows[i] + 11, 1, v[0]);
+            n += smSetVal(sh, rows[i] + 11, 2, v[2]);
+            n += smSetVal(sh, rows[i] + 11, 3, v[1]);
+            n += smSetVal(sh, rows[i] + 11, 4, v[3]);
+        }
+        return n;
+    }
+
+    /** i=0 鎬诲杩愰噺 1 鍏氦 2 鍑虹杞� 3 宸℃父鍑虹 4 缃戠害杞� 5 杞ㄩ亾 6 杞浮锛涜繑鍥� [瀹㈣繍閲�, 鍛ㄨ浆閲�, 瀹㈣繍閲忓悓姣�, 鍛ㄨ浆閲忓悓姣擼 */
+    private double[] smCitySummaryRow(double[] p, double[] pl, int i) {
+        double pax, turn, lPax, lTurn;
+        if (i == 0) {
+            pax = p[SM_BUS_PAX] + p[SM_TAXI_PAX] + p[SM_WYC_PAX] + p[SM_RAIL_PAX] + p[SM_FERRY_PAX];
+            turn = p[SM_BUS_TURN] + p[SM_TAXI_TURN] + p[SM_WYC_TURN] + p[SM_RAIL_TURN] + p[SM_FERRY_TURN];
+            lPax = pl[SM_BUS_PAX] + pl[SM_TAXI_PAX] + pl[SM_WYC_PAX] + pl[SM_RAIL_PAX] + pl[SM_FERRY_PAX];
+            lTurn = pl[SM_BUS_TURN] + pl[SM_TAXI_TURN] + pl[SM_WYC_TURN] + pl[SM_RAIL_TURN] + pl[SM_FERRY_TURN];
+        } else if (i == 1) {
+            pax = p[SM_BUS_PAX]; turn = p[SM_BUS_TURN]; lPax = pl[SM_BUS_PAX]; lTurn = pl[SM_BUS_TURN];
+        } else if (i == 2) {
+            pax = p[SM_TAXI_PAX] + p[SM_WYC_PAX]; turn = p[SM_TAXI_TURN] + p[SM_WYC_TURN];
+            lPax = pl[SM_TAXI_PAX] + pl[SM_WYC_PAX]; lTurn = pl[SM_TAXI_TURN] + pl[SM_WYC_TURN];
+        } else if (i == 3) {
+            pax = p[SM_TAXI_PAX]; turn = p[SM_TAXI_TURN]; lPax = pl[SM_TAXI_PAX]; lTurn = pl[SM_TAXI_TURN];
+        } else if (i == 4) {
+            pax = p[SM_WYC_PAX]; turn = p[SM_WYC_TURN]; lPax = pl[SM_WYC_PAX]; lTurn = pl[SM_WYC_TURN];
+        } else if (i == 5) {
+            pax = p[SM_RAIL_PAX]; turn = p[SM_RAIL_TURN]; lPax = pl[SM_RAIL_PAX]; lTurn = pl[SM_RAIL_TURN];
+        } else {
+            pax = p[SM_FERRY_PAX]; turn = p[SM_FERRY_TURN]; lPax = pl[SM_FERRY_PAX]; lTurn = pl[SM_FERRY_TURN];
+        }
+        return new double[]{pax, turn, smYoy(pax, lPax), smYoy(turn, lTurn)};
+    }
+
+    /** 鍩庡競鍒嗗競宸為〉锛�4 鍧楋紙绱瀹㈣繍閲�/绱鍛ㄨ浆閲�/褰撴湀瀹㈣繍閲�/褰撴湀鍛ㄨ浆閲忥級锛屾瘡鍧� 鍏ㄧ渷 1 琛� + 17 甯傚窞 */
+    private int smWriteCityByRegion(XSSFWorkbook wb, int month,
+                                    Map<String, double[]> curCum, Map<String, double[]> lastCum,
+                                    Map<String, double[]> curMon, Map<String, double[]> lastMon) {
+        Sheet sh = wb.getSheet("鍩庡競鍒嗗競宸�");
+        if (sh == null) return 0;
+        smSetTitle(sh, 0, 0, "鍩庡競瀹㈣繍瀹㈣繍閲忓垎甯傚窞1-" + month + "鏈堢疮璁℃儏鍐�");
+        smSetTitle(sh, 22, 0, "鍩庡競瀹㈣繍瀹㈣繍鍛ㄨ浆閲忓垎甯傚窞1-" + month + "鏈堢疮璁℃儏鍐�");
+        smSetTitle(sh, 45, 0, "鍩庡競瀹㈣繍瀹㈣繍閲忓垎甯傚窞" + month + "鏈堟儏鍐�");
+        smSetTitle(sh, 67, 0, "鍩庡競瀹㈣繍瀹㈣繍鍛ㄨ浆閲忓垎甯傚窞" + month + "鏈堟儏鍐�");
+        int n = 0;
+        n += smWriteCityByRegionBlock(sh, 4, true, curCum, lastCum);
+        n += smWriteCityByRegionBlock(sh, 26, false, curCum, lastCum);
+        n += smWriteCityByRegionBlock(sh, 49, true, curMon, lastMon);
+        n += smWriteCityByRegionBlock(sh, 71, false, curMon, lastMon);
+        return n;
+    }
+
+    private int smWriteCityByRegionBlock(Sheet sh, int provRow, boolean pax,
+                                         Map<String, double[]> cur, Map<String, double[]> last) {
+        int n = 0;
+        double[] provCur = smProvinceSum(cur);
+        double[] provLast = smProvinceSum(last);
+        List<String> cities = RegionUtil.cityList();
+        for (int i = -1; i < cities.size(); i++) {
+            int r = provRow + i + 1;
+            double[] c = i < 0 ? provCur : cur.get(cities.get(i));
+            double[] l = i < 0 ? provLast : last.get(cities.get(i));
+            if (c == null) c = new double[SM_DIM];
+            if (l == null) l = new double[SM_DIM];
+            double[] g = smCityGroupValues(c, l, pax);
+            n += smSetVal(sh, r, 1, g[0]);
+            n += smSetVal(sh, r, 4, g[6]);
+            n += smSetVal(sh, r, 6, g[1]);
+            n += smSetVal(sh, r, 9, g[7]);
+            n += smSetVal(sh, r, 11, g[2]);
+            n += smSetVal(sh, r, 14, g[8]);
+            n += smSetVal(sh, r, 16, g[3]);
+            n += smSetVal(sh, r, 19, g[9]);
+            n += smSetVal(sh, r, 21, g[4]);
+            n += smSetVal(sh, r, 22, g[10]);
+            n += smSetVal(sh, r, 23, g[5]);
+            n += smSetVal(sh, r, 24, g[11]);
+        }
+        return n;
+    }
+
+    /** 6 缁勫�� + 6 缁勫閫燂細[鎬婚噺, 鍏氦, 鍑虹, 缃戠害杞�, 杞ㄩ亾, 杞浮, 鎬婚噺澧為��, 鍏氦鈥�, 杞浮] */
+    private double[] smCityGroupValues(double[] c, double[] l, boolean pax) {
+        int busI = pax ? SM_BUS_PAX : SM_BUS_TURN;
+        int taxiI = pax ? SM_TAXI_PAX : SM_TAXI_TURN;
+        int wycI = pax ? SM_WYC_PAX : SM_WYC_TURN;
+        int railI = pax ? SM_RAIL_PAX : SM_RAIL_TURN;
+        int ferryI = pax ? SM_FERRY_PAX : SM_FERRY_TURN;
+        double bus = c[busI], taxi = c[taxiI], wyc = c[wycI], rail = c[railI], ferry = c[ferryI];
+        double lBus = l[busI], lTaxi = l[taxiI], lWyc = l[wycI], lRail = l[railI], lFerry = l[ferryI];
+        double total = bus + taxi + wyc + rail + ferry;
+        double lTotal = lBus + lTaxi + lWyc + lRail + lFerry;
+        return new double[]{total, bus, taxi, wyc, rail, ferry,
+                smYoy(total, lTotal), smYoy(bus, lBus), smYoy(taxi, lTaxi), smYoy(wyc, lWyc),
+                smYoy(rail, lRail), smYoy(ferry, lFerry)};
+    }
+
+    /** 涓彛寰勫垎鏋愰〉锛氬潡1锛堢疮璁★級琛� 3-7锛屽潡2锛堝綋鏈堬級琛� 12-16锛涘垪 B/C/F/G = 瀹㈣繍閲�/鍚屾瘮/鍛ㄨ浆閲�/鍚屾瘮 */
+    private int smWriteMidAnalysis(XSSFWorkbook wb, int month,
+                                   double[] pCurCum, double[] pLastCum, double[] pCurMon, double[] pLastMon) {
+        Sheet sh = wb.getSheet("涓彛寰勫垎鏋�");
+        if (sh == null) return 0;
+        smSetTitle(sh, 0, 0, "1-" + month + "鏈堜腑鍙e緞瀹㈣繍閲忓強鍛ㄨ浆閲�");
+        smSetTitle(sh, 9, 0, month + "鏈堜腑鍙e緞瀹㈣繍閲忓強鍛ㄨ浆閲�");
+        int n = 0;
+        int[] rows = {2, 3, 4, 5, 6};
+        for (int i = 0; i < rows.length; i++) {
+            double[] v = smMidRow(pCurCum, pLastCum, i);
+            n += smSetVal(sh, rows[i], 1, v[0]);
+            n += smSetVal(sh, rows[i], 2, v[2]);
+            n += smSetVal(sh, rows[i], 5, v[1]);
+            n += smSetVal(sh, rows[i], 6, v[3]);
+        }
+        for (int i = 0; i < rows.length; i++) {
+            double[] v = smMidRow(pCurMon, pLastMon, i);
+            n += smSetVal(sh, rows[i] + 9, 1, v[0]);
+            n += smSetVal(sh, rows[i] + 9, 2, v[2]);
+            n += smSetVal(sh, rows[i] + 9, 5, v[1]);
+            n += smSetVal(sh, rows[i] + 9, 6, v[3]);
+        }
+        return n;
+    }
+
+    /** i=0 鎬� 1 鍏矾鐝嚎 2 鍩庨檯鍩庝埂鍏氦 3 鍩庨檯鍩庝埂宸℃父鍑虹 4 鍩庨檯鍩庝埂缃戠害杞︼紱杩斿洖 [瀹㈣繍閲�, 鍛ㄨ浆閲�, 瀹㈣繍閲忓悓姣�, 鍛ㄨ浆閲忓悓姣擼 */
+    private double[] smMidRow(double[] p, double[] pl, int i) {
+        int[] paxIdx = {SM_BX_PAX, SM_BX_PAX, SM_BUS_CX_PAX, SM_TAXI_CX_PAX, SM_WYC_CX_PAX};
+        int[] turnIdx = {SM_BX_TURN, SM_BX_TURN, SM_BUS_CX_TURN, SM_TAXI_CX_TURN, SM_WYC_CX_TURN};
+        double pax, turn, lPax, lTurn;
+        if (i == 0) {
+            pax = p[SM_BX_PAX] + p[SM_BUS_CX_PAX] + p[SM_TAXI_CX_PAX] + p[SM_WYC_CX_PAX];
+            turn = p[SM_BX_TURN] + p[SM_BUS_CX_TURN] + p[SM_TAXI_CX_TURN] + p[SM_WYC_CX_TURN];
+            lPax = pl[SM_BX_PAX] + pl[SM_BUS_CX_PAX] + pl[SM_TAXI_CX_PAX] + pl[SM_WYC_CX_PAX];
+            lTurn = pl[SM_BX_TURN] + pl[SM_BUS_CX_TURN] + pl[SM_TAXI_CX_TURN] + pl[SM_WYC_CX_TURN];
+        } else {
+            pax = p[paxIdx[i]]; turn = p[turnIdx[i]];
+            lPax = pl[paxIdx[i]]; lTurn = pl[turnIdx[i]];
+        }
+        return new double[]{pax, turn, smYoy(pax, lPax), smYoy(turn, lTurn)};
+    }
+
+    /** 閬撹矾杩愯緭鍛ㄨ浆閲忛〉锛氬潡1锛堢疮璁★級琛� 4-21锛屽潡2锛堝綋鏈堬級琛� 26-43锛涘彧鍐欏�煎垪锛圔/E/V 绛夊叕寮忎繚鐣欙級 */
+    private int smWriteTurnoverSheets(XSSFWorkbook wb, int year, int month,
+                                      Map<String, double[]> curCum, Map<String, double[]> lastCum,
+                                      Map<String, double[]> curMon, Map<String, double[]> lastMon) {
+        Sheet sh = wb.getSheet("閬撹矾杩愯緭鍛ㄨ浆閲�");
+        if (sh == null) return 0;
+        smSetTitle(sh, 0, 0, year + "骞�1-" + month + "鏈堝叏鐪佺疮璁″畬鎴愪氦閫氬懆杞噺鎯呭喌");
+        smSetTitle(sh, 22, 0, year + "骞�" + month + "鏈堝叏鐪佸畬鎴愪氦閫氬懆杞噺鎯呭喌");
+        int n = 0;
+        n += smWriteTurnoverBlock(sh, 3, curCum, lastCum);
+        n += smWriteTurnoverBlock(sh, 25, curMon, lastMon);
+        return n;
+    }
+
+    private int smWriteTurnoverBlock(Sheet sh, int provRow, Map<String, double[]> cur, Map<String, double[]> last) {
+        int n = 0;
+        double[] provCur = smProvinceSum(cur);
+        double[] provLast = smProvinceSum(last);
+        List<String> cities = RegionUtil.cityList();
+        for (int i = -1; i < cities.size(); i++) {
+            int r = provRow + i + 1;
+            double[] c = i < 0 ? provCur : cur.get(cities.get(i));
+            double[] l = i < 0 ? provLast : last.get(cities.get(i));
+            if (c == null) c = new double[SM_DIM];
+            if (l == null) l = new double[SM_DIM];
+            double freight = c[SM_FREIGHT_TURN], lFreight = l[SM_FREIGHT_TURN];
+            double pax = c[SM_BUS_PAX] + c[SM_TAXI_PAX] + c[SM_WYC_PAX] + c[SM_RAIL_PAX] + c[SM_FERRY_PAX];
+            double lPax = l[SM_BUS_PAX] + l[SM_TAXI_PAX] + l[SM_WYC_PAX] + l[SM_RAIL_PAX] + l[SM_FERRY_PAX];
+            double road = c[SM_BX_TURN] + c[SM_BUS_CX_TURN] + c[SM_TAXI_CX_TURN] + c[SM_WYC_CX_TURN];
+            double lRoad = l[SM_BX_TURN] + l[SM_BUS_CX_TURN] + l[SM_TAXI_CX_TURN] + l[SM_WYC_CX_TURN];
+            n += smSetVal(sh, r, 6, freight);
+            n += smSetVal(sh, r, 9, smYoy(freight, lFreight));
+            n += smSetVal(sh, r, 11, pax);
+            n += smSetVal(sh, r, 14, smYoy(pax, lPax));
+            n += smSetVal(sh, r, 16, road);
+            n += smSetVal(sh, r, 19, smYoy(road, lRoad));
+            n += smSetVal(sh, r, 22, lFreight);
+            n += smSetVal(sh, r, 23, lPax);
+            n += smSetVal(sh, r, 24, lRoad);
+        }
+        return n;
+    }
+
+
+    private File resolveSummaryLayoutRef() {
+        String rel = summaryTemplateDir;
+        while (rel != null && rel.startsWith("./")) rel = rel.substring(2);
+        String[] roots = {
+            summaryTemplateDir,
+            System.getProperty("user.dir") + "/" + rel,
+            System.getProperty("user.dir") + "/../" + rel
+        };
+        for (String root : roots) {
+            if (root == null || root.trim().isEmpty()) continue;
+            File f = new File(root, "鐢熸垚_閬撹矾杩愯緭閲忔眹鎬昏〃.xlsx");
+            if (f.isFile()) return f;
+        }
+        return null;
     }
 
     /** 姹囨�昏〃姣嶇増瀹氫綅锛氫粎绮剧‘鍖归厤 {year}骞磠month}鏈堚�︼紙P0-P1 楠ㄦ灦鏈熶笉鍏佽璺ㄦ湀/璺ㄥ勾闈欓粯鍥為��锛�
@@ -3551,6 +4472,7 @@
                     Cell tc = (bc != null) ? bc : tr.getCell(dc.getColumnIndex());
                     if (tc == null) tc = tr.createCell(dc.getColumnIndex());
                     tc.setBlank();
+                    applyDonorNumberFormat(wb, tc, dc);
                     if (t == CellType.FORMULA) {
                         String f = dc.getCellFormula();
                         if (f != null) tc.setCellFormula(f);
@@ -3568,6 +4490,24 @@
         return restored;
     }
 
+    /** 杩樺師鍥炲~鏃跺悓姝� donor锛堝凡鍋氱増寮忕粺涓�锛夌殑鏁板瓧鏍煎紡锛屼繚璇佸悓姣�/鏁板��/鎺掑悕鏍兼樉绀烘牸寮忎笌姣嶇増涓�鑷� */
+    private void applyDonorNumberFormat(XSSFWorkbook wb, Cell dst, Cell src) {
+        if (wb == null || dst == null || src == null) return;
+        try {
+            String fmt = src.getCellStyle().getDataFormatString();
+            if (fmt == null || fmt.isEmpty() || "General".equalsIgnoreCase(fmt)) return;
+            org.apache.poi.ss.usermodel.DataFormat df = wb.createDataFormat();
+            short idx = df.getFormat(fmt);
+            CellStyle cur = dst.getCellStyle();
+            if (cur != null && idx == cur.getDataFormat()) return;
+            CellStyle ns = wb.createCellStyle();
+            if (cur != null) ns.cloneStyleFrom(cur);
+            ns.setDataFormat(idx);
+            dst.setCellStyle(ns);
+        } catch (Exception ignore) {
+            // 涓埆鏍煎紡寮傚父涓嶉樆濉炶繕鍘�
+        }
+    }
     /** 鍗曞厓鏍煎唴瀹规枃鏈寲锛堝叕寮忓甫 = 鍓嶇紑锛夛紝鐢ㄤ簬璺ㄧ翱姣斿 */
     private String summaryCellText(Cell c) {
         if (c == null) return null;
@@ -4781,59 +5721,26 @@
     }
 
     /** 姹囨�昏〃瀵煎嚭鍚庢寜鍐呭鑷姩鍔犲鍒楀锛堝彧鍔犲涓嶇缉绐勶紱璺宠繃鍚堝苟鍗曞厓鏍兼爣棰橈紝闃查暱鏍囬鎶婂崟鍒楁拺鐖嗭級 */
-    private void autoFitContentColumns(org.apache.poi.ss.usermodel.Workbook wb) {
+    /** 姹囨�诲ぇ琛ㄨ緭鍑哄墠娓呯悊姣嶇増娈嬬暀涓嬫潵鐨勭瓫閫変笌琛岄殣钘忥細绛涢�夌澶�/闅愯棌琛屼細璁╂暣椤电湅璧锋潵鈥滅己鏁版嵁鈥� */
+    private void cleanSummarySheetPresentation(org.apache.poi.ss.usermodel.Workbook wb) {
         if (wb == null) return;
-        org.apache.poi.ss.usermodel.DataFormatter dfmt = new org.apache.poi.ss.usermodel.DataFormatter();
         for (int s = 0; s < wb.getNumberOfSheets(); s++) {
             org.apache.poi.ss.usermodel.Sheet sh = wb.getSheetAt(s);
             if (sh == null) continue;
-            java.util.Set<String> merged = new java.util.HashSet<>();
-            for (org.apache.poi.ss.util.CellRangeAddress ra : sh.getMergedRegions()) {
-                for (int r = ra.getFirstRow(); r <= ra.getLastRow(); r++) {
-                    for (int c = ra.getFirstColumn(); c <= ra.getLastColumn(); c++) {
-                        merged.add(r + ":" + c);
-                    }
+            if (sh instanceof org.apache.poi.xssf.usermodel.XSSFSheet) {
+                org.apache.poi.xssf.usermodel.XSSFSheet xs = (org.apache.poi.xssf.usermodel.XSSFSheet) sh;
+                if (xs.getCTWorksheet().isSetAutoFilter()) xs.getCTWorksheet().unsetAutoFilter();
+                for (org.apache.poi.ss.usermodel.Row row : xs) {
+                    if (row == null) continue;
+                    org.apache.poi.xssf.usermodel.XSSFRow xr = (org.apache.poi.xssf.usermodel.XSSFRow) row;
+                    if (xr.getCTRow().isSetHidden()) xr.getCTRow().unsetHidden();
                 }
-            }
-            int maxCol = -1;
-            for (org.apache.poi.ss.usermodel.Row row : sh) {
-                if (row == null) continue;
-                maxCol = Math.max(maxCol, (int) row.getLastCellNum() - 1);
-            }
-            if (maxCol < 0) continue;
-            int[] need = new int[maxCol + 1];
-            for (org.apache.poi.ss.usermodel.Row row : sh) {
-                if (row == null) continue;
-                for (org.apache.poi.ss.usermodel.Cell cell : row) {
-                    int c = cell.getColumnIndex();
-                    if (c > maxCol || merged.contains(row.getRowNum() + ":" + c)) continue;
-                    String txt;
-                    try {
-                        txt = dfmt.formatCellValue(cell);
-                    } catch (Exception ignore) {
-                        continue;
-                    }
-                    if (txt == null || txt.isEmpty()) continue;
-                    int units = 0;
-                    for (int i = 0; i < txt.length(); i++) {
-                        units += isWideChar(txt.charAt(i)) ? 2 : 1;
-                    }
-                    if (units > need[c]) need[c] = Math.min(units, 34); // 闀挎枃鏈笉鎶婂崟鍒楁拺鐖�
-                }
-            }
-            for (int c = 0; c <= maxCol; c++) {
-                if (need[c] <= 0) continue;
-                int target = Math.min(need[c] + 2, 46) * 256;
-                if (target > sh.getColumnWidth(c)) sh.setColumnWidth(c, target);
+            } else {
+                sh.setAutoFilter(null);
             }
         }
     }
 
-    /** CJK / 鍏ㄨ瀛楃鎸変袱鍊嶅搴﹁锛堣繎浼� Excel 鏄剧ず鍒楀锛� */
-    private boolean isWideChar(char ch) {
-        return (ch >= 0x2E80 && ch <= 0x9FFF) || (ch >= 0xF900 && ch <= 0xFAFF)
-            || (ch >= 0xFF00 && ch <= 0xFFEF);
-    }
 
     private byte[] toBytes(XSSFWorkbook wb) throws Exception {
         applyTwoDecimalFormat(wb);

--
Gitblit v1.9.1