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
f76cadb6
Commit
f76cadb6
authored
Dec 24, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
税费去除状态查询
parent
02223426
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
Finance.php
application/index/controller/Finance.php
+2
-2
No files found.
application/index/controller/Finance.php
View file @
f76cadb6
...
...
@@ -1342,7 +1342,7 @@ class Finance extends Basic
$pageSize
=
empty
(
$this
->
params
[
'pageSize'
])
?
15
:
$this
->
params
[
'pageSize'
];
$where
[
'c.is_del'
]
=
0
;
$where
[
'b.status'
]
=
[
'in'
,
[
10
,
11
,
13
]
];
//10已提交 11审核成功
//
$where['b.status'] = [ 'in', [ 10, 11, 13 ] ]; //10已提交 11审核成功
$where
[
'a.father_id'
]
=
[
'neq'
,
0
];
if
(
!
empty
(
$this
->
params
[
'create_time'
])
&&
empty
(
$this
->
params
[
'end_time'
]))
{
$where
[
'a.operation_date'
]
=
[
'> time'
,
$this
->
params
[
'create_time'
]
.
' 00:00:00'
];
...
...
@@ -1502,7 +1502,7 @@ class Finance extends Basic
$m_tax
=
new
OTaxes
();
$taxes_where
[
'a.father_id'
]
=
[
'>'
,
0
];
$taxes_where
[
'is_del'
]
=
0
;
$taxes_where
[
'b.status'
]
=
[
'IN'
,
'10,11,13'
];
//
$taxes_where['b.status'] = ['IN', '10,11,13'];
$taxes_where
[
'a.operation_date'
]
=
[
'between'
,
[
$operation_start_data
,
$operation_end_data
]];
$data
[
'data'
][
'total_taxes'
]
=
$m_tax
->
sumBargainFee
(
'a.fee'
,
$taxes_where
);;
...
...
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