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
d67c301c
Commit
d67c301c
authored
Jul 25, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
0d112ac3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
CostDetail.php
application/index/controller/CostDetail.php
+4
-5
No files found.
application/index/controller/CostDetail.php
View file @
d67c301c
...
...
@@ -48,9 +48,8 @@ class CostDetail extends Basic
$pageSize
=
empty
(
$params
[
'pageSize'
])
?
15
:
$params
[
'pageSize'
];
$conditions
=
$this
->
buildConditions
(
$params
);
$field
=
'a.id,a.cost_id,b.setting_date,a.create_time,b.operator_name,
a.type,a.fee_item,a.purpose,a.store_id,a.assume_fee'
;
a.type,a.fee_item,a.purpose,a.store_id,a.assume_fee
,a.apply_for_id
'
;
$list
=
$this
->
storeCostExt
->
getStoreCostExt
(
$field
,
$conditions
,
$pageNo
,
$pageSize
);
if
(
!
$list
)
...
...
@@ -121,7 +120,7 @@ class CostDetail extends Basic
}
//创建时间
if
(
!
empty
(
$params
[
'start_time'
])
&&
!
empty
(
$params
[
'end_time'
]))
{
$
where
[
'a.create_time'
]
=
[
'between'
,
[
$params
[
'start_time'
]
.
' 00:00:00'
,
$params
[
'end_time'
]
.
' 23:59:59'
]];
$
conditions
[
'a.create_time'
]
=
[
'between'
,
[
$params
[
'start_time'
]
.
' 00:00:00'
,
$params
[
'end_time'
]
.
' 23:59:59'
]];
}
//门店id
if
(
!
empty
(
$params
[
'store_id'
]))
{
...
...
@@ -132,8 +131,8 @@ class CostDetail extends Basic
$conditions
[
"a.id"
]
=
$params
[
"id"
];
}
//费用ID
if
(
!
empty
(
$params
[
'
cost
_id'
]))
{
$conditions
[
"
b.cost_id"
]
=
$params
[
"cost
_id"
];
if
(
!
empty
(
$params
[
'
apply_for
_id'
]))
{
$conditions
[
"
a.apply_for_id"
]
=
$params
[
"apply_for
_id"
];
}
//费用类型
if
(
!
empty
(
$params
[
'type'
]))
{
...
...
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