解决合并问题

ruoyi-fleet/src/main/resources/mapper/orderPlan/ftmsorderbillscarsMapper.xml

@@ -704,8 +704,7 @@
             and create_time <= #{currentDay[1]}
     </select>
 
-
-    <select id="getButtonValue" resultType="Map">
+    <select id="getButtonValue" parameterType="ftmsorderbills" resultType="Map">
 --         SELECT
 --             order_status orderStatus,
 --             COUNT( id ) cntrQty
@@ -716,17 +715,20 @@
 --         GROUP BY
 --             order_status
         SELECT
-            COUNT(id) AS quantity,
-            COUNT( CASE WHEN order_status = '10' THEN 1 END ) AS planDate,
-            COUNT( CASE WHEN order_status = '20' THEN 1 END ) AS acceptDate,
-            COUNT( CASE WHEN order_status = '40' THEN 1 END ) AS loadDate,
-            COUNT( CASE WHEN order_status = '50' THEN 1 END ) AS mdLoadDate,
-            COUNT( CASE WHEN order_status = '60' THEN 1 END ) AS unLoadDate,
-            COUNT( CASE WHEN order_status = '80' THEN 1 END ) AS waybillDate
+            COUNT(c.id) AS quantity,
+            COUNT( CASE WHEN c.order_status = '10' THEN 1 END ) AS planDate,
+            COUNT( CASE WHEN c.order_status = '20' THEN 1 END ) AS acceptDate,
+            COUNT( CASE WHEN c.order_status = '40' THEN 1 END ) AS loadDate,
+            COUNT( CASE WHEN c.order_status = '50' THEN 1 END ) AS mdLoadDate,
+            COUNT( CASE WHEN c.order_status = '60' THEN 1 END ) AS unLoadDate,
+            COUNT( CASE WHEN c.order_status = '80' THEN 1 END ) AS waybillDate
         FROM
-            F_TMSORDERBILLSCARS
+            F_TMSORDERBILLSCARS c
+            LEFT JOIN t_corps fleet ON fleet.f_id = c.carcor_pid
         WHERE
-            bill_status = 6
+            c.bill_status = 6
+            <if test="driverTel != null">and c.driver_tel = #{driverTel}</if>
+            <if test="isFleet != null and isFleet == 1">AND fleet.f_id = #{fleetId}</if>
     </select>
 
     <select id="selectMissedOrdersCount" parameterType="string" resultType="Integer">