diff --git a/niucloud/app/adminapi/controller/campus/Campus.php b/niucloud/app/adminapi/controller/campus/Campus.php index d7eacb87..8f6c6e0b 100644 --- a/niucloud/app/adminapi/controller/campus/Campus.php +++ b/niucloud/app/adminapi/controller/campus/Campus.php @@ -30,13 +30,7 @@ class Campus extends BaseAdminController $data = $this->request->params([ ["campus_name",""], ["campus_address",""], - ["campus_preview_image",""], - ["campus_coordinates",""], - ["campus_introduction",""], - ["campus_status",""], - ["create_time",""], - ["update_time",""], - ["delete_time",""] + ["campus_status",""] ]); return success((new CampusService())->getPage($data)); } @@ -62,7 +56,7 @@ class Campus extends BaseAdminController ["campus_coordinates",""], ["campus_introduction",""], ["campus_status",0], - ["delete_time",1747295250] + ]); $this->validate($data, 'app\validate\campus\Campus.add'); $id = (new CampusService())->add($data); @@ -82,7 +76,7 @@ class Campus extends BaseAdminController ["campus_coordinates",""], ["campus_introduction",""], ["campus_status",0], - ["delete_time",1747295250] + ]); $this->validate($data, 'app\validate\campus\Campus.edit'); (new CampusService())->edit($id, $data); diff --git a/niucloud/app/model/contract/Contract.php b/niucloud/app/model/contract/Contract.php index 91bf25e8..9e643c88 100644 --- a/niucloud/app/model/contract/Contract.php +++ b/niucloud/app/model/contract/Contract.php @@ -9,7 +9,7 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\model\contract; +namespace app\model\campus; use core\base\BaseModel; use think\model\concern\SoftDelete; @@ -17,14 +17,14 @@ use think\model\relation\HasMany; use think\model\relation\HasOne; /** - * 合同模型 - * Class Contract - * @package app\model\contract + * 校区模型 + * Class Campus + * @package app\model\campus */ -class Contract extends BaseModel +class Campus extends BaseModel { - use SoftDelete; + /** * 数据表主键 @@ -36,22 +36,14 @@ class Contract extends BaseModel * 模型名称 * @var string */ - protected $name = 'contract'; + protected $name = 'campus'; - /** - * 定义软删除标记字段. - * @var string - */ - protected $deleteTime = 'deleted_at'; + - /** - * 定义软删除字段的默认值. - * @var int - */ - protected $defaultSoftDelete = 0; + /** - * 搜索器:合同合同编号 + * 搜索器:校区主键ID * @param $value * @param $data */ @@ -63,98 +55,110 @@ class Contract extends BaseModel } /** - * 搜索器:合同合同名称 + * 搜索器:校区校区名称 + * @param $value + * @param $data + */ + public function searchCampusNameAttr($query, $value, $data) + { + if ($value) { + $query->where("campus_name", $value); + } + } + + /** + * 搜索器:校区校区地址 * @param $value * @param $data */ - public function searchContractNameAttr($query, $value, $data) + public function searchCampusAddressAttr($query, $value, $data) { if ($value) { - $query->where("contract_name", $value); + $query->where("campus_address", $value); } } /** - * 搜索器:合同合同模板 + * 搜索器:校区校区预览图,存储图片路径 * @param $value * @param $data */ - public function searchContractTemplateAttr($query, $value, $data) + public function searchCampusPreviewImageAttr($query, $value, $data) { if ($value) { - $query->where("contract_template", $value); + $query->where("campus_preview_image", $value); } } /** - * 搜索器:合同合同状态 + * 搜索器:校区校区坐标,格式为经度,纬度 * @param $value * @param $data */ - public function searchContractStatusAttr($query, $value, $data) + public function searchCampusCoordinatesAttr($query, $value, $data) { if ($value) { - $query->where("contract_status", $value); + $query->where("campus_coordinates", $value); } } /** - * 搜索器:合同合同类型 + * 搜索器:校区校区介绍 * @param $value * @param $data */ - public function searchContractTypeAttr($query, $value, $data) + public function searchCampusIntroductionAttr($query, $value, $data) { if ($value) { - $query->where("contract_type", $value); + $query->where("campus_introduction", $value); } } /** - * 搜索器:合同合同备注 + * 搜索器:校区校区状态:0-禁用,1-启用 * @param $value * @param $data */ - public function searchRemarksAttr($query, $value, $data) + public function searchCampusStatusAttr($query, $value, $data) { if ($value) { - $query->where("remarks", $value); + $query->where("campus_status", $value); } } /** - * 搜索器:合同创建时间 + * 搜索器:校区校区创建时间 * @param $value * @param $data */ - public function searchCreatedAtAttr($query, $value, $data) + public function searchCreateTimeAttr($query, $value, $data) { if ($value) { - $query->where("created_at", $value); + $query->where("create_time", $value); } } /** - * 搜索器:合同修改时间 + * 搜索器:校区校区更新时间 * @param $value * @param $data */ - public function searchUpdatedAtAttr($query, $value, $data) + public function searchUpdateTimeAttr($query, $value, $data) { if ($value) { - $query->where("updated_at", $value); + $query->where("update_time", $value); } } /** - * 搜索器:合同逻辑删除时间 + * 搜索器:校区逻辑删除字段,NULL表示未删除,非空表示已删除 * @param $value * @param $data */ - public function searchDeletedAtAttr($query, $value, $data) + public function searchDeleteTimeAttr($query, $value, $data) { if ($value) { - $query->where("deleted_at", $value); + $query->where("delete_time", $value); } }