修改学校管理

app/Http/Controllers/Admin/School.php

@@ -1,7 +1,7 @@
 <?php namespace App\Http\Controllers\Admin;
 
-use App\Http\Requests\Admin\Banner as Request;
-use App\Models\Banner as Model;
+use App\Http\Requests\Admin\School as Request;
+use App\Models\School as Model;
 use App\Models\City;
 
 /**
@@ -17,142 +17,121 @@ class School extends Auth{
 		$this->assign('breadcrumb1','学校管理');
 		$this->assign('breadcrumb2','学校列表');
 	}
-	
-	/**
-	 * 首页列表
-	 * 
-	 * */
+
+    /**
+     * 列表页
+     *
+     * */
     public function index(Model $Model){
-		// 接受参数
-		$name					= request('name','');
-		// 查询条件
-		$map 					= [];
-		// 编码ID
-		if( $name )				$map[] = ['name','=',$name];
-		// 查询数据
-		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(request('limit',config('page_num',10)))->appends(request()->all());
-		// 循环处理数据
-		foreach ($list as $key => $value) {
-			// id转编号
-			$value['thumb']		= $value['thumb'] ? path_compat($value['thumb']) : '';
-			// 重组
-			$list[$key]			= $value;
-		}
-		// 分配数据
-		$this->assign('empty', '<tr><td colspan="20">~~暂无数据</td></tr>');
-		$this->assign('list', $list);
-		// 加载模板
-		return $this->fetch();
+        // 接受参数
+        $name					= request('name','');
+        $area					= request('area','');
+        $status					= request('status');
+        $startTime				= request('start_time','');
+        // 查询条件
+        $map 					= [];
+        if( $name )			    $map[] = ['name','=',$name];
+        if( $area )			    $map[] = ['area','=',$area];
+        if( $startTime )		$map[] = ['insert_time','>=',Carbon::createFromFormat('Y-m-d',$startTime)->startOfDay()->getTimestamp()];
+        if( $startTime )		$map[] = ['insert_time','<=',Carbon::createFromFormat('Y-m-d',$startTime)->endOfDay()->getTimestamp()];
+        if( !is_null($status) )	$map[] = ['status','=',$status];
+        // 查询数据
+        $list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10));
+        $areaList               = $Model->getAreaList();
+        // 分配数据
+        $this->assign('empty', '<tr><td colspan="20">~~暂无数据</td></tr>');
+        $this->assign('areaList',$areaList);
+        $this->assign('list',$list);
+        // 加载模板
+        return 					$this->fetch();
     }
 
-	/**
-	 * 添加
-	 * 
-	 * */
-	public function add( Request $request, Model $Model,City $City){
-		if( request()->isMethod('post') ){
-			// 验证参数
-			$request->scene('add')->validate();
-			// 组合数据
-			$data['name']			= request('name','');
-			$data['thumb']			= request('thumb','');
-			$data['type']			= request('type',0);
-			$data['link_url']		= request('link_url','');
-			$cityIds				= request('city_ids',[]);
-			$data['city_ids']		= implode(',',$cityIds);
-			$data['start_time']		= request('start_time','');
-			$data['end_time']		= request('end_time','');
-			$data['start_time']		= $data['start_time'] ? strtotime($data['start_time']) : 0;
-			$data['end_time']		= $data['end_time'] ? strtotime($data['end_time']) : 0;
-			// 限购提示
-			if( $data['type'] && ( !$data['start_time'] || !$data['end_time'] )) 	return json_send(['code'=>'error','msg'=>'下单显示请填写活动时间','data'=>['error'=>'下单显示请填写时间']]);
-			// 写入
-			$id						= $Model->add($data);
-			// 提示新增失败
-			if( !$id )				return json_send(['code'=>'error','msg'=>'新增失败']);
-			// 记录行为
-			$this->addAdminHistory(admin('uid'),$Model->getTable(),$id,1,[],$data);
-			// 告知结果
-			return					json_send(['code'=>'success','msg'=>'新增成功','action'=>'add']);
-		}
-		// 获取列表
-		$cityList					= $City->getCityList();
-		// 分配数据
-		$this->assign('crumbs','新增');
-		$this->assign('cityList',$cityList);
-		// 加载模板
-		return 					$this->fetch();
-	}
-	
-	/**
-	 * 编辑
-	 * 
-	 * */
-	public function edit( Request $request, Model $Model,City $City){
-		if(request()->isMethod('post')){
-			// 验证参数
-			$request->scene('edit')->validate();
-			// 组合数据
-			$id						= request('id',0);
-			$data['name']			= request('name','');
-			$data['thumb']			= request('thumb','');
-			$data['type']			= request('type',0);
-			$data['link_url']		= request('link_url','');
-			$cityIds				= request('city_ids',[]);
-			$data['city_ids']		= implode(',',$cityIds);
-			$data['start_time']		= request('start_time','');
-			$data['end_time']		= request('end_time','');
-			$data['start_time']		= $data['start_time'] ? strtotime($data['start_time']) : 0;
-			$data['end_time']		= $data['end_time'] ? strtotime($data['end_time']) : 0;
-			// 限购提示
-			if( $data['type'] && ( !$data['start_time'] || !$data['end_time'] )) 	return json_send(['code'=>'error','msg'=>'下单显示请填写活动时间','data'=>['error'=>'下单显示请填写时间']]);
-			// 如果没有选择，则意味着全部
-			$cityIds				= $cityIds ? $cityIds : [1];
-			// 写入
-			$result					= $Model->edit($id,$data);
-			// 提示新增失败
-			if( !$result )			return json_send(['code'=>'error','msg'=>'修改失败']);
-			// 记录行为
-			$this->addAdminHistory(admin('uid'),$Model->getTable(),$id,2,[],$data);
-			// 告知结果
-			return					json_send(['code'=>'success','msg'=>'修改成功','action'=>'edit']);
-		}
-		// 接收参数
-		$id							= request('id',0);
-		// 查询数据
-		$oldData					= $Model->where(['id'=>$id])->first();
-		// 如果是没有数据
-		if( !$oldData ) 			return $this->error('查无数据');
-		// 获取城市ID
-		$oldData['city_ids']		= explode(',',$oldData['city_ids']);
-		// 获取列表
-		$cityList					= $City->getCityList();
-		// 分配数据
-		$this->assign('oldData',$oldData);
-		$this->assign('cityList',$cityList);
-		$this->assign('crumbs','修改');
-		// 加载模板
-		return 						$this->fetch();
-	}
+    /**
+     * 添加
+     *
+     * */
+    public function add(Request $request,Model $Model){
+        if( request()->isMethod('post') ){
+            // 验证参数
+            $request->scene('add')->validate();
+            // 接收数据
+            $data['name']			= request('name','');
+            $data['area']			= request('area','');
+            // 写入数据表
+            $id						= $Model->add($data);
+            // 如果操作失败
+            if( !$id ) 				return json_send(['code'=>'error','msg'=>'新增失败']);
+            // 记录行为
+            $this->addAdminHistory(admin('uid'),$Model->getTable(),$id,1,[],$data);
+            // 告知结果
+            return					json_send(['code'=>'success','msg'=>'新增成功','action'=>'add']);
+        }
+        $areaList               = $Model->getAreaList();
+        // 分配数据
+        $this->assign('areaList',$areaList);
+        $this->assign('crumbs','新增');
+        // 加载模板
+        return						$this->fetch();
+    }
 
-	/**
-	 * 状态
-	 * 
-	 * */
-	public function set_status( Request $request, Model $Model ){
-		// 验证参数
-		$request->scene('set_status')->validate();
-		// 接收参数
-		$id				= request('id',0);
-		$status			= request('status',0);
-		// 查询数据
-		$result			= $Model->edit($id,['status'=>$status]);
-		// 提示新增失败
-		if( !$result )	return json_send(['code'=>'error','msg'=>'设置失败']);
-		// 记录行为
-		$this->addAdminHistory(admin('uid'),$Model->getTable(),$id,2,[],['status'=>$status]);
-		// 告知结果
-		return			json_send(['code'=>'success','msg'=>'设置成功','path'=>'']);
-	}
+    /**
+     * 修改
+     *
+     * */
+    public function edit(Request $request,Model $Model){
+        // 接收参数
+        $id							= request('id',0);
+        // 查询用户
+        $oldData					= $Model->where(['id'=>$id])->first();
+        // 修改
+        if(request()->isMethod('post')){
+            // 验证参数
+            $request->scene('edit')->validate();
+            // 接收数据
+            $data['name']			= request('name','');
+            $data['area']			= request('area','');
+            // 写入数据表
+            $result					= $Model->edit($id,$data);
+            // 如果操作失败
+            if( !$result ) 			return json_send(['code'=>'error','msg'=>'新增失败']);
+            // 记录行为
+            $this->addAdminHistory(admin('uid'),$Model->getTable(),$id,2,$oldData,$data);
+            // 告知结果
+            return					json_send(['code'=>'success','msg'=>'修改成功','action'=>'edit']);
+        }
+        $areaList               = $Model->getAreaList();
+        // 错误告知
+        if( !$oldData )				return $this->error('查无数据');
+        // 分配数据
+        $this->assign('areaList',$areaList);
+        $this->assign('oldData',$oldData);
+        $this->assign('crumbs','修改');
+        // 加载模板
+        return						$this->fetch();
+    }
+
+    /**
+     * 修改状态
+     *
+     * */
+    public function set_status(Request $request,Model $Model){
+        // 验证参数
+        $request->scene('set_status')->validate();
+        // 设置状态
+        $id				= request('id',0);
+        $status			= request('status',0);
+        // 查询用户
+        $oldData		= $Model->where(['id'=>$id])->first();
+        // 如果用户不存在
+        if( !$oldData )	return json_send(['code'=>'error','msg'=>'用户不存在']);
+        // 执行修改
+        $result			= $Model->edit($id,['status'=>$status]);
+        // 提示新增失败
+        if( !$result )	return json_send(['code'=>'error','msg'=>'设置失败']);
+        // 记录行为
+        $this->addAdminHistory(admin('uid'),$Model->getTable(),$id,2,$oldData,['status'=>$status]);
+        // 告知结果
+        return 			json_send(['code'=>'success','msg'=>'设置成功','path'=>'']);
+    }
 
 }

app/Http/Controllers/Api/School.php

@@ -37,13 +37,18 @@ class School extends Api{
         // 最终列表
         $list							= [];
         // 循环处理数据
-        foreach ( $schoolList as $value ) {
-            $list[$value['area']][]		= $value;
+        foreach ( $areaList as $key=>$value ) {
+            $value                      = ['area_name'=>$value,'school_list'=>[]];
+            foreach ( $schoolList as $value2 ) {
+                if ($value['area_name'] == $value2['area']) {
+                    $value['school_list'][] =  $value2;
+                }
+            }
+            $areaList[$key] = $value;
         }
-        $data['area_list']               = $areaList;
-        $data['school_list']             = $schoolList;
-        $data['grade_list']              = $gradeList;
-        $data['class_list']              = $classList;
+        $data['area_list']               = array_values($areaList);
+        $data['grade_list']              = array_values($gradeList);
+        $data['class_list']              = array_values($classList);
         // 返回结果
         return							json_send(['code'=>'success','msg'=>'获取成功','data'=>$data]);
     }

app/Models/Traits/School/SchoolClass.php

@@ -12,7 +12,7 @@ trait SchoolClass
 {
 
     // 学校班级
-    private     $list       =   [
+    private     $classList       =   [
                                 '1'=>'1班',
                                 '2'=>'2班',
                                 '3'=>'3班',
@@ -43,7 +43,7 @@ trait SchoolClass
      */
     public function getClassList(){
         // 返回数据
-        return                  $this->list;
+        return                  $this->classList;
     }
 
 

app/Models/Traits/School/SchoolGrade.php

@@ -12,7 +12,7 @@ trait SchoolGrade
 {
 
     // 学校年级
-    private     $list       =   [
+    private     $gradeList       =   [
                                 '1'=>'一年级',
                                 '2'=>'二年级',
                                 '3'=>'三年级',
@@ -30,7 +30,7 @@ trait SchoolGrade
      */
     public function getGradeList(){
         // 返回数据
-        return                  $this->list;
+        return                  $this->gradeList;
     }