up - 所有工程师的结算都由新的定期结算处理，非立即结算

app/common/model/master_worker/SalaryItemPermanently.php

@@ -55,7 +55,7 @@ class SalaryItemPermanently extends BaseModel
                 // 查询时间范围内所有已经完单的工单
                 $order_list = ServiceWork::where('master_worker_id',$master_worker_id)->
                 where('finished_time','between',[$params['start_time'],$params['end_time']])->
-                where('service_status',3)->where('work_pay_status',3)->
+                where('service_status',3)->
                 field(['id','work_sn','work_amount','spare_total','master_worker_id','finished_time','service_status','work_pay_status'])->
                 select()->toArray();
                 $amount = 0.00;
@@ -71,7 +71,7 @@ class SalaryItemPermanently extends BaseModel
                     'master_worker_id' => $master_worker_id,
                     'term' => 1,
                     'term_amount' => $term_amount,
-                    'remark' => $params['item_name'].':配件总金额--'.$spare_total.': 奖励总金额--'.$term_amount.';比例：--'.$ratio,
+                    'remark' => $params['item_name'].':配件总金额--'.$spare_total.': 总金额--'.$amount.': 奖励总金额--'.$term_amount.';比例：--'.$ratio,
                     'extra' => json_encode([
                         'step_days'=>$params['step_days'],'item_name'=>$params['item_name'],
                         'start_time'=>$params['start_time'],'end_time'=>$params['end_time'],'promotion_level'=>$promotion_level,'ratio'=>$ratio,
@@ -99,7 +99,7 @@ class SalaryItemPermanently extends BaseModel
             // 查询时间范围内所有已经完单的工单
             $order_list = ServiceWork::where('master_worker_id',$master_worker_id)->
             where('finished_time','between',[$params['start_time'],$params['end_time']])->
-            where('service_status','=',3)->where('work_pay_status','=',3)->where('work_type','=',2)->
+            where('service_status','=',3)->where('work_type','=',2)->
             field(['id','work_sn','work_amount','spare_total','master_worker_id','finished_time','service_status','work_pay_status'])->
             select()->toArray();
 
@@ -141,7 +141,7 @@ class SalaryItemPermanently extends BaseModel
             // 查询时间范围内所有已经完单的工单工程师排名 - 可以为当月月度
             $order_list = ServiceWork::
                 where('finished_time','between',[$params['start_time'],$params['end_time']])->
-                where('service_status','=',3)->where('work_pay_status','=',3)->
+                where('service_status','=',3)->
                 field('master_worker_id,count(id) as work_counts')->
                 group('master_worker_id')->
                 order('work_counts desc')->
@@ -181,7 +181,7 @@ class SalaryItemPermanently extends BaseModel
             // 查询时间范围内所有已经完单的工单
             $order_count = ServiceWork::where('master_worker_id',$master_worker_id)->
             where('finished_time','between',[$params['start_time'],$params['end_time']])->
-            where('service_status','=',3)->where('work_pay_status','=',3)->count();
+            where('service_status','=',3)->count();
             $term_amount  = 0;
             if( 4.8 <= (float)$comprehensive_score && 80 <= $order_count){
                 $term_amount = 500;
@@ -309,7 +309,7 @@ class SalaryItemPermanently extends BaseModel
                 // 查询时间范围内所有已经完单的工单
                 $order_list = ServiceWork::where('master_worker_id',$master_worker_id)->
                 where('finished_time','between',[$params['start_time'],$params['end_time']])->
-                where('service_status','=',3)->where('work_pay_status','=',3)->
+                where('service_status','=',3)->
                 field(['id','work_sn','work_amount','spare_total','master_worker_id','finished_time','service_status','work_pay_status'])->
                 select()->toArray();
                 // 15%(单价<300 元时提成15%)至20%(单价>=300元时提成 20%)
@@ -379,7 +379,7 @@ class SalaryItemPermanently extends BaseModel
                 // 查询时间范围内所有已经完单的工单
                 $order_list = ServiceWork::where('master_worker_id',$master_worker_id)->
                 where('finished_time','between',[$params['start_time'],$params['end_time']])->
-                where('service_status',3)->where('work_pay_status',3)->
+                where('service_status',3)->
                 field(['id','work_sn','work_amount','spare_total','master_worker_id','finished_time','service_status','work_pay_status'])->
                 select()->toArray();
                 $amount = 0.00;