放开临时测试、支持队长工单

app/workerapi/lists/MasterWorkerLists.php

@@ -35,11 +35,11 @@ class MasterWorkerLists extends BaseWorkerDataLists implements ListsSearchInterf
                 $where[] = ['team_id','=',-1];
             }else{
                 $where[] = ['team_id','=',$team['id']];
-                $where[] = ['team_role','=',2];
+                //$where[] = ['team_role','=',2];
             }
         }
         if(isset($this->params['work_id']) && !empty($this->params['work_id'])){
-            $where[] = ['team_role','=',2];
+            //$where[] = ['team_role','=',2];
             $where[] = ['work_status','=',0];
             $where[] = ['audit_state','=',1];
             $where[] = ['accept_order_status','=',1];

app/workerapi/lists/TeamServiceWorkLists.php

@@ -19,7 +19,7 @@ class TeamServiceWorkLists extends BaseWorkerDataLists implements ListsExtendInt
     public function queryWhere(){
         $where = [
             'approval'=>1,
-            'master_worker_id'=>['in',implode(',',MasterWorker::where('team_id', $this->userInfo['team_id'])->where('team_role', 2)->column('id')?:[-1])]
+            'master_worker_id'=>['in',implode(',',MasterWorker::where('team_id', $this->userInfo['team_id'])->column('id')?:[-1])]
         ];
 
         // 待领单、待联系、待上门、已上门、服务中、待结算、已完结、已评价、已取消

app/workerapi/logic/MasterWorkerTeamLogic.php

@@ -90,7 +90,8 @@ class MasterWorkerTeamLogic extends  BaseLogic
             if(isset($params['category_ids']) && !empty($params['category_ids']) && is_array($params['category_ids'])){
                 $params['category_ids'] = implode(',',$params['category_ids']);
             }
-            MasterWorker::where('team_id',$team->id)->where('team_role',2)->where('id',$masterWorkerId)->update(['real_name'=>$params['real_name'],'account'=>$params['mobile'],'mobile'=>$params['mobile'],'category_ids'=>$params['category_ids']??'']);
+            // 包括队长自己 ->where('team_role',2)
+            MasterWorker::where('team_id',$team->id)->where('id',$masterWorkerId)->update(['real_name'=>$params['real_name'],'account'=>$params['mobile'],'mobile'=>$params['mobile'],'category_ids'=>$params['category_ids']??'']);
             return true;
         } catch (\Exception $e) {
             self::setError($e->getMessage());
@@ -199,19 +200,13 @@ class MasterWorkerTeamLogic extends  BaseLogic
             $start_time = strtotime($month.'-01');
             $end_time = $start_time + 31 * 86400;
         }
-        // 临时测试数据UI 测试数据，正式上线去掉这段代码
-        $lists = ServiceWork::field('DATE(FROM_UNIXTIME(create_time)) as days, COUNT(id) as count_num')
-            ->where('create_time','between',[$start_time,$end_time])
-            ->group('DATE(FROM_UNIXTIME(create_time))')
-            ->order('create_time desc')
-            ->select()->toArray();
-        /*$lists = ServiceWork::whereIn('master_worker_id',
+        $lists = ServiceWork::whereIn('master_worker_id',
             MasterWorker::where('team_id', $userInfo['team_id'])->where('team_role', 2)->column('id')
         )->group('DATE(FROM_UNIXTIME(create_time))')
             ->field('DATE(FROM_UNIXTIME(create_time)) as days, COUNT(id) as count_num')
             ->where('create_time','between',[$start_time,$end_time])
             ->order('create_time desc')
-            ->select()->toArray();*/
+            ->select()->toArray();
         return array_column($lists,'count_num','days');
     }
 }