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
f5e9991f
Commit
f5e9991f
authored
Jul 24, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
8c142cdc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
CostDetail.php
application/index/controller/CostDetail.php
+2
-2
FStoreCostExt.php
application/model/FStoreCostExt.php
+0
-1
No files found.
application/index/controller/CostDetail.php
View file @
f5e9991f
...
...
@@ -49,7 +49,7 @@ class CostDetail extends Basic
$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,
c
.store_id,a.assume_fee'
;
a.type,a.fee_item,a.purpose,
b
.store_id,a.assume_fee'
;
$list
=
$this
->
storeCostExt
->
getStoreCostExt
(
$field
,
$conditions
,
$pageNo
,
$pageSize
);
if
(
!
$list
)
...
...
@@ -80,7 +80,7 @@ class CostDetail extends Basic
$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,
c
.store_id,a.assume_fee'
;
a.type,a.fee_item,a.purpose,
b
.store_id,a.assume_fee'
;
$list
=
$this
->
storeCostExt
->
getStoreCostExtExcel
(
$field
,
$conditions
);
if
(
!
$list
)
...
...
application/model/FStoreCostExt.php
View file @
f5e9991f
...
...
@@ -44,7 +44,6 @@ class FStoreCostExt extends BaseModel
->
alias
(
'a'
)
->
join
(
'f_store_cost b'
,
'a.cost_id = b.id'
,
'left'
)
->
join
(
'f_apply_for_fee c'
,
'a.apply_for_id = c.id'
,
'left'
)
->
where
(
$params
)
->
limit
(
$pageSize
)
->
page
(
$pageNo
)
...
...
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