gx

@@ -58,7 +58,7 @@ class Count extends Command
             $arr['compliance_day'] = $this->compliance_day($yesterday);
             $arr['compliance_day'] = $this->compliance_day($yesterday);
             //剩余服务时常
             //剩余服务时常
             if($v['service_duration'] != 0){
             if($v['service_duration'] != 0){
-                $arr['service_day'] = (int)$v['service_duration'] - (int)$arr['compliance_day'];
+                $arr['service_day'] = (int)$v['service_duration'];
                 $arr['service_day'] = $arr['service_day'] > 0 ? $arr['service_day'] : 0;
                 $arr['service_day'] = $arr['service_day'] > 0 ? $arr['service_day'] : 0;
             }else{
             }else{
                 $arr['service_day'] = 0;
                 $arr['service_day'] = 0;

@@ -75,30 +75,13 @@ 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'] - $this->compliance_day(date('Y-m-d',time())),
+                'service_day'=>$item['deploy_build']['service_duration'],
             ];
             ];
         }
         }
         return $list;
         return $list;
     }
     }
 
 
     /**
     /**
-     * @param $yesterday
-     * @name   :(服务达标天数)compliance_day
-     * @author :lyh
-     * @method :post
-     * @time   :2023/6/14 15:48
-     */
-    public function compliance_day($yesterday){
-        //服务达标天数
-        $rank_info = DB::table('gl_rank_data')->where(['updated_date'=>$yesterday,'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