up - top3 是完单数量统计

app/adminapi/logic/master_worker/EngineerSettlementPermanentlyLogic.php

@@ -193,7 +193,7 @@ class EngineerSettlementPermanentlyLogic extends BaseLogic
             foreach ($masterWorkers as $masterWorker) {
                 $last_settlement_time = self::getLastSettlementTime($masterWorker['id']);
                 $settlement_time = strtotime(date("Y-m-d",time())) + 86399;
-                $settlementPermanently = EngineerSettlementPermanently::create([
+                $data = [
                     'master_worker_id' => $masterWorker['id'],
                     'last_settlement_time' => date('Y-m-d',$last_settlement_time),
                     'settlement_time' => date('Y-m-d',$settlement_time),
@@ -201,7 +201,25 @@ class EngineerSettlementPermanentlyLogic extends BaseLogic
                     'status' => 0,
                     'admin_id' => 0,
                     'remark' => ''
-                ]);
+                ];
+                $wh = ['master_worker_id' => $masterWorker['id'],'settlement_time' => date('Y-m-d',$settlement_time),
+                    'step_days' => self::$conf_step_days, 'status' => 0];
+                $info = EngineerSettlementPermanently::where($wh)->findOrEmpty();
+                if($info->isEmpty()){
+                    $settlementPermanently = EngineerSettlementPermanently::create($data);
+                }else{
+                    EngineerSettlementPermanently::where($wh)->where('id',$info->id)->update($data);
+                    $settlementPermanently['id'] =  $info->id;
+                }
+                /*$settlementPermanently = EngineerSettlementPermanently::create([
+                    'master_worker_id' => $masterWorker['id'],
+                    'last_settlement_time' => date('Y-m-d',$last_settlement_time),
+                    'settlement_time' => date('Y-m-d',$settlement_time),
+                    'step_days' => self::$conf_step_days,
+                    'status' => 0,
+                    'admin_id' => 0,
+                    'remark' => ''
+                ]);*/
                 //$settlementPermanently->id
 
                 $salary_item_data = DictData::where('type_value','salary_item')->column('name','value');

app/common/model/master_worker/SalaryItemPermanently.php

@@ -150,9 +150,9 @@ 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','=',2)->
-                field('master_worker_id,sum(work_amount) as work_amounts')->
+                field('master_worker_id,count(id) as work_counts')->
                 group('master_worker_id')->
-                order('work_amounts desc')->
+                order('work_counts desc')->
                 limit(3)->
                 select()->toArray();
             $master_worker_ids = array_column($order_list,'master_worker_id');
@@ -165,7 +165,7 @@ class SalaryItemPermanently extends BaseModel
                 'master_worker_id' => $master_worker_id,
                 'term' => 3,
                 'term_amount' => $term_amount,
-                'remark' => $params['item_name'].':  金额--'.$term_amount.'排名：--'.$ranking,
+                'remark' => $params['item_name'].':  金额--'.$term_amount.'排名：前三',
                 'extra' => json_encode([
                     'step_days'=>$params['step_days'],'item_name'=>$params['item_name'],
                     'start_time'=>$params['start_time'],'end_time'=>$params['end_time']