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
b9309b03
Commit
b9309b03
authored
Jun 12, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
688f5abf
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
7 deletions
+5
-7
OfficeRemark.php
application/index/controller/OfficeRemark.php
+0
-5
OfficePhoneFollowUpService.php
application/index/service/OfficePhoneFollowUpService.php
+1
-1
OfficePhoneFollowUp.php
application/model/OfficePhoneFollowUp.php
+4
-1
No files found.
application/index/controller/OfficeRemark.php
View file @
b9309b03
...
@@ -42,10 +42,6 @@ class OfficeRemark extends Basic
...
@@ -42,10 +42,6 @@ class OfficeRemark extends Basic
return
$this
->
response
(
101
,
'时间格式错误'
,
[]);
return
$this
->
response
(
101
,
'时间格式错误'
,
[]);
}
}
if
(
!
strtotime
(
$this
->
params
[
'start_date'
])
||
!
strtotime
(
$this
->
params
[
'end_date'
]))
{
return
$this
->
response
(
101
,
'时间格式错误'
,
[]);
}
if
(
!
empty
(
$this
->
params
[
'start_date'
])
||
!
empty
(
$this
->
params
[
'end_date'
]))
{
if
(
!
empty
(
$this
->
params
[
'start_date'
])
||
!
empty
(
$this
->
params
[
'end_date'
]))
{
$time
=
strtotime
(
$this
->
params
[
'end_date'
])
-
strtotime
(
$this
->
params
[
'start_date'
]);
$time
=
strtotime
(
$this
->
params
[
'end_date'
])
-
strtotime
(
$this
->
params
[
'start_date'
]);
if
(
$time
>
2592000
||
$time
<
0
)
{
if
(
$time
>
2592000
||
$time
<
0
)
{
...
@@ -84,7 +80,6 @@ class OfficeRemark extends Basic
...
@@ -84,7 +80,6 @@ class OfficeRemark extends Basic
}
}
$result
=
[];
$result
=
[];
if
(
$site_id
==
"10001"
&&
(
$this
->
params
[
'agent_id'
]
>
0
||
!
empty
(
$this
->
params
[
"content"
]))
&&
$is_today
&&
empty
(
$this
->
params
[
'user_id'
]))
{
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
();
$searchService
=
new
SearchService
();
$this
->
params
[
'search_content'
]
=
$this
->
params
[
'content'
];
$this
->
params
[
'search_content'
]
=
$this
->
params
[
'content'
];
$this
->
params
[
'start_time'
]
=
strtotime
(
$this
->
params
[
'start_date'
]
.
' 00:00:00'
);
$this
->
params
[
'start_time'
]
=
strtotime
(
$this
->
params
[
'start_date'
]
.
' 00:00:00'
);
...
...
application/index/service/OfficePhoneFollowUpService.php
View file @
b9309b03
...
@@ -93,7 +93,7 @@ class OfficePhoneFollowUpService
...
@@ -93,7 +93,7 @@ class OfficePhoneFollowUpService
}
}
}
}
$data
=
$this
->
phoneFollowUp
->
getFollowList
(
$page_no
,
$page_size
,
$order_
=
''
,
$field
,
$where
);
$data
=
$this
->
phoneFollowUp
->
getFollowList
(
$page_no
,
$page_size
,
$order_
=
'
id desc
'
,
$field
,
$where
);
return
[
'code'
=>
'200'
,
'data'
=>
$data
];
return
[
'code'
=>
'200'
,
'data'
=>
$data
];
}
}
...
...
application/model/OfficePhoneFollowUp.php
View file @
b9309b03
...
@@ -223,12 +223,15 @@ class OfficePhoneFollowUp extends BaseModel
...
@@ -223,12 +223,15 @@ class OfficePhoneFollowUp extends BaseModel
* @throws \think\exception\DbException
* @throws \think\exception\DbException
*/
*/
public
function
getFollowList
(
$pageNo
=
1
,
$pageSize
=
15
,
$order_
=
'id desc'
,
$field
=
''
,
$params
=
''
)
{
public
function
getFollowList
(
$pageNo
=
1
,
$pageSize
=
15
,
$order_
=
'id desc'
,
$field
=
''
,
$params
=
''
)
{
return
$this
->
UPhoneFollowUp
->
field
(
$field
)
$return
=
$this
->
UPhoneFollowUp
->
field
(
$field
)
->
where
(
$params
)
->
where
(
$params
)
->
order
(
$order_
)
->
order
(
$order_
)
->
limit
(
$pageSize
)
->
limit
(
$pageSize
)
->
page
(
$pageNo
)
->
page
(
$pageNo
)
->
select
();
->
select
();
//echo $this->getLastSql();
// big_log($this->getLastSql());
return
$return
;
}
}
/**
/**
...
...
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