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

工单统计



查看合并请求 !2675

@@ -168,27 +168,27 @@ class TicketCount extends Command
             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']]);
+            $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;
     }