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
688f5abf
Commit
688f5abf
authored
Jun 12, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
d557775a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
11 deletions
+3
-11
Member.php
application/index/controller/Member.php
+2
-1
OfficeRemark.php
application/index/controller/OfficeRemark.php
+0
-1
OfficePhoneFollowUpService.php
application/index/service/OfficePhoneFollowUpService.php
+1
-9
No files found.
application/index/controller/Member.php
View file @
688f5abf
...
@@ -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
OfficeUPhoneFollowUp
Temporary
(
$this
->
siteId
);
$model
=
new
OfficeUPhoneFollowUp
(
$this
->
siteId
);
}
else
{
}
else
{
$model
=
new
UPhoneFollowUpTemporary
(
$this
->
siteId
);
$model
=
new
UPhoneFollowUpTemporary
(
$this
->
siteId
);
}
}
...
...
application/index/controller/OfficeRemark.php
View file @
688f5abf
...
@@ -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
)
{
...
...
application/index/service/OfficePhoneFollowUpService.php
View file @
688f5abf
...
@@ -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
];
}
}
...
...
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