时间限制作品

app/Http/Controllers/Admin/StatisticsController.php

@@ -643,6 +643,9 @@ class StatisticsController extends Controller
         $team_id = (int)$request->input('team_id');
         $admin_id = (int)$request->input('admin_id');
         $is_self_team = (int)$request->input('is_self_team');
+
+        //规定只统计前天及以前的数据
+        $end_time = date('Y-m-d');
         
         $self_role = session('role_name');
         if($self_role == '销售'){
@@ -662,11 +665,12 @@ class StatisticsController extends Controller
             $sale_ids = DB::table('admin')->where('team_id', $team_id)->lists('id');
         }
 
-        $count = CustDetail::select(DB::raw('count(distinct dtime) as total'))->where(function($query) use($sale_ids, $stime, $etime, $admin_id){
+        $count = CustDetail::select(DB::raw('count(distinct dtime) as total'))->where(function($query) use($sale_ids, $stime, $etime, $admin_id, $end_time){
             if($admin_id) $query->where('admin_id', '=', $admin_id);
             if(isset($sale_ids)) $query->whereIn('admin_id', $sale_ids);
             if($stime) $query->where('dtime', '>=', $stime);
             if($etime) $query->where('dtime', '<=', $etime);
+            if($end_time) $query->where('dtime', '<', $end_time);
         })->where('is_del',0)->first();
         $count = $count->total;
         if ($count > 1) {
@@ -677,11 +681,12 @@ class StatisticsController extends Controller
             $pages = 1;
         }
 
-        $result = CustDetail::select(DB::raw('sum(fan_add) as wx_fan_add, sum(new_reply) as total_new_reply, sum(old_consult) as total_old_consult, sum(new_consult) as total_new_consult, dtime'))->where(function($query) use($sale_ids, $stime, $etime, $admin_id){
+        $result = CustDetail::select(DB::raw('sum(fan_add) as wx_fan_add, sum(new_reply) as total_new_reply, sum(old_consult) as total_old_consult, sum(new_consult) as total_new_consult, dtime'))->where(function($query) use($sale_ids, $stime, $etime, $admin_id, $end_time){
             if($admin_id) $query->where('admin_id', '=', $admin_id);
             if(isset($sale_ids)) $query->whereIn('admin_id', $sale_ids);
             if($stime) $query->where('dtime', '>=', $stime);
             if($etime) $query->where('dtime', '<=', $etime);
+            if($end_time) $query->where('dtime', '<', $end_time);
         })->where('is_del',0)->groupBy('dtime')->orderBy('dtime', 'desc')->offset($offset)->limit($pageSize)->get();
         $result = json_decode(json_encode($result),true);
         foreach($result as $k=>&$v){
@@ -754,6 +759,9 @@ class StatisticsController extends Controller
         $team_id = (int)$request->input('team_id');
         $admin_id = (int)$request->input('admin_id');
         $is_self_team = (int)$request->input('is_self_team');
+
+        //规定只统计前天及以前的数据
+        $end_time = date('Y-m-d');
         
         $self_role = session('role_name');
         if($self_role == '销售'){
@@ -773,11 +781,12 @@ class StatisticsController extends Controller
             $sale_ids = DB::table('admin')->where('team_id', $team_id)->lists('id');
         }
 
-        $result = CustDetail::select(DB::raw('sum(fan_add) as wx_fan_add, sum(new_reply) as total_new_reply, sum(old_consult) as total_old_consult, sum(new_consult) as total_new_consult, dtime'))->where(function($query) use($sale_ids, $stime, $etime, $admin_id){
+        $result = CustDetail::select(DB::raw('sum(fan_add) as wx_fan_add, sum(new_reply) as total_new_reply, sum(old_consult) as total_old_consult, sum(new_consult) as total_new_consult, dtime'))->where(function($query) use($sale_ids, $stime, $etime, $admin_id, $end_time){
             if($admin_id) $query->where('admin_id', '=', $admin_id);
             if(isset($sale_ids)) $query->whereIn('admin_id', $sale_ids);
             if($stime) $query->where('dtime', '>=', $stime);
             if($etime) $query->where('dtime', '<=', $etime);
+            if($end_time) $query->where('dtime', '<', $end_time);
         })->where('is_del',0)->groupBy('dtime')->orderBy('dtime', 'desc')->get();
         $result = json_decode(json_encode($result),true);