Commit 256e931f authored by zhuwei's avatar zhuwei

日报周报带看bug

parent c322a590
......@@ -136,8 +136,9 @@ class StatementService
$result["house_num"] = $this->houseModel->getAddHouseNumByAgentId($conditions);
//dump($conditions);
$result["user_num"] = $this->userModel->getAddUserNumByAgentId($conditions);
//$result["follow_up_num"] = $this->followUpModel->getAddFollowUpNumByAgentId($conditions);
$result["follow_up_num"] = $this->reportModel->getAddFollowUpNumByAgentId($conditions);
//dump($conditions);
$addMarchInNum = $this->marchInModel->getAddMarchInNum($conditions);
$result["follow_up_num"] = isset($addMarchInNum[0]["num"]) ? $addMarchInNum[0]["num"] : 0;
//本月业绩
$start_time = date("Y-m-01", time());
......@@ -354,7 +355,8 @@ class StatementService
$store_list["house_num"] = $this->houseModel->getAddHouseNumByAgentId($conditions_);
$store_list["user_num"] = $this->userModel->getAddUserNumByAgentId($conditions_);
//$store_list["follow_up_num"] = $this->followUpModel->getAddFollowUpNumByAgentId($conditions_);
$store_list["follow_up_num"] = $this->reportModel->getAddFollowUpNumByAgentId($conditions_);
$addMarchInNum = $this->marchInModel->getAddMarchInNum($conditions_);
$store_list["follow_up_num"] = isset($addMarchInNum[0]["num"]) ? $addMarchInNum[0]["num"] : 0;
//本周业绩
$start_time = date("Y-m-d", strtotime("-7 day"));
......
......@@ -184,7 +184,8 @@ class OMarchInModel extends Model
$where_["b.house_id"] = $params["house_id"];
$where_["b.is_del"] = 0;//选择正常状态的参数
}
return Db::table($this->table)
$return=Db::table($this->table)
->field($field)
->alias("a")
->join("o_order b", "a.order_id = b.id", "left")
......@@ -194,6 +195,8 @@ class OMarchInModel extends Model
->limit($page_size)
->page($page_no)
->select();
//dump($this->getLastSql());
return $return;
}
/**
......
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