Commit 6aeba8f6 authored by hujun's avatar hujun

我的约带看

parent df132cb0
...@@ -137,6 +137,17 @@ class Report extends Basic ...@@ -137,6 +137,17 @@ class Report extends Basic
} }
$result = $this->service_->orderListAll($field, $params, $pageNo, $pageSize,$check_type); $result = $this->service_->orderListAll($field, $params, $pageNo, $pageSize,$check_type);
}else{ }else{
$result = $this->service_->orderList($field, $params, $pageNo, $pageSize); $result = $this->service_->orderList($field, $params, $pageNo, $pageSize);
} }
...@@ -198,19 +209,8 @@ class Report extends Basic ...@@ -198,19 +209,8 @@ class Report extends Basic
$params["a.id"] = $params["report_id"]; $params["a.id"] = $params["report_id"];
} }
$params["report_agent_id"] = $params["agent_id"]; $params["report_agent_id"] = $params["agent_id"];
// $result = $this->service_->orderListForPc($field, $params, $pageNo, $pageSize);
$where["agents_id"] = $this->agentId; $result = $this->service_->orderList($field, $params, $pageNo, $pageSize);
$where["type"] = array("in",'2,3'); //盘方和独家
$where["is_del"] = 0;
$houseToAgentModel = new GHousesToAgents();
$house_id_arr = $houseToAgentModel->getAgentHouseOne("houses_id", $where);
if (!empty($house_id_arr)) {
$params['b.house_id'] = ['in', $house_id_arr];
}
$result = $this->service_->orderListForPc($field, $params, $pageNo, $pageSize);
if (count($result) > 0) { if (count($result) > 0) {
return $this->response("200", "request success", $result); return $this->response("200", "request success", $result);
} else { } else {
......
...@@ -181,7 +181,7 @@ define(['doT', 'text!temp/inspectionRecordAll_list_template_tpl.html', 'css!styl ...@@ -181,7 +181,7 @@ define(['doT', 'text!temp/inspectionRecordAll_list_template_tpl.html', 'css!styl
if (data.data.list) { if (data.data.list) {
$("#follow_list").html(doTtmpl(data.data.list)); $("#follow_list").html(doTtmpl(data.data.list));
} else { } else {
$("#follow_list").html(doTtmpl(data.data.result)); $("#follow_list").html(doTtmpl(data.data));
} }
/*分页代码*/ /*分页代码*/
add_page(data.data.total, pageNo, record.pageSize, record.getList); add_page(data.data.total, pageNo, record.pageSize, record.getList);
......
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