gx

@@ -49,7 +49,12 @@ class Count extends Command
             //服务达标天数
             //服务达标天数
             $arr['compliance_day'] = $this->compliance_day($yesterday);
             $arr['compliance_day'] = $this->compliance_day($yesterday);
             //剩余服务时常
             //剩余服务时常
-            $arr['service_day'] = $v['service_duration'] - Common::getDaysToTargetDate($v['created_at']);
+            if($v['service_duration'] != 0){
+                $arr['service_day'] = ($v['service_duration'] - Common::getDaysToTargetDate($v['created_at']));
+                $arr['service_day'] = $arr['service_day'] > 0 ? $arr['service_day'] : 0;
+            }else{
+                $arr['service_day'] = 0;
+            }
             //项目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');

@@ -163,7 +163,7 @@ class MonthCountLogic extends BaseLogic
         $count = new Count();
         $count = new Count();
         $startTime = date("Y-m-d", strtotime("-9 months", mktime(0, 0, 0)));
         $startTime = date("Y-m-d", strtotime("-9 months", mktime(0, 0, 0)));
         $ensTime = date('Y-m-d',time());
         $ensTime = date('Y-m-d',time());
-        $lists = $count->list(['date'=>['between',[$startTime,$ensTime]]]);
+        $lists = $count->list(['date'=>['between',[$startTime,$ensTime]],'project_id'=>$this->user['project_id']]);
         return $this->success($lists);
         return $this->success($lists);
     }
     }
 }
 }