From 2b1af100a2402e65b44a929489754949198a19df Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 06 十月 2026 00:29:34 +0800
Subject: [PATCH] fix(holiday): 国省道环比基期改为纯备用值，不进环比计算
---
traffic-audit-server/src/main/java/com/trafficaudit/holiday/service/HolidayStatService.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/traffic-audit-server/src/main/java/com/trafficaudit/holiday/service/HolidayStatService.java b/traffic-audit-server/src/main/java/com/trafficaudit/holiday/service/HolidayStatService.java
index 3015c71..a663821 100644
--- a/traffic-audit-server/src/main/java/com/trafficaudit/holiday/service/HolidayStatService.java
+++ b/traffic-audit-server/src/main/java/com/trafficaudit/holiday/service/HolidayStatService.java
@@ -102,7 +102,7 @@
BigDecimal nationalProvincial = vehicle.get(HolidayConstants.ROAD_NATIONAL_PROVINCIAL);
BigDecimal comparisonBase = comparisonBaseByDate.get(day.getHolidayDate());
BigDecimal nationalProvincialRingRatio = nationalProvincialRingRatio(
- year, nationalProvincial, previousNationalProvincial, comparisonBase);
+ nationalProvincial, previousNationalProvincial);
BigDecimal nonBusinessPersonFlow = null;
if (coefficient != null && (expressway != null || nationalProvincial != null)) {
nonBusinessPersonFlow = HolidayNumberUtils.multiply(
@@ -252,12 +252,11 @@
return total;
}
- private BigDecimal nationalProvincialRingRatio(int year, BigDecimal current,
- BigDecimal previous, BigDecimal comparisonBase) {
+ // The national/provincial ring ratio always compares the current day with the previous day of
+ // the same year. The stored comparison base (Excel column C) is kept as an operator backup
+ // value only and never feeds this calculation.
+ private BigDecimal nationalProvincialRingRatio(BigDecimal current, BigDecimal previous) {
if (current == null) return null;
- if (HolidayConstants.supportsComparisonBase(year) && comparisonBase != null) {
- return ratio(current, comparisonBase);
- }
return previous == null ? null : ratio(current, previous);
}
--
Gitblit v1.9.1