revert(energy): 取消 GF_HECRI_BILL 过滤,全部数据展示
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful

按用户要求恢复全量统计:移除 4 处 GF 过滤子句和相关常量。
现在 GF_HECRI_BILL 历史订单会与 JQ 新订单一同计入。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
kkfluous
2026-04-29 20:28:52 +08:00
parent 8b4fb6563f
commit d3fa2fd4d6

View File

@@ -22,10 +22,6 @@ function customerClause(field: string, customer: CustomerKind): string {
type Range = 'today' | 'thisWeek' | 'thisMonth' | 'thisQuarter' | 'last7' | 'last30';
// 全局过滤 GF_HECRI_BILL 前缀的加氢订单(旧系统遗留单据,已被 JQ 新单号体系替代)
const GF_EXCLUDE_CLAUSE = `b.bill_code NOT LIKE 'GF\\_HECRI\\_BILL%' ESCAPE '\\\\'`;
const GF_EXCLUDE_CLAUSE_NO_ALIAS = `bill_code NOT LIKE 'GF\\_HECRI\\_BILL%' ESCAPE '\\\\'`;
function rangeClause(localExpr: string, range: Range): string {
switch (range) {
case 'today': return `DATE(${localExpr}) = CURDATE()`;
@@ -68,7 +64,7 @@ app.get('/hydrogen/overview', async (c) => {
SUM(CASE WHEN truck_id IS NOT NULL
THEN cost_expense ELSE 0 END) AS lingniuBornFee
FROM tab_energy_hydrogen_bill
WHERE is_deleted = 0 AND hydrogen_time >= ? AND ${GF_EXCLUDE_CLAUSE_NO_ALIAS}`,
WHERE is_deleted = 0 AND hydrogen_time >= ?`,
[HYDROGEN_MIN_DATE],
);
const k = kpiRows[0] ?? {};
@@ -103,7 +99,6 @@ app.get('/hydrogen/overview', async (c) => {
WHERE b.is_deleted = 0
AND b.hydrogen_time >= ?
AND YEAR(DATE_ADD(b.hydrogen_time, INTERVAL 8 HOUR)) = YEAR(CURDATE())
AND ${GF_EXCLUDE_CLAUSE}
GROUP BY b.hydrogen_station_id
ORDER BY kg DESC
LIMIT 5`,
@@ -129,7 +124,6 @@ app.get('/hydrogen/overview', async (c) => {
WHERE b.is_deleted = 0
AND b.hydrogen_time >= ?
AND YEAR(DATE_ADD(b.hydrogen_time, INTERVAL 8 HOUR)) = YEAR(CURDATE())
AND ${GF_EXCLUDE_CLAUSE}
) r
GROUP BY region
ORDER BY kg DESC`,
@@ -167,7 +161,6 @@ app.get('/hydrogen/daily', async (c) => {
`b.hydrogen_time >= '${HYDROGEN_MIN_DATE}'`,
rangeClause(`b.hydrogen_time + INTERVAL 8 HOUR`, range),
customerClause('b.truck_id', customer),
GF_EXCLUDE_CLAUSE,
].join(' AND ');
// 站点级聚合(每日 × 每站)。前端组装成 day → stations