gx

@@ -95,7 +95,7 @@ class RenewProjectController extends BaseController
      * @time   :2023/8/18 14:33
      * @time   :2023/8/18 14:33
      */
      */
     public function notHaveRenewItems(Project $project){
     public function notHaveRenewItems(Project $project){
-        $lists = $project->with('payment')->with('deploy_build')
+        $lists = $project->where($this->map)->with('payment')->with('deploy_build')
             ->with('deploy_optimize')->with('online_check')
             ->with('deploy_optimize')->with('online_check')
             ->with('project_after')->paginate($this->row, ['*'], 'page', $this->page);
             ->with('project_after')->paginate($this->row, ['*'], 'page', $this->page);
         if(!empty($lists)){
         if(!empty($lists)){

@@ -78,13 +78,30 @@ class ProjectLogic extends BaseLogic
                 'task_pending_num' => Task::getNumByProjectId($item['id'], [Task::STATUS_DONGING, Task::STATUS_WAIT]),
                 'task_pending_num' => Task::getNumByProjectId($item['id'], [Task::STATUS_DONGING, Task::STATUS_WAIT]),
                 'optimist_status'=>$item['online_check']['optimist_status'] ?? 0,
                 'optimist_status'=>$item['online_check']['optimist_status'] ?? 0,
                 'qa_status'=>$item['online_check']['qa_status'] ?? 0,
                 'qa_status'=>$item['online_check']['qa_status'] ?? 0,
-                'service_day'=>$item['deploy_build']['service_duration'],
+                'service_day'=>$item['deploy_build']['service_duration'] - $this->compliance_day(),
             ];
             ];
         }
         }
         return $list;
         return $list;
     }
     }
 
 
     /**
     /**
+     * @param $yesterday
+     * @name   :(服务达标天数)compliance_day
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/14 15:48
+     */
+    public function compliance_day($project_id){
+        //服务达标天数
+        $rank_info = DB::table('gl_rank_data')->where(['project_id'=>$project_id,'lang'=>''])->select(['compliance_day'])->first();
+        if(empty($rank_info)){
+            $compliance_day = 0;
+        }else{
+            $compliance_day = $rank_info->compliance_day;
+        }
+        return $compliance_day;
+    }
+    /**
      * @remark :自动登录加密
      * @remark :自动登录加密
      * @name   :getAutoLoginCode
      * @name   :getAutoLoginCode
      * @author :lyh
      * @author :lyh