up - 修改所有统计工单的service_status状态

app/adminapi/listener/OperationLog.php

@@ -21,6 +21,10 @@ class OperationLog
     {
         $request = request();
 
+        if(env('APP_DEBUG', false)){
+            return;
+        }
+
         //需要登录的接口，无效访问时不记录
         if (!$request->controllerObject->isNotNeedLogin() && empty($request->adminInfo)) {
             return;

app/adminapi/lists/master_commission/MasterWorkerCommissionNoticeLists.php

@@ -62,8 +62,8 @@ class MasterWorkerCommissionNoticeLists extends BaseAdminDataLists implements Li
             ->field([
                 'n.id', 'n.commission_config_id', 'n.master_worker_id', 'n.day_num', 'n.order_num', 'n.signing_date', 'n.signing_date_end',
                 'mw.real_name', 'mw.nickname', 'mw.worker_number', 'mw.mobile',
-                Db::raw("COUNT(sw.id) AS order_count"),
-                Db::raw("MAX(sw.finished_time) max_time")
+                Db::raw("COUNT(CASE WHEN sw.service_status = 3 THEN sw.id ELSE null END) AS order_count"),
+                Db::raw("MAX(CASE WHEN sw.service_status = 3 THEN sw.finished_time ELSE null END) max_time")
             ])
             ->where($this->searchWhere)
             ->group('n.master_worker_id, n.id')

app/adminapi/lists/master_worker/MasterWorkerServiceOrderLists.php

@@ -96,8 +96,8 @@ class MasterWorkerServiceOrderLists extends BaseAdminDataLists implements ListsS
                 Db::raw("COUNT(b.id) AS all_count"),
                 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(b.work_total) work_total"),
-                Db::raw("SUM(b.worker_price) worker_price"),
+                Db::raw("SUM(CASE WHEN b.service_status = 3 THEN b.work_total ELSE 0 END) work_total"),
+                Db::raw("SUM(CASE WHEN b.service_status = 3 THEN b.worker_price ELSE 0 END) worker_price"),
             ])
             ->leftJoin('service_work b', 'a.id = b.master_worker_id'.$this->sqlJoin)
             ->where($queryWhere)

app/adminapi/lists/property/PropertyOrderAnalysis.php

@@ -76,7 +76,7 @@ class PropertyOrderAnalysis extends BaseAdminDataLists implements ListsSearchInt
             ])
             ->leftJoin('service_work b', 'a.work_id = b.id')
             ->leftJoin('property_head c', 'a.property_head_id = c.id')
-            ->where([['b.work_pay_status','=',2],['b.approval','=',1]])
+            ->where([['b.service_status','=',3],['b.approval','=',1]])
             ->where('b.finished_time','>',0)
             ->where($this->queryWhere())
             ->group('a.property_head_id,month_format')

app/adminapi/lists/sale/PropertyHeadAnalysisLists.php

@@ -74,7 +74,8 @@ class PropertyHeadAnalysisLists extends BaseAdminDataLists implements ListsSearc
                 Db::raw("COUNT(a.work_id) AS work_count,SUM(b.work_amount) AS total_sales_amount")
             ])
             ->where('a.sale_type', 'in', [1, 2])
-            ->where('a.order_status', 3)
+            //->where('a.order_status', 3)
+            ->where('b.service_status', 3)
             ->group('a.property_head_id')
             ->limit($this->limitOffset, $this->limitLength)
             ->select()->toArray();

app/adminapi/lists/sale/SaleAnalysisLists.php

@@ -75,7 +75,8 @@ class SaleAnalysisLists extends BaseAdminDataLists implements ListsSearchInterfa
             ])
             ->where($this->queryWhere())
             ->where('a.sale_type', 'in', [1, 2])
-            ->where('a.order_status', 3)
+            //->where('a.order_status', 3)
+            ->where('b.service_status', 3)
             ->group('a.sale_id')
             ->limit($this->limitOffset, $this->limitLength)
             ->select()->toArray();

app/adminapi/lists/sale/SaleGroupAnalysisLists.php

@@ -73,7 +73,8 @@ class SaleGroupAnalysisLists extends BaseAdminDataLists implements ListsSearchIn
                 Db::raw("COUNT(a.work_id) AS work_count,SUM(b.work_amount) AS total_sales_amount")
             ])
             ->where('a.sale_type', 'in', [1, 2])
-            ->where('a.order_status', 3)
+            //->where('a.order_status', 3)
+            ->where('b.service_status', 3)
             ->group('a.sale_group_id')
             ->limit($this->limitOffset, $this->limitLength)
             ->select()->toArray();

app/common/service/ExcelExportService.php

@@ -192,8 +192,8 @@ class ExcelExportService
                 Db::raw("COUNT(b.id) AS all_count"),
                 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(b.work_total) work_total"),
-                Db::raw("SUM(b.worker_price) worker_price"),
+                Db::raw("SUM(CASE WHEN b.service_status = 3 THEN b.work_total ELSE 0 END) work_total"),
+                Db::raw("SUM(CASE WHEN b.service_status = 3 THEN b.worker_price ELSE 0 END) worker_price"),
             ])
                 ->leftJoin('service_work b', 'a.id = b.master_worker_id'.$sqlJoin)
                 ->where($where)