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
f90ae5d7
Commit
f90ae5d7
authored
Aug 07, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
where
parent
b04a9f28
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
Finance.php
application/index/controller/Finance.php
+4
-1
OfficeBargain.php
application/index/controller/OfficeBargain.php
+4
-1
No files found.
application/index/controller/Finance.php
View file @
f90ae5d7
...
@@ -345,7 +345,10 @@ class Finance extends Basic
...
@@ -345,7 +345,10 @@ class Finance extends Basic
$excel_data
[
$k
][
'income_money'
]
=
$m_real
->
sumField
(
'money'
,[
'bargain_id'
=>
$v
[
'id'
],
'is_del'
=>
0
]);
$excel_data
[
$k
][
'income_money'
]
=
$m_real
->
sumField
(
'money'
,[
'bargain_id'
=>
$v
[
'id'
],
'is_del'
=>
0
]);
$excel_data
[
$k
][
'subtract'
]
=
$v
[
'commission'
]
-
$excel_data
[
$k
][
'income_money'
];
$excel_data
[
$k
][
'subtract'
]
=
$v
[
'commission'
]
-
$excel_data
[
$k
][
'income_money'
];
$agent_data
=
$this
->
m_bargain
->
agentBargainAll
(
'b.name'
,
[
'a.id'
=>
$v
[
'id'
],
'a.status'
=>
[
'<>'
,
30
]]);
$where_role
[]
=
[
'EXP'
,
'a.id = '
.
$v
[
'id'
]
.
' OR a.father_id = '
.
$v
[
'id'
]];
$where_role
[
'a.status'
]
=
[
'<>'
,
30
];
$where_role
[
'a.role'
]
=
3
;
$agent_data
=
$this
->
m_bargain
->
agentBargainAll
(
'b.name'
,
$where_role
);
if
(
$agent_data
)
{
if
(
$agent_data
)
{
$name_string
=
''
;
$name_string
=
''
;
foreach
(
$agent_data
as
$vv
)
{
foreach
(
$agent_data
as
$vv
)
{
...
...
application/index/controller/OfficeBargain.php
View file @
f90ae5d7
...
@@ -324,7 +324,10 @@ class OfficeBargain extends Basic
...
@@ -324,7 +324,10 @@ class OfficeBargain extends Basic
$excel_data
[
$k
][
'income_money'
]
=
$m_real
->
sumField
(
'money'
,[
'bargain_id'
=>
$v
[
'id'
],
'is_del'
=>
0
]);
$excel_data
[
$k
][
'income_money'
]
=
$m_real
->
sumField
(
'money'
,[
'bargain_id'
=>
$v
[
'id'
],
'is_del'
=>
0
]);
$excel_data
[
$k
][
'subtract'
]
=
$v
[
'commission'
]
-
$excel_data
[
$k
][
'income_money'
];
$excel_data
[
$k
][
'subtract'
]
=
$v
[
'commission'
]
-
$excel_data
[
$k
][
'income_money'
];
$agent_data
=
$this
->
m_bargain
->
agentBargainAll
(
'b.name'
,
[
'a.id'
=>
$v
[
'id'
],
'a.status'
=>
[
'<>'
,
30
]]);
$where_role
[]
=
[
'EXP'
,
'a.id = '
.
$v
[
'id'
]
.
' OR a.father_id = '
.
$v
[
'id'
]];
$where_role
[
'a.status'
]
=
[
'<>'
,
30
];
$where_role
[
'a.role'
]
=
3
;
$agent_data
=
$this
->
m_bargain
->
agentBargainAll
(
'b.name'
,
$where_role
);
if
(
$agent_data
)
{
if
(
$agent_data
)
{
$name_string
=
''
;
$name_string
=
''
;
foreach
(
$agent_data
as
$vv
)
{
foreach
(
$agent_data
as
$vv
)
{
...
...
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