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

Lyh server



查看合并请求 !2572

@@ -76,7 +76,7 @@ class TicketCount extends Command
         $date = Carbon::yesterday()->toDateString(); // 昨日时间
         $date = Carbon::yesterday()->toDateString(); // 昨日时间
         $ticketManageCountModel = new TicketDailyManageCount();
         $ticketManageCountModel = new TicketDailyManageCount();
         foreach ($manageList as $item){
         foreach ($manageList as $item){
-            $average_time = null;
+            $average_time = '';
             $this->output('按人员统计：执行的人员名称/id：'.$item['name'].'/'.$item['manage_id']);
             $this->output('按人员统计：执行的人员名称/id：'.$item['name'].'/'.$item['manage_id']);
             $ticketLogModel = new TicketLog();
             $ticketLogModel = new TicketLog();
             $ticket_num = $ticketLogModel->counts(['engineer_id'=>$item['manage_id'],'is_engineer'=>1]);
             $ticket_num = $ticketLogModel->counts(['engineer_id'=>$item['manage_id'],'is_engineer'=>1]);
@@ -130,7 +130,7 @@ class TicketCount extends Command
         $ticketDailyDeptModel = new TicketDailyDeptCount();
         $ticketDailyDeptModel = new TicketDailyDeptCount();
         $date = Carbon::yesterday()->toDateString(); // "2025-08-07"
         $date = Carbon::yesterday()->toDateString(); // "2025-08-07"
         foreach ($groupList as $item){
         foreach ($groupList as $item){
-            $average_time = 0;
+            $average_time = '';
             $this->output('组统计：执行的组/id：'.$item['name'].'/'.$item['id']);
             $this->output('组统计：执行的组/id：'.$item['name'].'/'.$item['id']);
             $manageIdArr = $manageHrModel->selectField(['belong_group'=>$item['id'],'status'=>1,'dept_id'=>1],'manage_id');
             $manageIdArr = $manageHrModel->selectField(['belong_group'=>$item['id'],'status'=>1,'dept_id'=>1],'manage_id');
             $ticket_num = $ticketLogModel->counts(['engineer_id'=>['in',$manageIdArr],'is_engineer'=>1]);
             $ticket_num = $ticketLogModel->counts(['engineer_id'=>['in',$manageIdArr],'is_engineer'=>1]);
@@ -143,7 +143,7 @@ class TicketCount extends Command
                 'dept_id'=>$item['id'],
                 'dept_id'=>$item['id'],
                 'dept_name'=>$item['name'],
                 'dept_name'=>$item['name'],
                 'ticket_num'=>$ticket_num ?? 0,
                 'ticket_num'=>$ticket_num ?? 0,
-                'average_time'=>$average_time ?? 0
+                'average_time'=>$average_time ?? ''
             ];
             ];
             $deptInfo = $ticketDailyDeptModel->read(['date'=>$date,'dept_id'=>$item['id']],['id']);
             $deptInfo = $ticketDailyDeptModel->read(['date'=>$date,'dept_id'=>$item['id']],['id']);
             if($deptInfo === false){
             if($deptInfo === false){

@@ -61,9 +61,9 @@ class TicketLogic extends BaseLogic
         $dailyModel = new TicketDailyCount();
         $dailyModel = new TicketDailyCount();
         $dailyList = $dailyModel->list([],'date',['*'],'desc',5);//取最近5条数据
         $dailyList = $dailyModel->list([],'date',['*'],'desc',5);//取最近5条数据
         $manageModel  = new TicketDailyManageCount();
         $manageModel  = new TicketDailyManageCount();
-        $manageList = $manageModel->list(['date'=>$date,'ticket_num'=>['!=',0],'average_time'=>['!=',null]],'average_time',['*'],'asc',5);//取最近5条数据
+        $manageList = $manageModel->list(['date'=>$date,'ticket_num'=>['!=',0],'average_time'=>['!=','']],'average_time',['*'],'asc',5);//取最近5条数据
         $deptModel = new TicketDailyDeptCount();
         $deptModel = new TicketDailyDeptCount();
-        $deptList = $deptModel->list(['date'=>$date],'average_time',['*'],'asc',5);
+        $deptList = $deptModel->list(['date'=>$date,'ticket_num'=>['!=',0]],'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);
     }
     }