Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -260,7 +260,13 @@ class FetchTicketProjects extends Command
                         $seom_id = 0;
                         $seom_id = 0;
                         // 第一负责人
                         // 第一负责人
                         $engineer_id = $assm_id;
                         $engineer_id = $assm_id;
-                        $is_del = 0;
+                        if ($project_cate == 3)
+                            $is_del = !empty($item["go_online"]);
+                        else{
+                            // 域途，以服务时间为准 $item['yutu_service_start_time'] 是开始时间 + 有效天数 yutu_planday
+                            $is_del = !empty($item['yutu_service_start_time']) && !empty($item['yutu_planday'])
+                                && (strtotime($item['yutu_service_start_time']) + $item['yutu_planday'] * 86400) < time();
+                        }
 
 
                         $fields = [
                         $fields = [
                             'company_name' => $item['company'],
                             'company_name' => $item['company'],

@@ -6,6 +6,7 @@ use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\Domain\DomainInfoLogic;
 use App\Http\Logic\Aside\Domain\DomainInfoLogic;
 use App\Http\Requests\Aside\Domain\DomainInfoRequest;
 use App\Http\Requests\Aside\Domain\DomainInfoRequest;
+use App\Models\Devops\ServersIp;
 use App\Models\Domain\CountryCode;
 use App\Models\Domain\CountryCode;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
@@ -34,17 +35,24 @@ class DomainInfoController extends BaseController
         $lists = $domainModel->lists($this->map,$this->page,$this->row,$this->order);
         $lists = $domainModel->lists($this->map,$this->page,$this->row,$this->order);
         if(!empty($lists)){
         if(!empty($lists)){
             $project_model = new Project();
             $project_model = new Project();
+            $serverIpModel = new ServersIp();
             foreach ($lists['list'] as $k=>$v){
             foreach ($lists['list'] as $k=>$v){
-                $company = '';
-                $pro_info = $project_model->read(['id'=>$v['project_id']],'company');
-                if($pro_info){
-                    $company = $pro_info['company'];
+                $v['company'] = '';
+                $v['ip_domain'] = [];
+                $pro_info = $project_model->read(['id'=>$v['project_id']],['company','serve_id']);
+                if($pro_info !== false){
+                    $v['company'] = $pro_info['company'];
+                    if(!empty($pro_info['serve_id'])){
+                        $serveInfo = $serverIpModel->read(['id'=>$pro_info['serve_id']],['domain','ip']);
+                        $v['ip_domain'] = $serveInfo;
+                    }
                 }
                 }
-                $lists['list'][$k]['company'] = $company;
+                $lists['list'][$k] = $v;
             }
             }
         }
         }
-        $lists['y_status'] = $domainModel->counts(['status'=>1]);
-        $lists['n_status'] = $domainModel->counts(['status'=>0]);
+        $lists['total_count'] = $domainModel->counts();
+        $lists['y_count'] = $domainModel->counts(['status'=>1]);
+        $lists['n_count'] = $domainModel->counts(['status'=>0]);
         return $this->response('success', Code::SUCCESS, $lists);
         return $this->response('success', Code::SUCCESS, $lists);
     }
     }
 
 

@@ -162,7 +162,7 @@ class Base extends Model
      * @method :post
      * @method :post
      * @time   :2024/9/26 10:52
      * @time   :2024/9/26 10:52
      */
      */
-    public function counts($condition){
+    public function counts($condition = []){
         $condition = $this->filterRequestData($condition);
         $condition = $this->filterRequestData($condition);
         return $this->formatQuery($condition)->count();
         return $this->formatQuery($condition)->count();
     }
     }