Commit 510a1b85 authored by hujun's avatar hujun

1

parent 45d1f6a7
......@@ -98,13 +98,15 @@ class PhoneFollowUpService
$date = date("Y-m-d", time());
if ($end_time < $date && $end_time < $date . " 23:59:59" ) {
// if ($end_time < $date && $end_time < $date . " 23:59:59" ) {
if ($end_time == $date && $start_time != $date) {
$data = $this->phoneFollowUp->getFollowList($page_no, $page_size, $order_ = 'id desc', $field, $where);
} elseif ($start_time >= $date && $start_time <= $date . " 23:59:59" ) {
$data = $this->phoneFollowUpTemporary->getFollowList($page_no, $page_size, $order_ = 'id desc', $field, $where);
} else {
$data = $this->phoneFollowUpTemporary->getFollowListV3($this->siteId,$page_no, $page_size, $where, $field);
$data = $this->phoneFollowUpTemporary->getFollowList($page_no, $page_size, $order_ = 'id desc', $field, $where);
}
// else {
// $data = $this->phoneFollowUpTemporary->getFollowListV3($this->siteId,$page_no, $page_size, $where, $field);
// }
$s_user_service = new UserService();
$s_user_Log_service = new UserLogService();
......
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