Commit f1d9fcb0 authored by clone's avatar clone

bug

parent 5b4144cb
...@@ -101,10 +101,10 @@ class Performance extends Basic ...@@ -101,10 +101,10 @@ class Performance extends Basic
{ {
header('Access-Control-Allow-Origin:*'); header('Access-Control-Allow-Origin:*');
$params = $this->params; $params = $this->params;
/* $params = array( /* $params = array(
"agent_id" => 6, "agent_id" => 5739,
"start_time" => "2018-04-09", "start_time" => "2018-06-25",
"end_time" => "2018-04-12", "end_time" => "2018-06-25",
);*/ );*/
try { try {
$result = $this->service_->storePerformance($params["agent_id"], $params["start_time"], $params["end_time"]); $result = $this->service_->storePerformance($params["agent_id"], $params["start_time"], $params["end_time"]);
......
...@@ -340,6 +340,7 @@ class PerformanceService ...@@ -340,6 +340,7 @@ class PerformanceService
{ {
//获取经纪人信息 //获取经纪人信息
$result = $this->agentModel->searchAgentsByKeyword("id,store_id,district_id,level", [ "id" => $agent_id ]); $result = $this->agentModel->searchAgentsByKeyword("id,store_id,district_id,level", [ "id" => $agent_id ]);
if (count($result) <= 0) { if (count($result) <= 0) {
return null; return null;
} }
...@@ -361,10 +362,11 @@ class PerformanceService ...@@ -361,10 +362,11 @@ class PerformanceService
$verify = new VerifyService(); $verify = new VerifyService();
$agent_ids = $verify->getAgentsByAgentId($agent_id); $agent_ids = $verify->getAgentsByAgentId($agent_id);
$params["agent_id"] = array( "in", $agent_ids ); $where_["agent_id"] = array( "in", $agent_ids );
$params['create_time'] = array( 'between', array( $start_time . " 00:00:00", $end_time . " 23:59:59" ) ); $where_['create_time'] = array( 'between', array( $start_time . " 00:00:00", $end_time . " 23:59:59" ) );
$list = $this->sumDistrictPerformance($where_);
$list = $this->sumDistrictPerformance($params);
// dump($list);exit; // dump($list);exit;
} else { } else {
$field = "sum(add_house_num) as add_house_num,sum(add_user_num) as add_user_num, $field = "sum(add_house_num) as add_house_num,sum(add_user_num) as add_user_num,
...@@ -489,35 +491,43 @@ class PerformanceService ...@@ -489,35 +491,43 @@ class PerformanceService
//房源 //房源
$addHouseNum = $this->houseModel->getAddHouseNum($params); $addHouseNum = $this->houseModel->getAddHouseNum($params);
$result["add_house_num"] = isset($addHouseNum[0]["num"]) ? $addHouseNum[0]["num"] : 0; $result["add_house_num"] = isset($addHouseNum[0]["num"]) ? $addHouseNum[0]["num"] : 0;
//dump($addHouseNum); //dump($addHouseNum);
//客源 //客源
$addUserNum = $this->userModel->getAddUserNum($params); $addUserNum = $this->userModel->getAddUserNum($params);
$result["add_user_num"] = isset($addUserNum[0]["num"]) ? $addUserNum[0]["num"] : 0; $result["add_user_num"] = isset($addUserNum[0]["num"]) ? $addUserNum[0]["num"] : 0;
//dump($addUserNum); //dump($addUserNum);
//业绩 //业绩
$performanceSum = $this->bargainModel->getAddBargainNum($params, 1);//1表示业绩 2表示实收 $performanceSum = $this->bargainModel->getAddBargainNum($params, 1);//1表示业绩 2表示实收
$result["performance"] = isset($performanceSum[0]["num"]) ? $performanceSum[0]["num"] : 0; $result["performance"] = isset($performanceSum[0]["num"]) ? $performanceSum[0]["num"] : 0;
//实收 //实收
$receivedSum = $this->bargainModel->getReceived($params); $receivedSum = $this->bargainModel->getReceived($params);
$result["official_receipts"] = isset($receivedSum[0]["num"]) ? $receivedSum[0]["num"] : 0; $result["official_receipts"] = isset($receivedSum[0]["num"]) ? $receivedSum[0]["num"] : 0;
//dump($receivedSum); //dump($receivedSum);
//约带看 //约带看
$reportNum = $this->reportModel->getAddReportNum($params); $reportNum = $this->reportModel->getAddReportNum($params);
$result["look_at_num"] = isset($reportNum[0]["num"]) ? $reportNum[0]["num"] : 0; $result["look_at_num"] = isset($reportNum[0]["num"]) ? $reportNum[0]["num"] : 0;
//dump($reportNum); //dump($reportNum);
//进场 //进场
$addMarchInNum = $this->marchInModel->getAddMarchInNum($params); $addMarchInNum = $this->marchInModel->getAddMarchInNum($params);
$result["march_in_num"] = isset($addMarchInNum[0]["num"]) ? $addMarchInNum[0]["num"] : 0; $result["march_in_num"] = isset($addMarchInNum[0]["num"]) ? $addMarchInNum[0]["num"] : 0;
//dump($addMarchInNum); //dump($addMarchInNum);
//收款 //收款
$payLogNum = $this->payLogModel->getAddPayLogNum($params); $payLogNum = $this->payLogModel->getAddPayLogNum($params);
$result["paylog"] = isset($payLogNum[0]["num"]) ? $payLogNum[0]["num"] : 0; $result["paylog"] = isset($payLogNum[0]["num"]) ? $payLogNum[0]["num"] : 0;
//dump($payLogNum); //dump($payLogNum);
// 监督 // 监督
$result["supervision_num"] = $this->superviseModel->findSuperviseListCount("id", $params); $result["supervision_num"] = $this->superviseModel->getSuperviseListCount( $params);
return $result; return $result;
} }
......
...@@ -58,7 +58,19 @@ class ASuperviseModel extends Model ...@@ -58,7 +58,19 @@ class ASuperviseModel extends Model
return $result; return $result;
} }
public function getSuperviseListCount( $params) {
$where_ = [];
if(isset($params["agent_id"])){
$where_["agent_id"] = $params["agent_id"];
}
if(isset($params["create_time"])){
$where_["create_time"] = $params["create_time"];
}
$result = $this
->where($where_)
->count("id");
return $result;
}
/** /**
* 统计监督执行数量分时间 * 统计监督执行数量分时间
* @param $params * @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