gx

@@ -31,7 +31,7 @@ class RenewProjectController extends BaseController
         $yesterday = Carbon::yesterday()->toDateString();
         $yesterday = Carbon::yesterday()->toDateString();
         $count_list = $count->list(['date'=>$yesterday,'service_day'=>['<=',15]],'id',['project_id']);
         $count_list = $count->list(['date'=>$yesterday,'service_day'=>['<=',15]],'id',['project_id']);
         $arr = [];
         $arr = [];
-        foreach ($count_list as $k => $v){
+        foreach ($count_list as $v){
             $arr[] = $v['project_id'];
             $arr[] = $v['project_id'];
         }
         }
         $sort = ['id' => 'desc'];
         $sort = ['id' => 'desc'];
@@ -57,6 +57,9 @@ class RenewProjectController extends BaseController
      * @time   :2023/8/11 17:28
      * @time   :2023/8/11 17:28
      */
      */
     public function renewLists(RenewLogic $logic){
     public function renewLists(RenewLogic $logic){
+        if(isset($this->map['company']) && !empty($this->map['company'])){
+            $this->map['company'] = ['like','%'.$this->map['company'].'%'];
+        }
         $lists = $logic->renewListsLog($this->map,$this->page,$this->row,$this->order);
         $lists = $logic->renewListsLog($this->map,$this->page,$this->row,$this->order);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }

@@ -30,6 +30,12 @@ class RenewLogic extends BaseLogic
      */
      */
     public function renewListsLog($map,$page,$row,$order,$field = ['*']){
     public function renewListsLog($map,$page,$row,$order,$field = ['*']){
         $lists = $this->model->lists($map,$page,$row,$order,$field);
         $lists = $this->model->lists($map,$page,$row,$order,$field);
+        if(!empty($lists['list'])){
+            foreach ($lists['list'] as $k => $v){
+                $v['plan'] = Project::planMap()[$v['plan']];
+                $lists['list'][$k] = $v;
+            }
+        }
         return $this->success($lists);
         return $this->success($lists);
     }
     }
 }
 }