From 91d7eee872986f3aaa6e04edf843dd3a0526ba8f Mon Sep 17 00:00:00 2001
From: zhizhijie <zhizhijie@users.noreply.gitee.com>
Date: 星期二, 01 九月 2026 17:31:33 +0800
Subject: [PATCH] fix: 投资系统基准导入兼容查询结果表头（行号/单位/时期/计划总投资）
---
traffic-audit-server/src/main/java/com/trafficaudit/dataimport/controller/DataViewController.java | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 177 insertions(+), 0 deletions(-)
diff --git a/traffic-audit-server/src/main/java/com/trafficaudit/dataimport/controller/DataViewController.java b/traffic-audit-server/src/main/java/com/trafficaudit/dataimport/controller/DataViewController.java
index c01014e..6755650 100644
--- a/traffic-audit-server/src/main/java/com/trafficaudit/dataimport/controller/DataViewController.java
+++ b/traffic-audit-server/src/main/java/com/trafficaudit/dataimport/controller/DataViewController.java
@@ -6,11 +6,21 @@
import com.trafficaudit.common.Result;
import com.trafficaudit.dataimport.entity.FreightTurnoverImport;
import com.trafficaudit.dataimport.entity.H2032EnterpriseMonthly;
+import com.trafficaudit.dataimport.entity.PassengerAuthVehicle;
+import com.trafficaudit.dataimport.entity.CityBusMonthly;
+import com.trafficaudit.dataimport.entity.CityTaxiAuth;
+import com.trafficaudit.dataimport.entity.CityTaxiMonthly;
+import com.trafficaudit.dataimport.entity.PassengerEnterpriseMonthly;
import com.trafficaudit.dataimport.entity.ScaleSplitTransport;
import com.trafficaudit.dataimport.entity.TransportAuthVehicle;
import com.trafficaudit.dataimport.entity.VehicleTrackMileage;
import com.trafficaudit.dataimport.mapper.FreightTurnoverImportMapper;
import com.trafficaudit.dataimport.mapper.H2032EnterpriseMonthlyMapper;
+import com.trafficaudit.dataimport.mapper.PassengerAuthVehicleMapper;
+import com.trafficaudit.dataimport.mapper.CityBusMonthlyMapper;
+import com.trafficaudit.dataimport.mapper.CityTaxiAuthMapper;
+import com.trafficaudit.dataimport.mapper.CityTaxiMonthlyMapper;
+import com.trafficaudit.dataimport.mapper.PassengerEnterpriseMonthlyMapper;
import com.trafficaudit.dataimport.mapper.ScaleSplitTransportMapper;
import com.trafficaudit.dataimport.mapper.TransportAuthVehicleMapper;
import com.trafficaudit.dataimport.mapper.VehicleTrackMileageMapper;
@@ -44,6 +54,16 @@
private ScaleSplitTransportMapper scaleSplitMapper;
@Resource
private FreightTurnoverImportMapper freightTurnoverMapper;
+ @Resource
+ private PassengerEnterpriseMonthlyMapper passengerMapper;
+ @Resource
+ private PassengerAuthVehicleMapper passengerAuthMapper;
+ @Resource
+ private CityBusMonthlyMapper cityBusMapper;
+ @Resource
+ private CityTaxiMonthlyMapper cityTaxiMapper;
+ @Resource
+ private CityTaxiAuthMapper cityTaxiAuthMapper;
@GetMapping("/list")
public Result<Map<String, Object>> list(@RequestParam("type") String type,
@@ -113,6 +133,61 @@
fillPage(result, r);
break;
}
+ case "h2031": {
+ LambdaQueryWrapper<PassengerEnterpriseMonthly> w = new LambdaQueryWrapper<PassengerEnterpriseMonthly>()
+ .eq(notEmpty(period), PassengerEnterpriseMonthly::getReportPeriod, period)
+ .like(!kw.isEmpty(), PassengerEnterpriseMonthly::getEnterpriseName, kw)
+ .orderByDesc(PassengerEnterpriseMonthly::getId);
+ Page<PassengerEnterpriseMonthly> p = new Page<>(safePage, safeSize);
+ Page<PassengerEnterpriseMonthly> r = passengerMapper.selectPage(p, w);
+ result.put("records", toMaps(r.getRecords(), propsOf(H2031_COLUMNS)));
+ fillPage(result, r);
+ break;
+ }
+ case "cityBus": {
+ LambdaQueryWrapper<CityBusMonthly> w = new LambdaQueryWrapper<CityBusMonthly>()
+ .eq(notEmpty(period), CityBusMonthly::getReportPeriod, period)
+ .like(!kw.isEmpty(), CityBusMonthly::getEnterpriseName, kw)
+ .orderByDesc(CityBusMonthly::getId);
+ Page<CityBusMonthly> p = new Page<>(safePage, safeSize);
+ Page<CityBusMonthly> r = cityBusMapper.selectPage(p, w);
+ result.put("records", toMaps(r.getRecords(), propsOf(BUS_COLUMNS)));
+ fillPage(result, r);
+ break;
+ }
+ case "cityTaxi": {
+ LambdaQueryWrapper<CityTaxiMonthly> w = new LambdaQueryWrapper<CityTaxiMonthly>()
+ .eq(notEmpty(period), CityTaxiMonthly::getReportPeriod, period)
+ .like(!kw.isEmpty(), CityTaxiMonthly::getCity, kw)
+ .orderByAsc(CityTaxiMonthly::getId);
+ Page<CityTaxiMonthly> p = new Page<>(safePage, safeSize);
+ Page<CityTaxiMonthly> r = cityTaxiMapper.selectPage(p, w);
+ result.put("records", toMaps(r.getRecords(), propsOf(TAXI_COLUMNS)));
+ fillPage(result, r);
+ break;
+ }
+ case "cityTaxiAuth": {
+ LambdaQueryWrapper<CityTaxiAuth> w = new LambdaQueryWrapper<CityTaxiAuth>()
+ .eq(notEmpty(period), CityTaxiAuth::getReportPeriod, period)
+ .like(!kw.isEmpty(), CityTaxiAuth::getCity, kw)
+ .orderByDesc(CityTaxiAuth::getId);
+ Page<CityTaxiAuth> p = new Page<>(safePage, safeSize);
+ Page<CityTaxiAuth> r = cityTaxiAuthMapper.selectPage(p, w);
+ result.put("records", toMaps(r.getRecords(), propsOf(TAXI_AUTH_COLUMNS)));
+ fillPage(result, r);
+ break;
+ }
+ case "passengerAuth": {
+ LambdaQueryWrapper<PassengerAuthVehicle> w = new LambdaQueryWrapper<PassengerAuthVehicle>()
+ .eq(notEmpty(period), PassengerAuthVehicle::getReportPeriod, period)
+ .like(!kw.isEmpty(), PassengerAuthVehicle::getEnterpriseName, kw)
+ .orderByDesc(PassengerAuthVehicle::getId);
+ Page<PassengerAuthVehicle> p = new Page<>(safePage, safeSize);
+ Page<PassengerAuthVehicle> r = passengerAuthMapper.selectPage(p, w);
+ result.put("records", toMaps(r.getRecords(), propsOf(PAUTH_COLUMNS)));
+ fillPage(result, r);
+ break;
+ }
case "freightTurnover": {
LambdaQueryWrapper<FreightTurnoverImport> w = new LambdaQueryWrapper<FreightTurnoverImport>()
.eq(notEmpty(period), FreightTurnoverImport::getReportPeriod, period)
@@ -171,6 +246,11 @@
case "trackMileage": return TRACK_COLUMNS;
case "scaleSplit": return SPLIT_COLUMNS;
case "freightTurnover": return FREIGHT_COLUMNS;
+ case "h2031": return H2031_COLUMNS;
+ case "cityBus": return BUS_COLUMNS;
+ case "cityTaxi": return TAXI_COLUMNS;
+ case "cityTaxiAuth": return TAXI_AUTH_COLUMNS;
+ case "passengerAuth": return PAUTH_COLUMNS;
default: return new ArrayList<>();
}
}
@@ -181,6 +261,7 @@
m.put("label", label);
m.put("width", width);
return m;
+
}
private static final List<Map<String, Object>> H2032_COLUMNS = new ArrayList<>();
@@ -188,6 +269,11 @@
private static final List<Map<String, Object>> TRACK_COLUMNS = new ArrayList<>();
private static final List<Map<String, Object>> SPLIT_COLUMNS = new ArrayList<>();
private static final List<Map<String, Object>> FREIGHT_COLUMNS = new ArrayList<>();
+ private static final List<Map<String, Object>> H2031_COLUMNS = new ArrayList<>();
+ private static final List<Map<String, Object>> PAUTH_COLUMNS = new ArrayList<>();
+ private static final List<Map<String, Object>> BUS_COLUMNS = new ArrayList<>();
+ private static final List<Map<String, Object>> TAXI_COLUMNS = new ArrayList<>();
+ private static final List<Map<String, Object>> TAXI_AUTH_COLUMNS = new ArrayList<>();
static {
H2032_COLUMNS.add(col("reportPeriod", "鎶ヨ〃鏈�", 100));
@@ -268,5 +354,96 @@
for (int m = 1; m <= 12; m++) {
FREIGHT_COLUMNS.add(col(String.format("lastTurnoverM%02d", m), "鍘诲勾鍛ㄨ浆閲�" + m + "鏈�", 140));
}
+
+ H2031_COLUMNS.add(col("reportPeriod", "鎶ヨ〃鏈�", 100));
+ H2031_COLUMNS.add(col("regionCode", "鎵�灞炲湴鍖�", 100));
+ H2031_COLUMNS.add(col("enterpriseCode", "浼佷笟浠ｇ爜", 130));
+ H2031_COLUMNS.add(col("enterpriseName", "浼佷笟鍚嶇О", 220));
+ H2031_COLUMNS.add(col("vehicleTotal", "瀹㈣繍杞﹁締鍚堣", 110));
+ H2031_COLUMNS.add(col("seatTotal", "鏍稿畾杞藉浣嶅悎璁�", 130));
+ H2031_COLUMNS.add(col("vehicleSchedule", "鐝嚎杞﹁締鏁�", 110));
+ H2031_COLUMNS.add(col("seatSchedule", "鐝嚎杞藉浣�", 110));
+ H2031_COLUMNS.add(col("vehicleCharter", "鍖呰溅杞﹁締鏁�", 110));
+ H2031_COLUMNS.add(col("seatCharter", "鍖呰溅杞藉浣�", 110));
+ H2031_COLUMNS.add(col("passengerTotal", "瀹㈣繍閲忓悎璁�", 110));
+ H2031_COLUMNS.add(col("turnoverTotal", "鍛ㄨ浆閲忓悎璁�", 110));
+ H2031_COLUMNS.add(col("passengerClass1", "瀹㈣繍閲忎竴绫�", 110));
+ H2031_COLUMNS.add(col("passengerClass2", "瀹㈣繍閲忎簩绫�", 110));
+ H2031_COLUMNS.add(col("passengerClass3", "瀹㈣繍閲忎笁绫�", 110));
+ H2031_COLUMNS.add(col("passengerClass4", "瀹㈣繍閲忓洓绫�", 110));
+ H2031_COLUMNS.add(col("passengerCharter", "瀹㈣繍閲忓寘杞�", 110));
+ H2031_COLUMNS.add(col("turnoverClass1", "鍛ㄨ浆閲忎竴绫�", 110));
+ H2031_COLUMNS.add(col("turnoverClass2", "鍛ㄨ浆閲忎簩绫�", 110));
+ H2031_COLUMNS.add(col("turnoverClass3", "鍛ㄨ浆閲忎笁绫�", 110));
+ H2031_COLUMNS.add(col("turnoverClass4", "鍛ㄨ浆閲忓洓绫�", 110));
+ H2031_COLUMNS.add(col("turnoverCharter", "鍛ㄨ浆閲忓寘杞�", 110));
+ H2031_COLUMNS.add(col("avgDistanceTotal", "骞冲潎杩愯窛鍚堣", 120));
+ H2031_COLUMNS.add(col("avgDistanceClass1", "涓�绫诲钩鍧囪繍璺�", 120));
+ H2031_COLUMNS.add(col("avgDistanceClass2", "浜岀被骞冲潎杩愯窛", 120));
+ H2031_COLUMNS.add(col("avgDistanceClass3", "涓夌被骞冲潎杩愯窛", 120));
+ H2031_COLUMNS.add(col("avgDistanceClass4", "鍥涚被骞冲潎杩愯窛", 120));
+ H2031_COLUMNS.add(col("avgDistanceCharter", "鍖呰溅骞冲潎杩愯窛", 120));
+ BUS_COLUMNS.add(col("reportPeriod", "鎶ヨ〃鏈�", 100));
+ BUS_COLUMNS.add(col("regionCode", "鎵�灞炲湴鍖�", 100));
+ BUS_COLUMNS.add(col("city", "甯傚窞", 110));
+ BUS_COLUMNS.add(col("enterpriseName", "浼佷笟鍚嶇О", 220));
+ BUS_COLUMNS.add(col("opVehicles", "杩愯惀杞︽暟", 100));
+ BUS_COLUMNS.add(col("stopTotal", "绔欑偣鎬讳釜鏁�", 110));
+ BUS_COLUMNS.add(col("stopCity", "鍩庡競鍐呯珯鐐�", 110));
+ BUS_COLUMNS.add(col("passengerVolume", "瀹㈣繍閲�", 100));
+ BUS_COLUMNS.add(col("passengerCity", "鍩庡競鍐呭杩愰噺", 120));
+ BUS_COLUMNS.add(col("turnover", "鏃呭鍛ㄨ浆閲�", 110));
+ BUS_COLUMNS.add(col("turnoverCity", "鍩庡競鍐呭懆杞噺", 120));
+ BUS_COLUMNS.add(col("avgDistance", "骞冲潎杩愯窛", 100));
+ BUS_COLUMNS.add(col("avgDistanceCity", "鍩庡競鍐呭钩鍧囪繍璺�", 130));
+ BUS_COLUMNS.add(col("passengerChengxiang", "鍩庨檯鍩庝埂瀹㈣繍閲�", 130));
+ BUS_COLUMNS.add(col("turnoverChengxiang", "鍩庨檯鍩庝埂鍛ㄨ浆閲�", 130));
+ BUS_COLUMNS.add(col("avgDistanceChengxiang", "鍩庨檯鍩庝埂骞冲潎杩愯窛", 140));
+ BUS_COLUMNS.add(col("ratePassengerMom", "瀹㈣繍閲忕幆姣�", 100));
+ BUS_COLUMNS.add(col("ratePassengerCityMom", "鍩庡競鍐呯幆姣�", 100));
+ BUS_COLUMNS.add(col("rateChengxiangMom", "鍩庨檯鍩庝埂鐜瘮", 110));
+ BUS_COLUMNS.add(col("ratePassengerYoy", "瀹㈣繍閲忓悓姣�", 100));
+ BUS_COLUMNS.add(col("passengerCityRatio", "鍩庡競鍐呭崰姣�", 100));
+ BUS_COLUMNS.add(col("chengxiangRatio", "鍩庨檯鍩庝埂鍗犳瘮", 110));
+ BUS_COLUMNS.add(col("contactPerson", "濉〃浜�", 100));
+ BUS_COLUMNS.add(col("reportDate", "鎶ュ嚭鏃ユ湡", 110));
+ BUS_COLUMNS.add(col("verifyExplanation", "鏍稿疄瑙ｉ噴", 220));
+ TAXI_COLUMNS.add(col("reportPeriod", "鎶ヨ〃鏈�", 100));
+ TAXI_COLUMNS.add(col("regionCode", "鎵�灞炲湴鍖�", 100));
+ TAXI_COLUMNS.add(col("city", "甯傚窞", 110));
+ TAXI_COLUMNS.add(col("tripTotal", "杞藉杞︽鎬绘暟", 120));
+ TAXI_COLUMNS.add(col("tripCity", "杞藉杞︽_鍩庡競鍐�", 130));
+ TAXI_COLUMNS.add(col("passengerVolume", "瀹㈣繍閲�", 100));
+ TAXI_COLUMNS.add(col("passengerCity", "鍩庡競鍐呭杩愰噺", 120));
+ TAXI_COLUMNS.add(col("turnover", "鏃呭鍛ㄨ浆閲�", 110));
+ TAXI_COLUMNS.add(col("turnoverCity", "鍩庡競鍐呭懆杞噺", 120));
+ TAXI_COLUMNS.add(col("opVehicles", "杩愯惀杞﹁締鏁�", 110));
+ TAXI_COLUMNS.add(col("avgDistance", "骞冲潎杩愯窛", 100));
+ TAXI_COLUMNS.add(col("avgDistanceCity", "鍩庡競鍐呭钩鍧囪繍璺�", 130));
+ TAXI_COLUMNS.add(col("passengersPerTrip", "鍗曡溅娆¤浇瀹汉鏁�", 130));
+ TAXI_COLUMNS.add(col("rateTripMom", "杞藉杞︽鐜瘮", 110));
+ TAXI_COLUMNS.add(col("rateTripYoy", "杞藉杞︽鍚屾瘮", 110));
+ TAXI_COLUMNS.add(col("ratePassengerMom", "瀹㈣繍閲忕幆姣�", 100));
+ TAXI_COLUMNS.add(col("ratePassengerYoy", "瀹㈣繍閲忓悓姣�", 100));
+ TAXI_COLUMNS.add(col("passengerCityRatio", "鍩庡競鍐呭杩愰噺鍗犳瘮", 140));
+ TAXI_COLUMNS.add(col("avgDistanceChengxiang", "鍩庨檯鍩庝埂骞冲潎杩愯窛", 140));
+ TAXI_COLUMNS.add(col("verifyExplanation", "鏍稿疄瑙ｉ噴", 220));
+ TAXI_AUTH_COLUMNS.add(col("reportPeriod", "鎶ヨ〃鏈�", 100));
+ TAXI_AUTH_COLUMNS.add(col("city", "甯傚窞", 110));
+ TAXI_AUTH_COLUMNS.add(col("plateNo", "杞︾墝鍙风爜", 120));
+ TAXI_AUTH_COLUMNS.add(col("vehicleType", "杞﹁締绫诲瀷", 110));
+ TAXI_AUTH_COLUMNS.add(col("fuelType", "鐕冩枡绫诲瀷", 100));
+ TAXI_AUTH_COLUMNS.add(col("opStatus", "钀ヨ繍鐘舵��", 100));
+ TAXI_AUTH_COLUMNS.add(col("certStatus", "璇佷欢鐘舵��", 100));
+ TAXI_AUTH_COLUMNS.add(col("licenseNo", "缁忚惀鏉冨彿", 130));
+ TAXI_AUTH_COLUMNS.add(col("archiveNo", "妗ｆ鍙�", 130));
+ TAXI_AUTH_COLUMNS.add(col("roadCertNo", "閬撹矾杩愯緭璇佸瓧鍙�", 150));
+ TAXI_AUTH_COLUMNS.add(col("operatorName", "涓氭埛鍚嶇О", 240));
+ TAXI_AUTH_COLUMNS.add(col("operatorAddr", "涓氭埛鍦板潃", 280));
+ PAUTH_COLUMNS.add(col("reportPeriod", "鎶ヨ〃鏈�", 100));
+ PAUTH_COLUMNS.add(col("enterpriseCode", "浼佷笟浠ｇ爜", 130));
+ PAUTH_COLUMNS.add(col("enterpriseName", "浼佷笟鍚嶇О", 240));
+ PAUTH_COLUMNS.add(col("vehicleCount", "杞﹁締鏁�", 100));
+ PAUTH_COLUMNS.add(col("seatCount", "杞藉浣嶆暟", 100));
}
}
\ No newline at end of file
--
Gitblit v1.9.1