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

Lyh server



查看合并请求 !2626

@@ -85,7 +85,7 @@ class TicketCount extends Command
             $timeCount = $ticketLogModel->formatQuery(['engineer_id'=>$item['manage_id'],'is_engineer'=>1])->sum('end_time');
             $timeCount = $ticketLogModel->formatQuery(['engineer_id'=>$item['manage_id'],'is_engineer'=>1])->sum('end_time');
             $complete_num = $ticketLogModel->counts(['engineer_id'=>$item['manage_id'],'is_engineer'=>1,'end_at'=>['!=',null]]);
             $complete_num = $ticketLogModel->counts(['engineer_id'=>$item['manage_id'],'is_engineer'=>1,'end_at'=>['!=',null]]);
             if(!empty($timeCount)){
             if(!empty($timeCount)){
-                $average_time = round($timeCount / $complete_num, 2);
+                $average_time = round($timeCount / $complete_num, 4);
             }
             }
             //最快完成的时间
             //最快完成的时间
             $fastest_time = $ticketLogModel->formatQuery(['engineer_id'=>$item['manage_id'],'is_engineer'=>1,'end_at'=>['!=',null]])->min('end_time');
             $fastest_time = $ticketLogModel->formatQuery(['engineer_id'=>$item['manage_id'],'is_engineer'=>1,'end_at'=>['!=',null]])->min('end_time');
@@ -145,12 +145,12 @@ class TicketCount extends Command
             $ticket_num = $ticketLogModel->counts(['engineer_id'=>['in',$manageIdArr],'is_engineer'=>1]);
             $ticket_num = $ticketLogModel->counts(['engineer_id'=>['in',$manageIdArr],'is_engineer'=>1]);
             $timeCount = $ticketLogModel->formatQuery(['engineer_id'=>['in',$manageIdArr],'is_engineer'=>1])->sum('end_time');
             $timeCount = $ticketLogModel->formatQuery(['engineer_id'=>['in',$manageIdArr],'is_engineer'=>1])->sum('end_time');
             if(!empty($timeCount)){
             if(!empty($timeCount)){
-                $average_time = round($timeCount / $ticket_num, 2);
+                $average_time = round($timeCount / $ticket_num, 4);
             }
             }
             //超期工单数量
             //超期工单数量
             $timeout_num = $ticketLogModel->counts(['engineer_id'=>['in',$manageIdArr],'is_engineer'=>1,'plan_end_at'=>['>',date('Y-m-d H:i:s')]]);
             $timeout_num = $ticketLogModel->counts(['engineer_id'=>['in',$manageIdArr],'is_engineer'=>1,'plan_end_at'=>['>',date('Y-m-d H:i:s')]]);
             if(!empty($timeout_num)){
             if(!empty($timeout_num)){
-                $timeout_ratio = round($timeout_num / $ticket_num, 2);
+                $timeout_ratio = round($timeout_num / $ticket_num, 4);
             }
             }
             $data = [
             $data = [
                 'date'=>$date,
                 'date'=>$date,
@@ -185,7 +185,7 @@ class TicketCount extends Command
         $time_end_num = $ticketModel->counts(['end_at'=>['!=',null]]);//已完成的工单
         $time_end_num = $ticketModel->counts(['end_at'=>['!=',null]]);//已完成的工单
         $time_end_count = $ticketModel->formatQuery(['end_at'=>['!=',null]])->sum('end_time');//已完成工单时长
         $time_end_count = $ticketModel->formatQuery(['end_at'=>['!=',null]])->sum('end_time');//已完成工单时长
         if(!empty($time_end_count)){
         if(!empty($time_end_count)){
-            $average_time = round($time_end_count / $time_end_num, 2);
+            $average_time = round($time_end_count / $time_end_num, 4);
         }
         }
         $add_num = $ticketModel->counts(['created_at'=>['between',[$date.' 00:00:00',$date.' 23:59:59']]]);
         $add_num = $ticketModel->counts(['created_at'=>['between',[$date.' 00:00:00',$date.' 23:59:59']]]);
         $untreated_num = $ticketModel->counts(['end_at'=>null]);
         $untreated_num = $ticketModel->counts(['end_at'=>null]);

@@ -88,7 +88,7 @@ class AsideTicketLogController extends BaseController
             {
             {
                 // 如果所有子任务都完成了，则将工单状态改为已完成
                 // 如果所有子任务都完成了，则将工单状态改为已完成
                 // todo 注意：建站期间的工单，所有人都完成后，不自动完成工单，需要项目经理验收修改工单状态
                 // todo 注意：建站期间的工单，所有人都完成后，不自动完成工单，需要项目经理验收修改工单状态
-                if (!($ticket->project->status == 1 && in_array($ticket->project->project_cate, [1, 2])))
+                if (($ticket->title == 'GEO项目') || !($ticket->project->status == 1 && in_array($ticket->project->project_cate, [1, 2])))
                 {
                 {
                     $ticket->status = Tickets::STATUS_COMPLETED;
                     $ticket->status = Tickets::STATUS_COMPLETED;
                     $ticket->end_at = now();
                     $ticket->end_at = now();