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
d9343011
Commit
d9343011
authored
Aug 06, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
财务审核列表增加分佣方姓名搜索
parent
26a0c849
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
Finance.php
application/index/controller/Finance.php
+6
-1
OBargainModel.php
application/model/OBargainModel.php
+4
-0
No files found.
application/index/controller/Finance.php
View file @
d9343011
...
...
@@ -65,7 +65,7 @@ class Finance extends Basic
$pageSize
=
empty
(
$this
->
params
[
'pageSize'
])
?
15
:
$this
->
params
[
'pageSize'
];
$check_status
=
$this
->
params
[
'check_status'
];
$fields
=
'a.id,a.create_time,a.trade_type,b.user_phone,b.user_name,d.internal_title,d.internal_address,
a.commission,a.practical_fee,a.scale_fee,a.order_no,a.order_id,content,house_number,a.is_open'
;
a.commission,a.practical_fee,a.scale_fee,a.order_no,a.order_id,content,house_number,a.is_open
,a.agent_id
'
;
$where
[
'a.father_id'
]
=
0
;
// $where['c.is_del'] = 0;
$where
[
'a.status'
]
=
11
;
...
...
@@ -116,6 +116,11 @@ class Finance extends Basic
$where
[
'f.name'
]
=
[
'LIKE'
,
'%'
.
$this
->
params
[
'agent_name'
]
.
'%'
];
}
//分佣方姓名
if
(
!
empty
(
$this
->
params
[
'partial_name'
]))
{
$where
[
'e.name'
]
=
[
'LIKE'
,
'%'
.
$this
->
params
[
'partial_name'
]
.
'%'
];
}
switch
(
$check_status
)
{
case
2
:
//成交报告列表-第二级审核
...
...
application/model/OBargainModel.php
View file @
d9343011
...
...
@@ -359,6 +359,7 @@ class OBargainModel extends Model
->
join
(
'o_order c'
,
'a.order_id = c.id'
,
'left'
)
->
join
(
'g_houses d'
,
'c.house_id = d.id'
,
'left'
)
->
join
(
'a_agents f'
,
'b.report_agent_id=f.id'
,
'left'
)
->
join
(
'a_agents e'
,
'a.agent_id=e.id'
,
'left'
)
->
where
(
$params
)
->
having
(
'count(e.order_id) = 1'
)
->
order
(
$order_
)
...
...
@@ -372,6 +373,7 @@ class OBargainModel extends Model
->
join
(
'o_order c'
,
'a.order_id = c.id'
,
'left'
)
->
join
(
'g_houses d'
,
'c.house_id = d.id'
,
'left'
)
->
join
(
'a_agents f'
,
'b.report_agent_id=f.id'
,
'left'
)
->
join
(
'a_agents e'
,
'a.agent_id=e.id'
,
'left'
)
->
where
(
$params
)
->
group
(
'a.id'
)
->
order
(
$order_
)
...
...
@@ -419,6 +421,7 @@ class OBargainModel extends Model
->
join
(
'o_order c'
,
'a.order_id = c.id'
,
'left'
)
->
join
(
'g_houses d'
,
'c.house_id = d.id'
,
'left'
)
->
join
(
'a_agents f'
,
'b.report_agent_id=f.id'
,
'left'
)
->
join
(
'a_agents e'
,
'a.agent_id=e.id'
,
'left'
)
->
where
(
$params
)
->
having
(
'count(e.order_id) = 1'
)
->
group
(
'e.order_id'
)
...
...
@@ -429,6 +432,7 @@ class OBargainModel extends Model
->
join
(
'o_order c'
,
'a.order_id = c.id'
,
'left'
)
->
join
(
'g_houses d'
,
'c.house_id = d.id'
,
'left'
)
->
join
(
'a_agents f'
,
'b.report_agent_id=f.id'
,
'left'
)
->
join
(
'a_agents e'
,
'a.agent_id=e.id'
,
'left'
)
->
where
(
$params
)
->
group
(
'a.id'
)
->
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