修改工单统计

app/adminapi/lists/master_worker/MasterWorkerServiceOrderLists.php

@@ -90,7 +90,7 @@ class MasterWorkerServiceOrderLists extends BaseAdminDataLists implements ListsS
         }
         // ( ( b.finished_time >= 1743436800  AND b.finished_time < 1746028800 ) or ( b.create_time >= 1743436800  AND b.create_time < 1746028800) )
         if (!empty($this->params['start_time']) && !empty($this->params['end_time'])) {
-            $this->sqlJoin = ' and ( ( b.finished_time >= '.strtotime($this->params['start_time']).'  AND b.finished_time < '.(strtotime($this->params['end_time'])+86399).' ) or ( b.create_time >= '.strtotime($this->params['start_time']).'  AND b.create_time < '.(strtotime($this->params['end_time'])+86399).') )';
+            $this->sqlJoin = '  ( ( b.finished_time >= '.strtotime($this->params['start_time']).'  AND b.finished_time < '.(strtotime($this->params['end_time'])+86399).' ) or ( b.create_time >= '.strtotime($this->params['start_time']).'  AND b.create_time < '.(strtotime($this->params['end_time'])+86399).') )';
         }
         //dd($this->sqlJoin);
         $where[] = ['a.audit_state','=' ,1];
@@ -149,9 +149,10 @@ class MasterWorkerServiceOrderLists extends BaseAdminDataLists implements ListsS
                 //工程师结算金额：实际提成金额(含配件费+加单费)+质保金
                 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)
+            ->leftJoin('service_work b', 'a.id = b.master_worker_id')
             ->where($queryWhere)
             ->where($this->queryDataWhere())
+            ->whereRaw($this->sqlJoin)
             ->group('a.id')
             //->having('success_count>0 OR fail_count>0 OR work_amount_sum>0 OR worker_settlement_sum>0')
             ->order('a.id desc')
@@ -190,9 +191,10 @@ class MasterWorkerServiceOrderLists extends BaseAdminDataLists implements ListsS
                 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) ELSE 0 END) worker_settlement_sum"),
             ])
-            ->leftJoin('service_work b', 'a.id = b.master_worker_id'.$this->sqlJoin)
+            ->leftJoin('service_work b', 'a.id = b.master_worker_id')
             ->where($queryWhere)
             ->where($this->queryDataWhere())
+            ->whereRaw($this->sqlJoin)
             ->group('a.id')
             //->having('success_count>0 OR fail_count>0 OR work_amount_sum>0 OR worker_settlement_sum>0')
             ->count();

app/common/command/RejectionStatistics.php

@@ -64,6 +64,7 @@ class RejectionStatistics extends Command
                             $num = 0;//如果有接单的情况，则重新统计
                         }
                     }
+                    $num_list[] = $num;
                     //取num_list的最大值
                     $max_num = $num_list ? max($num_list) : [];
                     if ($max_num > 0) {