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

Lyh server



查看合并请求 !2671

@@ -206,6 +206,9 @@ class TicketCount extends Command
      */
      */
     public function yesterday_daily_action(){
     public function yesterday_daily_action(){
         $ticketModel = new Tickets();
         $ticketModel = new Tickets();
+        $ticketModel->whereIn('ticket_id', function ($query) {
+                $query->select('id')->from('gl_tickets')->where('status', 9);
+            })->update(['status' => 9]);
         $date = Carbon::yesterday()->toDateString(); // "2025-08-07"
         $date = Carbon::yesterday()->toDateString(); // "2025-08-07"
         $ticket_num = $ticketModel->counts(['id'=>['!=',0]]);
         $ticket_num = $ticketModel->counts(['id'=>['!=',0]]);
         $time_end_num = $ticketModel->counts(['end_at'=>['!=',null]]);//已完成的工单
         $time_end_num = $ticketModel->counts(['end_at'=>['!=',null]]);//已完成的工单
@@ -220,19 +223,14 @@ class TicketCount extends Command
         $submit_b_side = $ticketModel->formatQuery(['submit_side'=>2])->sum('submit_side');
         $submit_b_side = $ticketModel->formatQuery(['submit_side'=>2])->sum('submit_side');
         $dbResult = DB::table('gl_ticket_projects as p')->leftJoin('gl_tickets as t', 'p.id', '=', 't.project_id')
         $dbResult = DB::table('gl_ticket_projects as p')->leftJoin('gl_tickets as t', 'p.id', '=', 't.project_id')
             ->select(
             ->select(
-                'p.project_cate',
-                DB::raw('COUNT(t.id) as ticket_count')
-            )
-            ->groupBy('p.project_cate')
-            ->pluck('ticket_count', 'project_cate');
+                'p.project_cate', DB::raw('COUNT(t.id) as ticket_count')
+            )->groupBy('p.project_cate')->pluck('ticket_count', 'project_cate');
         $timeout_num = $ticketModel->where('status','!=',9)
         $timeout_num = $ticketModel->where('status','!=',9)
             ->where(function ($query) {
             ->where(function ($query) {
                 $query->where(function ($q) {
                 $query->where(function ($q) {
-                    $q->whereNotNull('end_at')
-                        ->whereColumn('plan_end_at', '<', 'end_at');
+                    $q->whereNotNull('end_at')->whereColumn('plan_end_at', '<', 'end_at');
                 })->orWhere(function ($q) {
                 })->orWhere(function ($q) {
-                    $q->whereNull('end_at')
-                        ->where('plan_end_at', '<', now());
+                    $q->whereNull('end_at')->where('plan_end_at', '<', now());
                 });
                 });
             })
             })
             ->count();
             ->count();

@@ -204,7 +204,6 @@ class AsideTicketController extends BaseController
             $ticket->close_wechat = $request->input('close_wechat', false);
             $ticket->close_wechat = $request->input('close_wechat', false);
             $ticket->num = $request->input('num', 0);
             $ticket->num = $request->input('num', 0);
             $ticket->save();
             $ticket->save();
-
             // 分配工单参与人
             // 分配工单参与人
             $ticket->saveEngineers($request->input('engineer_ids', []));
             $ticket->saveEngineers($request->input('engineer_ids', []));
             $nickname = ManageHr::where('manage_id', $this->manage['id'])->value('nickname') ?? mb_substr($ticket->submit_username, 0, 1) . '**';
             $nickname = ManageHr::where('manage_id', $this->manage['id'])->value('nickname') ?? mb_substr($ticket->submit_username, 0, 1) . '**';
@@ -262,7 +261,7 @@ class AsideTicketController extends BaseController
                 $ticket->status = $request->input('status');
                 $ticket->status = $request->input('status');
             if ($request->input('num'))
             if ($request->input('num'))
                 $ticket->num = $request->input('num',0);
                 $ticket->num = $request->input('num',0);
-
+//            $ticket->logs()->where('status', '<', TicketLog::STATUS_COMPLETED)->where('is_engineer', 1)->update(['plan_end_at' => $ticket->plan_end_at]);
             if ($ticket->status == Tickets::STATUS_COMPLETED)
             if ($ticket->status == Tickets::STATUS_COMPLETED)
             {
             {
                 // 完成工单，把子任务里面未完成的工单改为完成
                 // 完成工单，把子任务里面未完成的工单改为完成

@@ -42,7 +42,7 @@ class TicketLogic extends BaseLogic
         $date = date('Y-m-d');//今日时间
         $date = date('Y-m-d');//今日时间
         $data['add_num'] = $ticketModel->counts(['created_at'=>['between',[$date.' 00:00:00',$date.' 23:59:59']]]);//今日新增工单
         $data['add_num'] = $ticketModel->counts(['created_at'=>['between',[$date.' 00:00:00',$date.' 23:59:59']]]);//今日新增工单
         $data['processed_num'] = $ticketModel->counts(['end_at'=>['between',[$date.' 00:00:00',$date.' 23:59:59']]]);//今日已处理工单
         $data['processed_num'] = $ticketModel->counts(['end_at'=>['between',[$date.' 00:00:00',$date.' 23:59:59']]]);//今日已处理工单
-        $data['untreated_num'] = $ticketModel->counts(['end_at'=>null,'plan_end_at'=>['like','%'.date('Y-m-d').'%']]);//今日未处理工单
+        $data['untreated_num'] = $ticketModel->counts(['end_at'=>null]);//未处理工单
         $submit_a_side = $ticketModel->formatQuery(['submit_side'=>1])->sum('submit_side');
         $submit_a_side = $ticketModel->formatQuery(['submit_side'=>1])->sum('submit_side');
         $submit_b_side = $ticketModel->formatQuery(['submit_side'=>2])->sum('submit_side');
         $submit_b_side = $ticketModel->formatQuery(['submit_side'=>2])->sum('submit_side');
         $data['source'] = ['a'=>$submit_a_side,'b'=>$submit_b_side];
         $data['source'] = ['a'=>$submit_a_side,'b'=>$submit_b_side];