Commit 2312f8fe authored by clone's avatar clone

1

parent fbe5449c
...@@ -177,14 +177,14 @@ class OfficeHomePageLog extends Basic ...@@ -177,14 +177,14 @@ class OfficeHomePageLog extends Basic
{ {
$params = $this->params; $params = $this->params;
/*$params = array( $params = array(
"start_time" => strtotime('2016-08-14 11:02:36'), //开始时间 "start_time" => strtotime('2019-06-01 11:02:36'), //开始时间
"end_time" => strtotime('2018-08-14 11:07:10'), //结束时间 "end_time" => strtotime('2019-06-26 12:07:10'), //结束时间
"name_or_phone" => "18112347151",//用户姓名或电话 //"name_or_phone" => "18112347151",//用户姓名或电话
"search_content" => "1",// 搜索跟进内容 // "search_content" => "1",// 搜索跟进内容
"pageNo" => 1, "pageNo" => 1,
"pageSize" => 15 "pageSize" => 15
);*/ );
if (empty($params['start_time']) || empty($params['end_time'])) { if (empty($params['start_time']) || empty($params['end_time'])) {
return $this->response("101", '请选择时间'); return $this->response("101", '请选择时间');
...@@ -275,7 +275,7 @@ class OfficeHomePageLog extends Basic ...@@ -275,7 +275,7 @@ class OfficeHomePageLog extends Basic
$roomModel = new OfficeGRoom(); $roomModel = new OfficeGRoom();
$house_params["a.id"] = $value['house_id']; $house_params["a.id"] = $value['house_id'];
$res_a = $roomModel->getHouseInfo("a.id,CONCAT(b.address,a.room_number) internal_address", $house_params); $res_a = $roomModel->getHouseInfo("a.id,CONCAT(b.address,a.room_number) internal_address", $house_params);
$result[$key]['internal_title'] = $res_a[0]['internal_title']; $result[$key]['internal_title'] = $res_a[0]['internal_address'];
} }
if (count($result) > 0) { if (count($result) > 0) {
......
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