Commit e6602a70 authored by hujun's avatar hujun

mansion

parent 3a062f88
...@@ -256,7 +256,7 @@ class OfficeRoomService ...@@ -256,7 +256,7 @@ class OfficeRoomService
$field = 'id,building_id,is_show,is_exclusive_type,is_rent,status,source,price_total,price,slotting_fee,'; $field = 'id,building_id,is_show,is_exclusive_type,is_rent,status,source,price_total,price,slotting_fee,';
$field .= 'management_fee,station_start,station_end,area,floor,room_number,floor_tag,enter_date,'; $field .= 'management_fee,station_start,station_end,area,floor,room_number,floor_tag,enter_date,';
$field .= 'payment_month,deposit_month,age_limit_start,age_limit_end,is_register,is_partition,carport,decoration,'; $field .= 'payment_month,deposit_month,age_limit_start,age_limit_end,is_register,is_partition,carport,decoration,';
$field .= 'rent_free,shop_sign,fee_rule,agent_start_time,agent_end_time,landlord_remark'; $field .= 'rent_free,shop_sign,fee_rule,agent_start_time,agent_end_time,landlord_remark,mansion';
$data = $this->m_office_room->getFindData($field, ['id' => $id]); $data = $this->m_office_room->getFindData($field, ['id' => $id]);
if ($data) { if ($data) {
......
...@@ -45,7 +45,8 @@ class OfficeBuildingRoomValidate extends Validate ...@@ -45,7 +45,8 @@ class OfficeBuildingRoomValidate extends Validate
'is_carefully_chosen' => 'require|in:0,1', 'is_carefully_chosen' => 'require|in:0,1',
'agent_start_time' => 'require', 'agent_start_time' => 'require',
'agent_end_time' => 'require', 'agent_end_time' => 'require',
'title'=>'require' 'title'=>'require',
'mansion'=>'require|length:2,255'
]; ];
protected $message = [ protected $message = [
...@@ -104,16 +105,18 @@ class OfficeBuildingRoomValidate extends Validate ...@@ -104,16 +105,18 @@ class OfficeBuildingRoomValidate extends Validate
'is_carefully_chosen.in' => '是否精选参数错误', 'is_carefully_chosen.in' => '是否精选参数错误',
'agent_start_time.require' => '独家开始时间必填', 'agent_start_time.require' => '独家开始时间必填',
'agent_end_time.require' => '独家结束时间必填', 'agent_end_time.require' => '独家结束时间必填',
'title.require'=>'楼盘字段标题必传' 'title.require'=>'楼盘字段标题必传',
'mansion.require'=>'楼号/栋/座必传',
'mansion.length' => '楼号/栋/座字数要在2至255之间',
]; ];
protected $scene = [ protected $scene = [
'add' => ['floor', 'room_number', 'is_rent', 'is_exclusive_type', 'price_total', 'price', 'slotting_fee', 'management_fee', 'add' => ['floor', 'room_number', 'is_rent', 'is_exclusive_type', 'price_total', 'price', 'slotting_fee', 'management_fee',
'station_start', 'station_end', 'area', 'floor_tag', 'enter_time', 'payment_month', 'deposit_month', 'age_limit_start', 'station_start', 'station_end', 'area', 'floor_tag', 'enter_time', 'payment_month', 'deposit_month', 'age_limit_start',
'age_limit_end', 'is_partition', 'carport', 'rent_free', 'source', 'decoration', 'shop_sign'], 'age_limit_end', 'is_partition', 'carport', 'rent_free', 'source', 'decoration', 'shop_sign','mansion'],
'edit' => ['id', 'floor', 'room_number', 'is_rent', 'is_exclusive_type', 'price_total', 'price', 'slotting_fee', 'management_fee', 'edit' => ['id', 'floor', 'room_number', 'is_rent', 'is_exclusive_type', 'price_total', 'price', 'slotting_fee', 'management_fee',
'station_start', 'station_end', 'area', 'floor_tag', 'enter_time', 'payment_month', 'deposit_month', 'age_limit_start', 'station_start', 'station_end', 'area', 'floor_tag', 'enter_time', 'payment_month', 'deposit_month', 'age_limit_start',
'age_limit_end', 'is_partition', 'carport', 'rent_free', 'source', 'decoration', 'shop_sign'], 'age_limit_end', 'is_partition', 'carport', 'rent_free', 'source', 'decoration', 'shop_sign','mansion'],
'detail' => ['id'], 'detail' => ['id'],
'is_carefully_chosen' => ['id', 'is_carefully_chosen'], 'is_carefully_chosen' => ['id', 'is_carefully_chosen'],
'exclusive' => ['agent_start_time,agent_end_time,is_exclusive_type,id'], 'exclusive' => ['agent_start_time,agent_end_time,is_exclusive_type,id'],
......
...@@ -203,6 +203,11 @@ class OfficeGRoom extends BaseModel ...@@ -203,6 +203,11 @@ class OfficeGRoom extends BaseModel
$save_data['status'] = $data['status']; $save_data['status'] = $data['status'];
} }
//楼号/栋/座
if (isset($data['mansion'])) {
$save_data['mansion'] = $data['mansion'];
}
if (empty($data['id'])) { if (empty($data['id'])) {
$save_data['operation_id'] = $agent_id; //上传人 $save_data['operation_id'] = $agent_id; //上传人
$save_data['create_time'] = date('Y-m-d H:i:s'); $save_data['create_time'] = date('Y-m-d H:i:s');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment