liugc преди 1 година
родител
ревизия
2b05aa7aec
променени са 1 файла, в които са добавени 8 реда и са изтрити 2 реда
  1. 8 2
      app/workerapi/logic/MasterWorkerTeamLogic.php

+ 8 - 2
app/workerapi/logic/MasterWorkerTeamLogic.php

@@ -206,13 +206,19 @@ class MasterWorkerTeamLogic extends  BaseLogic
             $start_time = strtotime($month.'-01');
             $start_time = strtotime($month.'-01');
             $end_time = $start_time + 31 * 86400;
             $end_time = $start_time + 31 * 86400;
         }
         }
-        $lists = ServiceWork::whereIn('master_worker_id',
+        // 临时测试数据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',
             MasterWorker::where('team_id', $userInfo['team_id'])->where('team_role', 2)->column('id')
             MasterWorker::where('team_id', $userInfo['team_id'])->where('team_role', 2)->column('id')
         )->group('DATE(FROM_UNIXTIME(create_time))')
         )->group('DATE(FROM_UNIXTIME(create_time))')
             ->field('DATE(FROM_UNIXTIME(create_time)) as days, COUNT(id) as count_num')
             ->field('DATE(FROM_UNIXTIME(create_time)) as days, COUNT(id) as count_num')
             ->where('create_time','between',[$start_time,$end_time])
             ->where('create_time','between',[$start_time,$end_time])
             ->order('create_time desc')
             ->order('create_time desc')
-            ->select()->toArray();
+            ->select()->toArray();*/
         return array_column($lists,'count_num','days');
         return array_column($lists,'count_num','days');
     }
     }
 }
 }