变更数据

@@ -87,20 +87,19 @@ class AsideTicketLogController extends BaseController
             }else {
             }else {
                 // 如果所有子任务都完成了，则将工单状态改为已完成
                 // 如果所有子任务都完成了，则将工单状态改为已完成
                     // todo 注意：建站期间的工单，所有人都完成后，不自动完成工单，需要项目经理验收修改工单状态
                     // todo 注意：建站期间的工单，所有人都完成后，不自动完成工单，需要项目经理验收修改工单状态
-                if (($ticket->title == 'GEO项目') || !($ticket->project->status == 1 && in_array($ticket->project->project_cate, [1, 2]))) {
-                    $ticket->status = Tickets::STATUS_COMPLETED;
-                    $ticket->end_at = now();
-                    $ticket->end_time = diffInHours($ticket->created_at, $ticket->end_at);
-                    $message = "工单（ID：{$ticket->id}）已全部完成，请访问查看详情！";
-                } else {
+                    if (($ticket->title == 'GEO项目') || !($ticket->project->status == 1 && in_array($ticket->project->project_cate, [1, 2])))
+                    {
+                        $ticket->status = Tickets::STATUS_COMPLETED;
+                        $ticket->end_at = now();
+                        $ticket->end_time = diffInHours($ticket->created_at,$ticket->end_at);
+                        $project = $ticket->project;
+                        if ($project->wechat_switch && !$ticket->close_wechat){
+                            $project->pushWechatGroupMsg("工单（ID：{$ticket->id}）已全部完成，请访问查看详情！");
+                        }
+                        $ticket->pushDing('finish');
+                    }else{
                     $ticket->status = Tickets::STATUS_YANSHOU;
                     $ticket->status = Tickets::STATUS_YANSHOU;
-                    $message = "工单（ID：{$ticket->id}）已全部完成，请访问查看详情！请审核";
                 }
                 }
-                $project = $ticket->project;
-                if ($project->wechat_switch && !$ticket->close_wechat) {
-                    $project->pushWechatGroupMsg($message);
-                }
-                $ticket->pushDing('finish');
             }
             }
             $ticket->save();
             $ticket->save();
             return $log;
             return $log;