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
1aa83cab
Commit
1aa83cab
authored
Feb 24, 2018
by
zfc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
跟进列表
parent
f845aceb
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
9 deletions
+15
-9
Client.php
application/api_broker/controller/Client.php
+12
-7
UPhoneFollowPp.php
application/model/UPhoneFollowPp.php
+2
-1
route.php
application/route.php
+1
-1
No files found.
application/api_broker/controller/Client.php
View file @
1aa83cab
...
...
@@ -126,20 +126,25 @@ class Client extends Basic
$pageNo
=
empty
(
$params
[
'pageNo'
])
?
1
:
$params
[
'pageNo'
];
$pageSize
=
empty
(
$params
[
'pageSize'
])
?
15
:
$params
[
'pageSize'
];
$field
=
[
'f.id'
,
'f.user_id'
,
'f.content'
,
'f.create_time'
,
'u.user_pic'
,
"TIMESTAMPDIFF(MINUTE,u.create_time,'
{
$time
}
')as time_minute_diff"
'img.imagename'
,
'a.realname'
,
'a.agentshopname'
,
'a.sub_shopname'
,
"TIMESTAMPDIFF(MINUTE,f.create_time,'
{
$time
}
')as time_minute_diff"
];
$where
=
"agent_id in(0,
{
$params
[
'agent_id'
]
}
)
or TIMESTAMPDIFF(MINUTE,create_time,'
{
$time
}
') > 2880"
;
$where
=
"(f.agent_id in(0,
{
$params
[
'agent_id'
]
}
) ) "
;
if
(
!
empty
(
$search
)){
$where
.=
" and f.content like '%
$search
%' "
;
$data
[
'search'
]
=
$search
;
}
$join
=
[[
'u_user u'
,
'u.id=f.user_id'
,
'left'
]];
$order
=
"id asc"
;
$data
[
'list'
]
=
$table
->
getSearch
(
$pageNo
,
$pageSize
,
$order
,
$field
,
$join
,
$where
);
$group
=
" f.id "
;
$join
=
[[
'agents a'
,
'a.id=f.agent_id'
,
'left'
],
[
'agentsimgs img'
,
'img.agent_id=f.agent_id'
,
'left'
]];
$order
=
"id desc"
;
$data
[
'list'
]
=
$table
->
getSearch
(
$pageNo
,
$pageSize
,
$order
,
$field
,
$join
,
$where
,
$group
);
$data
[
'total'
]
=
$table
->
getUserAgentTotal
(
$where
,
$join
);
return
$this
->
response
(
200
,
'成功'
,
$data
);
...
...
application/model/UPhoneFollowPp.php
View file @
1aa83cab
...
...
@@ -31,11 +31,12 @@ class UPhoneFollowPp extends BaseModel
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public
function
getSearch
(
$p
=
1
,
$pageSize
=
15
,
$order_
=
'id desc'
,
$field
,
$join
,
$where
){
public
function
getSearch
(
$p
=
1
,
$pageSize
=
15
,
$order_
=
'id desc'
,
$field
,
$join
,
$where
,
$group
){
$r
=
$this
->
field
(
$field
)
->
alias
(
'f'
)
->
join
(
$join
)
->
where
(
$where
)
->
group
(
$group
)
->
order
(
$order_
)
->
limit
(
$pageSize
)
->
page
(
$p
)
...
...
application/route.php
View file @
1aa83cab
...
...
@@ -207,7 +207,7 @@ Route::group('api', [
'getVersionNo'
=>
[
'api/Version/getVersionNo'
,
[
'method'
=>
'post'
]
],
'agentUserTb'
=>
[
'api_broker/Client/agentUserTb'
,
[
'method'
=>
'get'
]
],
//客户列表
'agentUserFollow'
=>
[
'api_broker/Client/agentUserFollow'
,
[
'method'
=>
'get'
]
],
//客户列表
]);
...
...
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