Commit 864bdde6 authored by zhuwei's avatar zhuwei

bug

parent 63547634
......@@ -545,7 +545,9 @@ class Performance extends Basic
if ($result["code"] == 101) {
return $this->response("101", $result["date"]);
} else {
return $this->response("200", "success", $result["date"]);
//return $this->response("200", "success", $result["date"]);
return $this->response("200", "success", [ "date" => $result["date"] , "total" => $result["total"] ]);
}
}
......
......@@ -799,11 +799,13 @@ class PerformanceService
return [ "code" => 101, "date" => "传入的参数错误" ];
$field = "a.id,a.user_name,a.user_phone,a.predict_see_time,a.create_time,a.report_agent_name,c.internal_title as house_title,c.shop_type,e.store_name,b.id as order_id";
$reportList = $this->reportModel->getAddReportListPcInfo($params, $field, $page_no, $page_size);
$reportListTotal = $this->reportModel->getAddReportListPcInfoTotal($params, $field);
foreach ($reportList as $key => $val) {
$reportList[$key]["user_name"] = $val["user_name"]?$val["user_name"]:'';
$reportList[$key]["user_phone"] = preg_replace('/(\d{3})\d{4}(\d{4})/', '$1****$2', $val["user_phone"]);
}
return [ "code" => 200, "date" => $reportList ];
//return [ "code" => 200, "date" => $reportList ];
return [ "code" => 200, "date" => $reportList , "total" => $reportListTotal ];
}
......
......@@ -662,6 +662,32 @@ class OReportModel extends Model
return $result;
}
public function getAddReportListPcInfoTotal($params, $field)
{
$where_ = [];
if (isset($params["agent_id"])) {
$where_["a.report_agent_id"] = $params["agent_id"];
}
if (isset($params["create_time"])) {
$where_["a.create_time"] = $params["create_time"];
}
if (isset($params["house_ids"])) {
$where_["b.house_id"] = array( "in", $params["house_ids"] );
}
$where_["a.status"] = 0;
$result = Db::table($this->table)
->field($field)
->alias("a")
->join("o_order b", "a.id = b.f_id", "left")
->join("g_houses c", "b.house_id = c.id", "left")
->join('a_store e', 'a.report_store_id = e.id', 'left')
->where($where_)
->count();
//echo Db::table($this->table)->getLastSql();
return $result;
}
/**
* @param $field
* @param $params
......
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