Merge remote-tracking branch 'origin/master' into akun

@@ -179,7 +179,7 @@ class TicketCount extends Command
             //上一周完成工单(创建+完成都在当周，算一条有效数据)
             //上一周完成工单(创建+完成都在当周，算一条有效数据)
             $complete_num = $ticketLogModel->counts(['created_at'=>['between',[$startOfLast,$endOfLast]],'engineer_id'=>$item['manage_id'],'status'=>['!=',9],'is_engineer'=>1,'end_at'=>['between',[$startOfLast,$endOfLast]]]);
             $complete_num = $ticketLogModel->counts(['created_at'=>['between',[$startOfLast,$endOfLast]],'engineer_id'=>$item['manage_id'],'status'=>['!=',9],'is_engineer'=>1,'end_at'=>['between',[$startOfLast,$endOfLast]]]);
             //上一周最快完成时长
             //上一周最快完成时长
-            $fastest_time = $ticketLogModel->formatQuery(['engineer_id'=>$item['manage_id'],'status'=>['!=',9],'is_engineer'=>1,'end_at'=>['between',[$startOfLast,$endOfLast]]])->min('end_time');
+            $fastest_time = $ticketLogModel->formatQuery(['created_at'=>['between',[$startOfLast,$endOfLast]],'engineer_id'=>$item['manage_id'],'status'=>['!=',9],'is_engineer'=>1,'end_at'=>['between',[$startOfLast,$endOfLast]]])->min('end_time');
             //上一周完成工单总时长
             //上一周完成工单总时长
             $timeCount = $ticketLogModel->formatQuery(['created_at'=>['between',[$startOfLast,$endOfLast]],'end_at'=>['between',[$startOfLast,$endOfLast]],'engineer_id'=>$item['manage_id'],'is_engineer'=>1,'status'=>['!=',9]])->sum('end_time');
             $timeCount = $ticketLogModel->formatQuery(['created_at'=>['between',[$startOfLast,$endOfLast]],'end_at'=>['between',[$startOfLast,$endOfLast]],'engineer_id'=>$item['manage_id'],'is_engineer'=>1,'status'=>['!=',9]])->sum('end_time');
             if(!empty($timeCount)){
             if(!empty($timeCount)){

@@ -17,6 +17,7 @@ use App\Models\Ticket\TicketMonthDeptCount;
 use App\Models\Ticket\TicketWeekDeptCount;
 use App\Models\Ticket\TicketWeekDeptCount;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Cache;
 
 
 class TicketController extends BaseController
 class TicketController extends BaseController
 {
 {
@@ -34,9 +35,14 @@ class TicketController extends BaseController
      * @time   :2025/8/11 10:47
      * @time   :2025/8/11 10:47
      */
      */
     public function ticketCount(){
     public function ticketCount(){
-        $data['daily'] = $this->logic->getTicketCount();
-        $data['list'] = $this->logic->getDailyTicketCount();
-        $data['ticket'] = $this->logic->getTicketList();
+        $data = Cache::get('ticket_count');
+        if(empty($data)){
+            $data = [];
+            $data['daily'] = $this->logic->getTicketCount();
+            $data['list'] = $this->logic->getDailyTicketCount();
+            $data['ticket'] = $this->logic->getTicketList();
+            Cache::put('ticket_count',$data,1800);
+        }
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 

@@ -73,7 +73,7 @@ class GeoLinkLogic extends BaseLogic
                 foreach ($this->param['data'] as $item){
                 foreach ($this->param['data'] as $item){
                     $data[] = [
                     $data[] = [
                         'project_id'=>$this->param['project_id'],
                         'project_id'=>$this->param['project_id'],
-                        'da'=>$item['da'],
+                        'da'=>$item['da'] ?? '',
                         'url'=>$item['url'],
                         'url'=>$item['url'],
                         'send_time'=>$item['send_time']
                         'send_time'=>$item['send_time']
                     ];
                     ];