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
01974d15
Commit
01974d15
authored
Jun 12, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
12
parent
513fd6f0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
0 deletions
+5
-0
OfficeRemark.php
application/index/controller/OfficeRemark.php
+2
-0
OfficePhoneFollowUpService.php
application/index/service/OfficePhoneFollowUpService.php
+3
-0
No files found.
application/index/controller/OfficeRemark.php
View file @
01974d15
...
...
@@ -84,6 +84,7 @@ class OfficeRemark extends Basic
}
$result
=
[];
if
(
$site_id
==
"10001"
&&
(
$this
->
params
[
'agent_id'
]
>
0
||
!
empty
(
$this
->
params
[
"content"
]))
&&
$is_today
&&
empty
(
$this
->
params
[
'user_id'
]))
{
dump
(
'33333'
);
$searchService
=
new
SearchService
();
$this
->
params
[
'search_content'
]
=
$this
->
params
[
'content'
];
$this
->
params
[
'start_time'
]
=
strtotime
(
$this
->
params
[
'start_date'
]
.
' 00:00:00'
);
...
...
@@ -93,6 +94,7 @@ class OfficeRemark extends Basic
$result
=
$search_result
[
"result"
][
"items"
];
$if_search
=
true
;
}
else
{
dump
(
444444
);
$follow_up_service
=
new
OfficePhoneFollowUpService
(
$site_id
);
$result_list
=
$follow_up_service
->
getPhoneFollowList
(
$this
->
params
[
'start_date'
],
$this
->
params
[
'end_date'
],
$where
,
$this
->
userId
);
if
(
$result_list
[
'code'
]
==
200
)
{
...
...
application/index/service/OfficePhoneFollowUpService.php
View file @
01974d15
...
...
@@ -95,8 +95,11 @@ class OfficePhoneFollowUpService
$date
=
date
(
"Y-m-d"
,
time
());
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
);
}
...
...
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