gx

@@ -73,7 +73,7 @@ class Count extends Command
                     //服务达标天数
                     //服务达标天数
                     $arr['compliance_day'] = $this->compliance_day($v['id']);
                     $arr['compliance_day'] = $this->compliance_day($v['id']);
                     //剩余服务时常
                     //剩余服务时常
-                    $arr['service_day'] = ((int)$v['service_duration'] - (int)$arr['compliance_day']) > 0 ? ((int)$v['service_duration'] - (int)$arr['compliance_day']) : 0;
+                    $arr['service_day'] = $v['remain_day'];
                     //项目id
                     //项目id
                     $arr['project_id'] = $v['project_id'];
                     $arr['project_id'] = $v['project_id'];
                     $arr['created_at'] = date('Y-m-d H:i:s');
                     $arr['created_at'] = date('Y-m-d H:i:s');
@@ -173,6 +173,7 @@ class Count extends Command
             'gl_project.id AS id',
             'gl_project.id AS id',
             'gl_project.type AS type',
             'gl_project.type AS type',
             'gl_project.extend_type AS extend_type',
             'gl_project.extend_type AS extend_type',
+            'gl_project.remain_day AS remain_day',
             'gl_project_deploy_build.test_domain AS test_domain',
             'gl_project_deploy_build.test_domain AS test_domain',
             'gl_project_deploy_optimize.domain AS domain',
             'gl_project_deploy_optimize.domain AS domain',
             'gl_project_deploy_build.project_id AS project_id',
             'gl_project_deploy_build.project_id AS project_id',