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

工单



查看合并请求 !2676

@@ -14,6 +14,7 @@ use App\Models\Manage\ManageHr;
 use App\Models\Ticket\TicketDailyCount;
 use App\Models\Ticket\TicketDailyDeptCount;
 use App\Models\Ticket\TicketDailyManageCount;
+use App\Models\Ticket\TicketMonthManageCount;
 use App\Models\Ticket\TicketWeekManageCount;
 use App\Models\WorkOrder\TicketLog;
 use App\Models\WorkOrder\TicketProject;
@@ -57,7 +58,14 @@ class TicketCount extends Command
             $this->manage_action();
         }
         if($action == 'manage_week_action'){
-            $this->manage_week_action();
+            $startOfLastWeek = Carbon::now()->subWeek()->startOfWeek(); // 上周一 00:00:00
+            $endOfLastWeek   = Carbon::now()->subWeek()->endOfWeek();   // 上周日 23:59:59
+            $this->manage_week_month_action($startOfLastWeek,$endOfLastWeek,(new TicketWeekManageCount()));
+        }
+        if($action == 'manage_month_action'){
+            $startOfLastMonth = Carbon::now()->subMonth()->startOfMonth(); // 上个月 1号 00:00:00
+            $endOfLastMonth   = Carbon::now()->subMonth()->endOfMonth();   // 上个月最后一天 23:59:59
+            $this->manage_week_month_action($startOfLastMonth,$endOfLastMonth,(new TicketMonthManageCount()));
         }
         if($action == 'dept_action'){
             $this->dept_action();
@@ -142,29 +150,26 @@ class TicketCount extends Command
     }
 
     /**
-     * @remark :按周统计数据
+     * @remark :按周/月统计数据
      * @name   :manage_week_action
      * @author :lyh
      * @method :post
      * @time   :2025/8/30 9:36
      */
-    public function manage_week_action(){
+    public function manage_week_month_action($startOfLast,$endOfLast,$model = (new TicketWeekManageCount)){
         $manageHrModel = new ManageHr();
         $manageList = $manageHrModel->list(['status'=>1,'dept_id'=>['in',[1,2]]],'id',['id','dept_id','manage_id','name','nickname']);
-        $ticketManageCountModel = new TicketWeekManageCount();
-        $startOfLastWeek = Carbon::now()->subWeek()->startOfWeek(); // 上周一 00:00:00
-        $endOfLastWeek   = Carbon::now()->subWeek()->endOfWeek();   // 上周日 23:59:59
         $ticketLogModel = new TicketLog();
         foreach ($manageList as $item){
             $this->output('按人员统计：执行的人员名称/id：'.$item['name'].'/'.$item['manage_id']);
             //上一周新增工单总数
-            $add_num = $ticketLogModel->counts(['created_at'=>['between',[$startOfLastWeek,$endOfLastWeek]],'engineer_id'=>$item['manage_id'],'is_engineer'=>1,'status'=>['!=',9]]);
+            $add_num = $ticketLogModel->counts(['created_at'=>['between',[$startOfLast,$endOfLast]],'engineer_id'=>$item['manage_id'],'is_engineer'=>1,'status'=>['!=',9]]);
             //上一周完成工单(创建+完成都在当周，算一条有效数据)
-            $complete_num = $ticketLogModel->counts(['created_at'=>['between',[$startOfLastWeek,$endOfLastWeek]],'engineer_id'=>$item['manage_id'],'status'=>['!=',9],'is_engineer'=>1,'end_at'=>['between',[$startOfLastWeek,$endOfLastWeek]]]);
+            $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',[$startOfLastWeek,$endOfLastWeek]]])->min('end_time');
+            $fastest_time = $ticketLogModel->formatQuery(['engineer_id'=>$item['manage_id'],'status'=>['!=',9],'is_engineer'=>1,'end_at'=>['between',[$startOfLast,$endOfLast]]])->min('end_time');
             //上一周完成工单总时长
-            $timeCount = $ticketLogModel->formatQuery(['created_at'=>['between',[$startOfLastWeek,$endOfLastWeek]],'end_at'=>['between',[$startOfLastWeek,$endOfLastWeek]],'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)){
                 $average_time = round($timeCount / $complete_num, 3);
             }
@@ -177,17 +182,17 @@ class TicketCount extends Command
                 'complete_num'=>$complete_num,//完成工单数量
                 'dept_id'=>$item['dept_id'],
                 'timeout_ratio'=>$timeout_ratio ?? null,
-                'start_at'=>$startOfLastWeek,
-                'end_at'=>$endOfLastWeek
+                'start_at'=>$startOfLast,
+                'end_at'=>$endOfLast
             ];
             //查询当前用户是否当日已有记录
-            $ticketManageInfo = $ticketManageCountModel->read(['start_at'=>$startOfLastWeek,'end_at'=>$endOfLastWeek,'manage_id'=>$item['id']],['id']);
+            $ticketManageInfo = $model->read(['start_at'=>$startOfLast,'end_at'=>$endOfLast,'manage_id'=>$item['id']],['id']);
             if($ticketManageInfo === false){
                 //TODO::执行新增
-                $ticketManageCountModel->addReturnId($data);
+                $model->addReturnId($data);
             }else{
                 //TODO::执行编辑
-                $ticketManageCountModel->edit($data,['id'=>$ticketManageInfo['id']]);
+                $model->edit($data,['id'=>$ticketManageInfo['id']]);
             }
         }
         return true;

+<?php
+/**
+ * @remark :
+ * @name   :TicketDailyManageCount.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/8/7 17:52
+ */
+
+namespace App\Models\Ticket;
+
+use App\Models\Base;
+
+/**
+ * @remark :工单日统计：按照人员统计(月)
+ * @name   :TicketDailyManageCount
+ * @author :lyh
+ * @method :post
+ * @time   :2025/8/7 17:53
+ */
+class TicketMonthManageCount extends Base
+{
+    protected $table = 'gl_ticket_month_manage_count';
+}