合并分支 'lyh-server' 到 'master'

周统计



查看合并请求 !2674

@@ -14,6 +14,7 @@ use App\Models\Manage\ManageHr;
 use App\Models\Ticket\TicketDailyCount;
 use App\Models\Ticket\TicketDailyCount;
 use App\Models\Ticket\TicketDailyDeptCount;
 use App\Models\Ticket\TicketDailyDeptCount;
 use App\Models\Ticket\TicketDailyManageCount;
 use App\Models\Ticket\TicketDailyManageCount;
+use App\Models\Ticket\TicketWeekManageCount;
 use App\Models\WorkOrder\TicketLog;
 use App\Models\WorkOrder\TicketLog;
 use App\Models\WorkOrder\TicketProject;
 use App\Models\WorkOrder\TicketProject;
 use App\Models\WorkOrder\Tickets;
 use App\Models\WorkOrder\Tickets;
@@ -150,7 +151,7 @@ class TicketCount extends Command
     public function manage_week_action(){
     public function manage_week_action(){
         $manageHrModel = new ManageHr();
         $manageHrModel = new ManageHr();
         $manageList = $manageHrModel->list(['status'=>1,'dept_id'=>['in',[1,2]]],'id',['id','dept_id','manage_id','name','nickname']);
         $manageList = $manageHrModel->list(['status'=>1,'dept_id'=>['in',[1,2]]],'id',['id','dept_id','manage_id','name','nickname']);
-        $ticketManageCountModel = new TicketDailyManageCount();
+        $ticketManageCountModel = new TicketWeekManageCount();
         $startOfLastWeek = Carbon::now()->subWeek()->startOfWeek(); // 上周一 00:00:00
         $startOfLastWeek = Carbon::now()->subWeek()->startOfWeek(); // 上周一 00:00:00
         $endOfLastWeek   = Carbon::now()->subWeek()->endOfWeek();   // 上周日 23:59:59
         $endOfLastWeek   = Carbon::now()->subWeek()->endOfWeek();   // 上周日 23:59:59
         $ticketLogModel = new TicketLog();
         $ticketLogModel = new TicketLog();