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

gx



查看合并请求 !2560

@@ -59,11 +59,11 @@ class TicketLogic extends BaseLogic
     public function getDailyTicketCount(){
     public function getDailyTicketCount(){
         $date = Carbon::yesterday()->toDateString(); //昨日时间
         $date = Carbon::yesterday()->toDateString(); //昨日时间
         $dailyModel = new TicketDailyCount();
         $dailyModel = new TicketDailyCount();
-        $dailyList = $dailyModel->list(['date'=>$date],'average_time',['*'],'asc',5);//取最近5条数据
+        $dailyList = $dailyModel->list([],'date',['*'],'desc',5);//取最近5条数据
         $manageModel  = new TicketDailyManageCount();
         $manageModel  = new TicketDailyManageCount();
         $manageList = $manageModel->list(['date'=>$date],'average_time',['*'],'asc',5);//取最近5条数据
         $manageList = $manageModel->list(['date'=>$date],'average_time',['*'],'asc',5);//取最近5条数据
         $deptModel = new TicketDailyDeptCount();
         $deptModel = new TicketDailyDeptCount();
-        $deptList = $deptModel->list([],'date',['*'],'desc',5);
+        $deptList = $deptModel->list(['date'=>$date],'average_time',['*'],'asc',5);
         $data = ['daily'=>$dailyList,'manage'=>$manageList,'dept'=>$deptList];
         $data = ['daily'=>$dailyList,'manage'=>$manageList,'dept'=>$deptList];
         return $this->success($data);
         return $this->success($data);
     }
     }

@@ -9,6 +9,7 @@
 
 
 namespace App\Models\Ticket;
 namespace App\Models\Ticket;
 
 
+use App\Helper\Arr;
 use App\Models\Base;
 use App\Models\Base;
 
 
 /**
 /**
@@ -21,4 +22,9 @@ use App\Models\Base;
 class TicketDailyCount extends Base
 class TicketDailyCount extends Base
 {
 {
     protected $table = 'gl_ticket_daily_count';
     protected $table = 'gl_ticket_daily_count';
+
+    public function getSourceAttribute($value)
+    {
+        return Arr::s2a($value);
+    }
 }
 }