Commit 17780889 authored by zhuwei's avatar zhuwei

门店拜访

parent c3352408
...@@ -70,7 +70,7 @@ class Supervise extends Basic ...@@ -70,7 +70,7 @@ class Supervise extends Basic
} }
$visit = new AgentsVisitors(); $visit = new AgentsVisitors();
$fields = 'a.id,created,a.visitor_name,a.agentshopname,a.address,c.address as shop_address,a.scene_photo,a.distance,a.remarks'; $fields = 'a.id,a.create_time,a.visitor_name,a.agentshopname,a.address,c.address as shop_address,a.scene_photo,a.distance,a.remarks';
$where['visit_type'] = 0; $where['visit_type'] = 0;
$data['data'] = $visit->getVisitorsList($pageNo, $pageSize, 'a.id desc', $fields, $where); $data['data'] = $visit->getVisitorsList($pageNo, $pageSize, 'a.id desc', $fields, $where);
......
...@@ -79,19 +79,20 @@ class Transfer extends Basic ...@@ -79,19 +79,20 @@ class Transfer extends Basic
if($params['agent_type'] == 1){ if($params['agent_type'] == 1){
$where['c.agent_id'] = array('gt',0); $where['c.agent_id'] = array('gt',0);
}else{ }else{
$where['c.agent_id'] = 0; $where[] = ['EXP', 'c.agent_id IS NULL OR c.agent_id = 0'];
} }
} }
} }
$sublet = new SubletModel(); $sublet = new SubletModel();
$fields = 'a.id,a.shop_name,a.manage_type,a.address_detail,a.province,a.city,a.district,FORMAT(a.expected_rent/100,2) as expected_rent, $fields = 'a.id,a.shop_name,a.manage_type,a.address_detail,a.province,a.city,a.district,FORMAT(a.expected_rent/100,2) as expected_rent,
if(b.status=2,"3",a.status) as status,a.appellation,a.tel,a.create_time,a.status'; if(b.status=2,"3",a.status) as status,a.appellation,a.tel,a.create_time,a.status';
$data['list'] = $sublet->getSublet($pageNo, $pageSize, 'a.id desc', $fields, $where); $data['list'] = $sublet->getSublet($pageNo, $pageSize, 'a.id desc', $fields, $where);
$data['total'] = $sublet->getSubletTotal($where); $data['total'] = $sublet->getSubletTotal($where);
return $this->response($data['status'], $data['msg'], $data); return $this->response($data['status'], $data['msg'], $data);
} }
......
...@@ -5,6 +5,8 @@ namespace app\model; ...@@ -5,6 +5,8 @@ namespace app\model;
class AgentsVisitors extends BaseModel class AgentsVisitors extends BaseModel
{ {
protected $table = 'a_visiting';
/** /**
* @param int $pageNo * @param int $pageNo
* @param int $pageSize * @param int $pageSize
......
...@@ -54,6 +54,7 @@ class SubletModel extends BaseModel ...@@ -54,6 +54,7 @@ class SubletModel extends BaseModel
->limit($pageSize) ->limit($pageSize)
->page($pageNo) ->page($pageNo)
->select(); ->select();
big_log($this->getLastSql());
return $result; return $result;
} }
...@@ -65,10 +66,12 @@ class SubletModel extends BaseModel ...@@ -65,10 +66,12 @@ class SubletModel extends BaseModel
*/ */
public function getSubletTotal($params) public function getSubletTotal($params)
{ {
return $this->alias("a") $result = $this->alias("a")
->join("g_houses b","a.house_id=b.id","left") ->join("g_houses b","a.house_id=b.id","left")
->join("u_users c", "a.user_id = c.id", "left") ->join("u_users c", "a.user_id = c.id", "left")
->where($params)->count(); ->where($params)
->count();
return $result;
} }
/** /**
......
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