Commit b90b7940 authored by hujun's avatar hujun

add

parent f8dc92b6
......@@ -214,10 +214,10 @@ class OfficeRoom extends Basic
$data = $this->params;
$data['id'] = $this->params['houses_id'];
unset($data['houses_id']);
$this->data = $this->service->edit($data, $this->userId, $this->siteId, 'exclusive');
if ($this->data['status'] == 'fail') {
$result = $this->service->edit($data, $this->userId, $this->siteId, 'exclusive');
if ($result['status'] == 'fail') {
$this->code = 101;
$this->msg = $this->data['msg'];
$this->msg = $result['msg'];
}
} else {
$result = $this->service->delAgentHouse(3, $this->params['houses_id']);
......@@ -275,7 +275,13 @@ class OfficeRoom extends Basic
public function getExclusive()
{
if ($this->params['houses_id']) {
$this->data = $this->service->getExclusive($this->params['houses_id']);
$result = $this->service->getExclusive($this->params['houses_id']);
if ($result['status'] == 'fail') {
$this->msg = $result['msg'];
$this->code = 101;
} else {
$this->data = $result['data'];
}
} else {
$this->code = 101;
$this->msg = 'houses_id is null';
......
......@@ -1359,23 +1359,24 @@ class OfficeRoomService
return $result;
}
$result['id'] = $data['id'];
$result['is_exclusive_type'] = $data['is_exclusive_type'];
$result['agent_start_time'] = $data['agent_start_time'];
$result['agent_end_time'] = $data['agent_end_time'];
$result_data['id'] = $data['id'];
$result_data['is_exclusive_type'] = $data['is_exclusive_type'];
$result_data['agent_start_time'] = $data['agent_start_time'];
$result_data['agent_end_time'] = $data['agent_end_time'];
$agent_data = $this->agent_room->getAgentsByRoomId('b.id,b.name,b.phone', ['a.house_id'=>$room_id, 'a.type'=>3]);
if ($agent_data[0]) {
$result['name'] = $agent_data[0]['name'] . '-' . $agent_data[0]['phone'];
$result_data['name'] = $agent_data[0]['name'] . '-' . $agent_data[0]['phone'];
} else {
$result['name'] = '';
$result_data['name'] = '';
}
$room_img = $this->m_office_img->getListAll('img_name',['house_id'=>$room_id,'img_type'=>4]);
if ($room_img) {
$result['exclusive_img'] = $room_img;
$result_data['exclusive_img'] = $room_img;
} else {
$result['exclusive_img'] = [];
$result_data['exclusive_img'] = [];
}
$house_file_where['house_id'] = $room_id;
......@@ -1385,11 +1386,12 @@ class OfficeRoomService
foreach ($exclusive_file as $k=>$v) {
$exclusive_file[$k]['file_name'] = '/static/exclusive_file/'.$v['file_name'];
}
$result['exclusive_file'] = $exclusive_file;
$result_data['exclusive_file'] = $exclusive_file;
} else {
$result['exclusive_file'] = [];
$result_data['exclusive_file'] = [];
}
$result['data'] = $result_data;
$result['status'] = 'successful';
return $result;
}
......
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