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

Lyh server



查看合并请求 !2673

@@ -55,6 +55,9 @@ class TicketCount extends Command
         if($action == 'manage_action'){
         if($action == 'manage_action'){
             $this->manage_action();
             $this->manage_action();
         }
         }
+        if($action == 'manage_week_action'){
+            $this->manage_week_action();
+        }
         if($action == 'dept_action'){
         if($action == 'dept_action'){
             $this->dept_action();
             $this->dept_action();
         }
         }
@@ -111,6 +114,7 @@ class TicketCount extends Command
             if(!empty($timeout_num)){
             if(!empty($timeout_num)){
                 $timeout_ratio = round($timeout_num / $ticket_num, 3);
                 $timeout_ratio = round($timeout_num / $ticket_num, 3);
             }
             }
+            $date = date('Y-m-d');
             $data = [
             $data = [
                 'date'=>$date,
                 'date'=>$date,
                 'manage_id'=>$item['id'],
                 'manage_id'=>$item['id'],
@@ -137,6 +141,58 @@ class TicketCount extends Command
     }
     }
 
 
     /**
     /**
+     * @remark :按周统计数据
+     * @name   :manage_week_action
+     * @author :lyh
+     * @method :post
+     * @time   :2025/8/30 9:36
+     */
+    public function manage_week_action(){
+        $manageHrModel = new ManageHr();
+        $manageList = $manageHrModel->list(['status'=>1,'dept_id'=>['in',[1,2]]],'id',['id','dept_id','manage_id','name','nickname']);
+        $ticketManageCountModel = new TicketDailyManageCount();
+        $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]]);
+            //上一周完成工单(创建+完成都在当周，算一条有效数据)
+            $complete_num = $ticketLogModel->counts(['created_at'=>['between',[$startOfLastWeek,$endOfLastWeek]],'engineer_id'=>$item['manage_id'],'status'=>['!=',9],'is_engineer'=>1,'end_at'=>['between',[$startOfLastWeek,$endOfLastWeek]]]);
+            //上一周最快完成时长
+            $fastest_time = $ticketLogModel->formatQuery(['engineer_id'=>$item['manage_id'],'status'=>['!=',9],'is_engineer'=>1,'end_at'=>['between',[$startOfLastWeek,$endOfLastWeek]]])->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');
+            if(!empty($timeCount)){
+                $average_time = round($timeCount / $complete_num, 3);
+            }
+        }
+        $data = [
+            'manage_id'=>$item['id'],
+            'manage_name'=>$item['name'],
+            'add_num'=>$add_num,//上一周新增工单数量
+            'average_time'=>$average_time ?? null,//平均完成工单时长
+            'fastest_time'=>$fastest_time ?? null,//最快完成工单时间
+            'complete_num'=>$complete_num,//完成工单数量
+            'dept_id'=>$item['dept_id'],
+            'timeout_ratio'=>$timeout_ratio ?? null,
+            'start_at'=>$startOfLastWeek,
+            'end_at'=>$endOfLastWeek
+        ];
+        //查询当前用户是否当日已有记录
+        $ticketManageInfo = $ticketManageCountModel->read(['start_at'=>$startOfLastWeek,'end_at'=>$endOfLastWeek,'manage_id'=>$item['id']],['id']);
+        if($ticketManageInfo === false){
+            //TODO::执行新增
+            $ticketManageCountModel->addReturnId($data);
+        }else{
+            //TODO::执行编辑
+            $ticketManageCountModel->edit($data,['id'=>$ticketManageInfo['id']]);
+        }
+        return true;
+    }
+
+    /**
      * @remark :按技术组统计数据
      * @remark :按技术组统计数据
      * @name   :dept_action
      * @name   :dept_action
      * @author :lyh
      * @author :lyh

+<?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 TicketWeekManageCount extends Base
+{
+    protected $table = 'gl_ticket_week_manage_count';
+}