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'] = ($v['service_duration'] - Common::getDaysToTargetDate($v['cooperate_date']));
+                $arr['service_day'] = (int)$v['service_duration'] - (int)$arr['compliance_day'];
                 $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;

@@ -36,7 +36,7 @@ class RoleMenuController extends BaseController
      * @time   :2023/7/25 14:05
      * @time   :2023/7/25 14:05
      */
      */
     public function lists(MenuLogic $menuLogic){
     public function lists(MenuLogic $menuLogic){
-        $lists = $menuLogic->roleMenuList();
+        $lists = $menuLogic->roleMenuList(['type'=>0]);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 

@@ -48,4 +48,5 @@ class RenewProjectController extends BaseController
         $data = $logic->getList($map, $sort,['*'],$this->row);
         $data = $logic->getList($map, $sort,['*'],$this->row);
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }
+
 }
 }