From 797f03be4fe1bd1f83072f5ca25909f4d2bd4b56 Mon Sep 17 00:00:00 2001
From: zhizhijie <zhizhijie@users.noreply.gitee.com>
Date: 星期一, 12 十月 2026 13:18:53 +0800
Subject: [PATCH] fix(城市客运): 公交/出租导入改按表头名定位列，兼容同事版少列模板 待验收
---
traffic-audit-server/src/main/java/com/trafficaudit/reportexport/controller/ReportExportController.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/traffic-audit-server/src/main/java/com/trafficaudit/reportexport/controller/ReportExportController.java b/traffic-audit-server/src/main/java/com/trafficaudit/reportexport/controller/ReportExportController.java
index 00dad87..292beb0 100644
--- a/traffic-audit-server/src/main/java/com/trafficaudit/reportexport/controller/ReportExportController.java
+++ b/traffic-audit-server/src/main/java/com/trafficaudit/reportexport/controller/ReportExportController.java
@@ -1,6 +1,7 @@
package com.trafficaudit.reportexport.controller;
import com.trafficaudit.common.Result;
+import com.trafficaudit.reportexport.calc.FreightReadinessCheck;
import com.trafficaudit.reportexport.service.ReportExportService;
import com.trafficaudit.reportexport.service.ReportExportTaskService;
import com.trafficaudit.system.service.OperationLogService;
@@ -26,6 +27,8 @@
@Resource
private ReportExportService reportService;
+ @Resource
+ private FreightReadinessCheck freightReadinessCheck;
@Resource
private ReportExportTaskService exportTaskService;
@Resource
@@ -89,9 +92,20 @@
}
/** 鐢熸垚_閬撹矾杩愯緭閲忔眹鎬昏〃.xlsx锛堟眹鎬诲伐浣滅翱 P0-P1 楠ㄦ灦锛氭暣鏈鍒舵瘝鐗堬紝椤电/鍏紡/2025 缂撳瓨淇濈暀锛� */
+ /** 璐ц繍鍙ｅ緞瀵煎嚭鍓嶄綋妫�锛圔4锛夛細鍙杩斿洖鍛戒腑鐨勯棶棰樻竻鍗曘�� */
+ @GetMapping("/summaryWorkbook/freightCheck")
+ public Result<java.util.List<String>> freightCheck(@RequestParam("period") String period) {
+ return Result.ok(freightReadinessCheck.check(period));
+ }
+
/** 姹囨�诲ぇ琛ㄦ寜鏈堟墿鍒楋紙Step 1锛屽彧鍋氱増寮忋�佹暟鎹暀绌猴級锛氳繑鍥炰笅涓�鏈堢増寮� xlsx銆� */
@GetMapping("/export/summaryWorkbook/expand")
- public ResponseEntity<byte[]> expandSummaryWorkbook(@RequestParam("period") String period) throws Exception {
+ public ResponseEntity<byte[]> expandSummaryWorkbook(@RequestParam("period") String period,
+ @RequestParam(value = "titlesOnly", defaultValue = "false") boolean titlesOnly) throws Exception {
+ if (titlesOnly) {
+ byte[] titled = reportService.fixSummaryTitles(period);
+ return buildResponse(titled, String.format("鏍囬淇_閬撹矾杩愯緭閲忔眹鎬昏〃_%s.xlsx", period));
+ }
byte[] data = reportService.expandSummaryWorkbook(period);
return buildResponse(data, String.format("鎵╁垪_閬撹矾杩愯緭閲忔眹鎬昏〃_%s_寰呯‘璁�.xlsx", period));
}
--
Gitblit v1.9.1