Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujun
tl_estate
Commits
510a1b85
Commit
510a1b85
authored
Jan 11, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
45d1f6a7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
PhoneFollowUpService.php
application/index/service/PhoneFollowUpService.php
+6
-4
No files found.
application/index/service/PhoneFollowUpService.php
View file @
510a1b85
...
...
@@ -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
->
getFollowList
V3
(
$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
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment