报表调整

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/report/YangtzePassengerSummaryMapper.xml

@@ -78,9 +78,9 @@
         LEFT JOIN (
         SELECT
         o.voyage_id,
-        CASE WHEN o.order_status = 1 or o.order_status = 14 THEN SUM(COALESCE(tot.adult_total_num, 0) + COALESCE(tot.child_total_num, 0)
+        SUM(COALESCE(tot.adult_total_num, 0) + COALESCE(tot.child_total_num, 0)
         + COALESCE(tot.baby_total_num, 0) + COALESCE(tot.with_total_num, 0)
-        + COALESCE(tot.leader_total_num, 0)) ELSE 0 END AS estimatedPassengers1
+        + COALESCE(tot.leader_total_num, 0))  AS estimatedPassengers1
         FROM trade_order o
         LEFT JOIN trade_order_total tot ON o.id = tot.old_order_id AND tot.deleted = 0
         WHERE o.deleted = 0 AND o.order_status IN (15, 14, 13, 10, 12, 9, 8, 7, 6, 5, 4, 3, 1, 0)