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
2b1f3101
Commit
2b1f3101
authored
Jun 13, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改上一步
parent
19976129
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
Finance.php
application/index/controller/Finance.php
+1
-1
OTaxes.php
application/model/OTaxes.php
+1
-1
No files found.
application/index/controller/Finance.php
View file @
2b1f3101
...
@@ -946,7 +946,7 @@ class Finance extends Basic
...
@@ -946,7 +946,7 @@ class Finance extends Basic
$where
[
'c.is_del'
]
=
0
;
$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'
]))
{
if
(
!
empty
(
$this
->
params
[
'create_time'
])
&&
empty
(
$this
->
params
[
'end_time'
]))
{
$where
[
'a.create_time'
]
=
[
'> time'
,
$this
->
params
[
'create_time'
]
.
' 00:00:00'
];
$where
[
'a.create_time'
]
=
[
'> time'
,
$this
->
params
[
'create_time'
]
.
' 00:00:00'
];
}
}
...
...
application/model/OTaxes.php
View file @
2b1f3101
...
@@ -189,7 +189,7 @@ class OTaxes extends BaseModel
...
@@ -189,7 +189,7 @@ class OTaxes extends BaseModel
->
join
(
'o_bargain b'
,
'a.bargain_id = b.id'
,
'left'
)
->
join
(
'o_bargain b'
,
'a.bargain_id = b.id'
,
'left'
)
->
join
(
'o_order c'
,
'b.order_id = c.id'
,
'left'
)
->
join
(
'o_order c'
,
'b.order_id = c.id'
,
'left'
)
->
join
(
'g_houses d'
,
'c.house_id = d.id'
,
'left'
)
->
join
(
'g_houses d'
,
'c.house_id = d.id'
,
'left'
)
->
join
(
'a_agents e'
,
'
b
.agent_id = e.id'
,
'left'
)
->
join
(
'a_agents e'
,
'
a
.agent_id = e.id'
,
'left'
)
->
where
(
$params
)
->
where
(
$params
)
->
order
(
$order_
)
->
order
(
$order_
)
->
limit
(
$pageSize
)
->
limit
(
$pageSize
)
...
...
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