Commit 688f5abf authored by zhuwei's avatar zhuwei

1

parent d557775a
...@@ -10,6 +10,7 @@ use app\index\service\BrokerService; ...@@ -10,6 +10,7 @@ use app\index\service\BrokerService;
use app\index\service\UserService; use app\index\service\UserService;
use app\model\AAgents; use app\model\AAgents;
use app\model\GOperatingRecords; use app\model\GOperatingRecords;
use app\model\OfficeUPhoneFollowUp;
use app\model\OfficeUPhoneFollowUpTemporary; use app\model\OfficeUPhoneFollowUpTemporary;
use app\model\UPhoneFollowUp; use app\model\UPhoneFollowUp;
use app\model\UPhoneFollowUpTemporary; use app\model\UPhoneFollowUpTemporary;
...@@ -482,7 +483,7 @@ class Member extends Basic{ ...@@ -482,7 +483,7 @@ class Member extends Basic{
if($params['entrust_type'] == 1){ if($params['entrust_type'] == 1){
$model = new OfficeUPhoneFollowUpTemporary($this->siteId); $model = new OfficeUPhoneFollowUp($this->siteId);
}else{ }else{
$model = new UPhoneFollowUpTemporary($this->siteId); $model = new UPhoneFollowUpTemporary($this->siteId);
} }
......
...@@ -94,7 +94,6 @@ class OfficeRemark extends Basic ...@@ -94,7 +94,6 @@ class OfficeRemark extends Basic
$result = $search_result["result"]["items"]; $result = $search_result["result"]["items"];
$if_search = true; $if_search = true;
} else { } else {
dump(444444);
$follow_up_service = new OfficePhoneFollowUpService($site_id); $follow_up_service = new OfficePhoneFollowUpService($site_id);
$result_list = $follow_up_service->getPhoneFollowList($this->params['start_date'], $this->params['end_date'], $where, $this->userId); $result_list = $follow_up_service->getPhoneFollowList($this->params['start_date'], $this->params['end_date'], $where, $this->userId);
if ($result_list['code'] == 200) { if ($result_list['code'] == 200) {
......
...@@ -93,15 +93,7 @@ class OfficePhoneFollowUpService ...@@ -93,15 +93,7 @@ class OfficePhoneFollowUpService
} }
} }
$date = date("Y-m-d", time()); $data = $this->phoneFollowUp->getFollowList($page_no, $page_size, $order_ = '', $field, $where);
if ($end_time == $date && $start_time == $date) {
big_log(5555);
$data = $this->phoneFollowUpTemporary->getFollowList($page_no, $page_size, $order_ = 'id desc', $field, $where);
} else {
big_log(66666);
$data = $this->phoneFollowUp->getFollowList($page_no, $page_size, $order_ = '', $field, $where);
}
return ['code'=>'200','data'=>$data]; return ['code'=>'200','data'=>$data];
} }
......
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