调整统计

app/adminapi/lists/master_worker/MasterWorkerServiceOrderLists.php

@@ -141,7 +141,8 @@ class MasterWorkerServiceOrderLists extends BaseAdminDataLists implements ListsS
                 Db::raw("SUM(CASE WHEN b.service_status = 3 THEN 1 ELSE 0 END) AS success_count"),
                 Db::raw("SUM(CASE WHEN b.service_status = 4 OR b.service_status = 5 THEN 1 ELSE 0 END) AS fail_count"),
                 Db::raw("SUM(CASE WHEN b.service_status = 3 THEN b.work_amount ELSE 0 END) work_amount_sum"),
-                Db::raw("SUM(CASE WHEN b.service_status = 3 THEN (b.settlement_amount+b.earnest_money+b.add_work_amount+b.spare_total) ELSE 0 END) worker_settlement_sum"),
+                //工程师结算金额：实际提成金额(含配件费+加单费)+质保金
+                Db::raw("SUM(CASE WHEN b.service_status = 3 THEN (b.settlement_amount+b.earnest_money) ELSE 0 END) worker_settlement_sum"),
             ])
             ->leftJoin('service_work b', 'a.id = b.master_worker_id'.$this->sqlJoin)
             ->where($queryWhere)
@@ -182,7 +183,7 @@ class MasterWorkerServiceOrderLists extends BaseAdminDataLists implements ListsS
                 Db::raw("SUM(CASE WHEN b.service_status = 3 THEN 1 ELSE 0 END) AS success_count"),
                 Db::raw("SUM(CASE WHEN b.service_status = 4 OR b.service_status = 5 THEN 1 ELSE 0 END) AS fail_count"),
                 Db::raw("SUM(CASE WHEN b.service_status = 3 THEN b.work_amount ELSE 0 END) work_amount_sum"),
-                Db::raw("SUM(CASE WHEN b.service_status = 3 THEN (b.settlement_amount+b.earnest_money+b.add_work_amount+b.spare_total) ELSE 0 END) worker_settlement_sum"),
+                Db::raw("SUM(CASE WHEN b.service_status = 3 THEN (b.settlement_amount+b.earnest_money) ELSE 0 END) worker_settlement_sum"),
             ])
             ->leftJoin('service_work b', 'a.id = b.master_worker_id'.$this->sqlJoin)
             ->where($queryWhere)