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
7080021a
Commit
7080021a
authored
Mar 22, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新成交报告列表
parent
06569a88
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
Finance.php
application/index/controller/Finance.php
+4
-4
OBargainModel.php
application/model/OBargainModel.php
+2
-0
No files found.
application/index/controller/Finance.php
View file @
7080021a
...
@@ -38,12 +38,12 @@ class Finance extends Basic
...
@@ -38,12 +38,12 @@ class Finance extends Basic
$fields
=
'a.id,a.create_time,b.user_phone,b.user_name,d.internal_title,d.internal_address,a.commission,a.practical_fee'
;
$fields
=
'a.id,a.create_time,b.user_phone,b.user_name,d.internal_title,d.internal_address,a.commission,a.practical_fee'
;
$where
[
'a.father_id'
]
=
0
;
$where
[
'a.father_id'
]
=
0
;
$where
[
'c.is_del'
]
=
0
;
$where
[
'c.is_del'
]
=
0
;
// $where['a.check_status
'] = 0;
$where
[
'e.audit_level
'
]
=
0
;
$where
[
'a.status'
]
=
10
;
$where
[
'a.status'
]
=
10
;
//
if (!empty($this->params['check_status'])) {
if
(
!
empty
(
$this
->
params
[
'check_status'
]))
{
// $where['a.check_status
'] = $this->params['check_status'];
$where
[
'a.audit_level
'
]
=
$this
->
params
[
'check_status'
];
//
}
}
if
(
!
empty
(
$this
->
params
[
'status'
]))
{
if
(
!
empty
(
$this
->
params
[
'status'
]))
{
$where
[
'a.status'
]
=
20
;
$where
[
'a.status'
]
=
20
;
...
...
application/model/OBargainModel.php
View file @
7080021a
...
@@ -183,6 +183,7 @@ class OBargainModel extends Model
...
@@ -183,6 +183,7 @@ class OBargainModel extends Model
->
join
(
'o_report b'
,
'a.report_id = b.id'
,
'left'
)
->
join
(
'o_report b'
,
'a.report_id = b.id'
,
'left'
)
->
join
(
'o_order c'
,
'a.order_id = c.id'
,
'left'
)
->
join
(
'o_order c'
,
'a.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
(
'o_financial_audit e'
,
'e.bargain_id = a.id'
,
'left'
)
->
where
(
$params
)
->
where
(
$params
)
->
order
(
$order_
)
->
order
(
$order_
)
->
limit
(
$pageSize
)
->
limit
(
$pageSize
)
...
@@ -201,6 +202,7 @@ class OBargainModel extends Model
...
@@ -201,6 +202,7 @@ class OBargainModel extends Model
->
join
(
'o_report b'
,
'a.report_id = b.id'
,
'left'
)
->
join
(
'o_report b'
,
'a.report_id = b.id'
,
'left'
)
->
join
(
'o_order c'
,
'a.order_id = c.id'
,
'left'
)
->
join
(
'o_order c'
,
'a.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
(
'o_financial_audit e'
,
'e.bargain_id = a.id'
,
'left'
)
->
where
(
$params
)
->
where
(
$params
)
->
count
();
->
count
();
}
}
...
...
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