修改工程师综合评分

app/api/lists/property/PropertyGroupOrderLists.php

@@ -32,7 +32,7 @@ class PropertyGroupOrderLists extends BaseApiDataLists implements ListsSearchInt
         $propertyHeadId = (int)PropertyHead::where('user_id',$this->userId)->value('id');
         $where[] = ['b.property_head_id', '=', $propertyHeadId];
 
-        if (isset($this->params['status'])) {
+        if (isset($this->params['status']) && $this->params['status'] !== '') {
             if ($this->params['status'] == 0) {
                 //待完成
                 $where[] = ['a.status', '=', 1];

app/common/command/UpdateWorkerScore.php

@@ -174,7 +174,7 @@ class UpdateWorkerScore extends Command
             //总工单：统计派单日志记录
             $allOrder = ServiceWorkAllocateWorkerLog::where('master_worker_id',$workId)->whereBetweenTime('create_time', $startTime, $endTime)->count();
             //完结工单：统计工单表已完成的工单
-            $completeOrder = ServiceWork::where('master_worker_id',$workId)->where('service_status',3)->whereBetweenTime('create_time', $startTime, $endTime)->count();
+            $completeOrder = ServiceWork::where('master_worker_id',$workId)->where('service_status',3)->where('work_pay_status','in',[1,2])->whereBetweenTime('create_time', $startTime, $endTime)->count();
             //接单量：统计工程师接单的数量
             $acceptOrder = ServiceWorkReceiveLog::where('master_worker_id',$workId)->whereBetweenTime('create_time', $startTime, $endTime)->count();