fix: restore post-v1.1.14 features while preserving asset updates

Undo the full-tree rollback in 6ea1b3d and restore the pre-rollback v1.2.0 code. Preserve the new asset flow rules, abnormal inventory separation, range drilldowns and date picker; adapt the regression test to the restored routes layout.

src/server/routes/mileage/targets.ts

@@ -1,5 +1,15 @@
+import {
+  loadAssessmentFirstYearStats,
+  loadAssessmentPeriodStats,
+  loadAssessmentTargetRows,
+  loadAssessmentVehicleStats,
+  loadAssessmentYearlyPeriodStats,
+  loadAssessmentYearlyStats,
+  loadTargetVehicleRows,
+  loadYearlyAssessments,
+} from './repository.js';
 import { Hono } from 'hono';
-import pool from '../../db.js';
+import pool from '../../db/mysql.js';
 import { getCache } from './cache.js';
 import { fetchOneOsDailyMileage } from './oneos-api.js';
 import { fetchVehicleInfoByPlates } from './vehicle-info.js';
@@ -9,73 +19,19 @@ const app = new Hono();
 
 app.get('/', async (c) => {
   try {
-    const [targets] = await pool.execute(
-      'SELECT * FROM lingniu_prod.tab_mileage_assessment_target WHERE is_deleted = 0 ORDER BY id'
-    ) as [any[], unknown];
+    const targets = await loadAssessmentTargetRows(pool);
 
-    const [vehicleStats] = await pool.execute(`
-      SELECT
-        target_id, COUNT(*) as total,
-        SUM(today_mileage) as today_total,
-        SUM(current_mileage) as cumulative_total,
-        AVG(current_year_completion_rate) as avg_completion,
-        SUM(CASE WHEN is_qualified = 1 THEN 1 ELSE 0 END) as qualified_count,
-        SUM(CASE WHEN current_year_is_qualified = 1 THEN 1 ELSE 0 END) as year_qualified_count,
-        SUM(CASE WHEN current_year_completion_rate >= 0.5 THEN 1 ELSE 0 END) as half_qualified_count,
-        SUM(current_year_mileage_task) as current_year_target,
-        SUM(current_year_mileage) as current_year_completed,
-        MAX(current_year_assessment_end_date) as year_end_date
-      FROM lingniu_prod.tab_mileage_assessment_vehicle WHERE is_deleted = 0
-      GROUP BY target_id
-    `) as [any[], unknown];
+    const vehicleStats = await loadAssessmentVehicleStats(pool);
 
     const statsMap = new Map<number, any>();
     for (const s of vehicleStats) statsMap.set(s.target_id, s);
 
-    const [firstYearRows] = await pool.execute(`
-      SELECT
-        v.target_id,
-        COUNT(*) as first_year_total,
-        SUM(t.annual_mileage_per_vehicle) as first_year_target,
-        SUM(LEAST(v.current_mileage, t.annual_mileage_per_vehicle)) as first_year_completed,
-        SUM(GREATEST(t.annual_mileage_per_vehicle - v.current_mileage, 0)) as first_year_remaining,
-        SUM(LEAST(v.current_mileage, t.annual_mileage_per_vehicle)) / NULLIF(SUM(t.annual_mileage_per_vehicle), 0) as first_year_completion_rate,
-        SUM(CASE WHEN v.current_mileage >= t.annual_mileage_per_vehicle THEN 1 ELSE 0 END) as first_year_qualified_count,
-        SUM(CASE WHEN v.current_mileage >= t.annual_mileage_per_vehicle * 0.5 THEN 1 ELSE 0 END) as first_year_half_qualified_count,
-        DATE_FORMAT(MIN(v.assessment_start_date), '%Y-%m-%d') as first_year_start_date,
-        DATE_FORMAT(MAX(DATE_SUB(DATE_ADD(v.assessment_start_date, INTERVAL 1 YEAR), INTERVAL 1 DAY)), '%Y-%m-%d') as first_year_end_date
-      FROM lingniu_prod.tab_mileage_assessment_vehicle v
-      JOIN lingniu_prod.tab_mileage_assessment_target t ON t.id = v.target_id AND t.is_deleted = 0
-      WHERE v.is_deleted = 0
-      GROUP BY v.target_id
-    `) as [any[], unknown];
+    const firstYearRows = await loadAssessmentFirstYearStats(pool);
 
     const firstYearMap = new Map<number, any>();
     for (const s of firstYearRows) firstYearMap.set(s.target_id, s);
 
-    const [yearlyRows] = await pool.execute(`
-      SELECT
-        v.target_id,
-        y.year_number,
-        COUNT(*) as vehicle_count,
-        SUM(t.annual_mileage_per_vehicle * y.year_number) as target_mileage,
-        SUM(LEAST(v.current_mileage, t.annual_mileage_per_vehicle * y.year_number)) as completed_mileage,
-        SUM(GREATEST(t.annual_mileage_per_vehicle * y.year_number - v.current_mileage, 0)) as remaining_mileage,
-        SUM(LEAST(v.current_mileage, t.annual_mileage_per_vehicle * y.year_number))
-          / NULLIF(SUM(t.annual_mileage_per_vehicle * y.year_number), 0) as completion_rate,
-        SUM(CASE WHEN v.current_mileage >= t.annual_mileage_per_vehicle * y.year_number THEN 1 ELSE 0 END) as qualified_count,
-        SUM(CASE WHEN v.current_mileage >= t.annual_mileage_per_vehicle * y.year_number * 0.5 THEN 1 ELSE 0 END) as half_qualified_count,
-        DATE_FORMAT(MIN(DATE_ADD(v.assessment_start_date, INTERVAL y.year_number - 1 YEAR)), '%Y-%m-%d') as start_date,
-        DATE_FORMAT(MAX(DATE_SUB(DATE_ADD(v.assessment_start_date, INTERVAL y.year_number YEAR), INTERVAL 1 DAY)), '%Y-%m-%d') as end_date
-      FROM lingniu_prod.tab_mileage_assessment_vehicle v
-      JOIN lingniu_prod.tab_mileage_assessment_target t ON t.id = v.target_id AND t.is_deleted = 0
-      JOIN (
-        SELECT 1 as year_number UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5
-      ) y ON y.year_number <= LEAST(t.assessment_years, v.current_year_number)
-      WHERE v.is_deleted = 0
-      GROUP BY v.target_id, y.year_number
-      ORDER BY v.target_id, y.year_number
-    `) as [any[], unknown];
+    const yearlyRows = await loadAssessmentYearlyStats(pool);
 
     const yearlyMap = new Map<number, any[]>();
     for (const row of yearlyRows) {
@@ -84,22 +40,7 @@ app.get('/', async (c) => {
       yearlyMap.set(row.target_id, list);
     }
 
-    const [yearlyPeriodRows] = await pool.execute(`
-      SELECT
-        v.target_id,
-        y.year_number,
-        DATE_FORMAT(DATE_ADD(v.assessment_start_date, INTERVAL y.year_number - 1 YEAR), '%Y-%m-%d') as start_date,
-        DATE_FORMAT(DATE_SUB(DATE_ADD(v.assessment_start_date, INTERVAL y.year_number YEAR), INTERVAL 1 DAY), '%Y-%m-%d') as end_date,
-        COUNT(*) as cnt
-      FROM lingniu_prod.tab_mileage_assessment_vehicle v
-      JOIN lingniu_prod.tab_mileage_assessment_target t ON t.id = v.target_id AND t.is_deleted = 0
-      JOIN (
-        SELECT 1 as year_number UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5
-      ) y ON y.year_number <= LEAST(t.assessment_years, v.current_year_number)
-      WHERE v.is_deleted = 0
-      GROUP BY v.target_id, y.year_number, v.assessment_start_date
-      ORDER BY v.target_id, y.year_number, v.assessment_start_date
-    `) as [any[], unknown];
+    const yearlyPeriodRows = await loadAssessmentYearlyPeriodStats(pool);
 
     const yearlyPeriodsMap = new Map<string, string[]>();
     for (const row of yearlyPeriodRows) {
@@ -109,15 +50,7 @@ app.get('/', async (c) => {
       yearlyPeriodsMap.set(key, list);
     }
 
-    const [periodRows] = await pool.execute(`
-      SELECT target_id,
-             DATE_FORMAT(assessment_start_date, '%Y-%m-%d') as start_date,
-             DATE_FORMAT(assessment_end_date, '%Y-%m-%d') as end_date,
-             COUNT(*) as cnt
-      FROM lingniu_prod.tab_mileage_assessment_vehicle WHERE is_deleted = 0
-      GROUP BY target_id, assessment_start_date, assessment_end_date
-      ORDER BY target_id, assessment_start_date
-    `) as [any[], unknown];
+    const periodRows = await loadAssessmentPeriodStats(pool);
 
     const periodsMap = new Map<number, string[]>();
     for (const p of periodRows) {
@@ -134,9 +67,7 @@ app.get('/', async (c) => {
       }
     }
 
-    const [targetVehicleRows] = await pool.execute(
-      'SELECT target_id, plate_number FROM lingniu_prod.tab_mileage_assessment_vehicle WHERE is_deleted = 0'
-    ) as [{ target_id: number; plate_number: string }[], unknown];
+    const targetVehicleRows = await loadTargetVehicleRows(pool);
 
     const targetIdPlatesMap = new Map<number, string[]>();
     for (const r of targetVehicleRows) {
@@ -241,15 +172,7 @@ app.get('/:id/vehicles', async (c) => {
   const date = c.req.query('date') || '';
 
   try {
-    const [rows] = await pool.execute(
-      `SELECT plate_number, today_mileage, vehicle_total_mileage,
-              completion_rate, is_qualified, current_year_is_qualified,
-              daily_required_mileage
-       FROM lingniu_prod.tab_mileage_assessment_vehicle
-       WHERE target_id = ? AND is_deleted = 0
-       ORDER BY today_mileage DESC`,
-      [targetId]
-    ) as [any[], unknown];
+    const rows = await loadYearlyAssessments(pool, { targetId });
 
     const plates: string[] = rows.map((r: any) => r.plate_number);
     const infoMap = await fetchVehicleInfoByPlates(plates);