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
b1476057
Commit
b1476057
authored
Jun 26, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
money
parent
3523689b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
OfficeBargain.php
application/index/controller/OfficeBargain.php
+1
-1
OfficeORealIncome.php
application/model/OfficeORealIncome.php
+2
-1
No files found.
application/index/controller/OfficeBargain.php
View file @
b1476057
...
@@ -295,7 +295,7 @@ class OfficeBargain extends Basic
...
@@ -295,7 +295,7 @@ class OfficeBargain extends Basic
if
(
$is_show
)
{
if
(
$is_show
)
{
$data
[
'data'
][
'total_commission'
]
=
$this
->
m_bargain
->
getBargainListSum
(
'commission'
,
$where
);
$data
[
'data'
][
'total_commission'
]
=
$this
->
m_bargain
->
getBargainListSum
(
'commission'
,
$where
);
$data
[
'data'
][
'total_income_money'
]
=
$m_real
->
getIncomeListSum
(
'
e
.money'
,
$where
);
$data
[
'data'
][
'total_income_money'
]
=
$m_real
->
getIncomeListSum
(
'
g
.money'
,
$where
);
}
else
{
}
else
{
$data
[
'data'
][
'total_commission'
]
=
0
;
$data
[
'data'
][
'total_commission'
]
=
0
;
$data
[
'data'
][
'total_income_money'
]
=
0
;
$data
[
'data'
][
'total_income_money'
]
=
0
;
...
...
application/model/OfficeORealIncome.php
View file @
b1476057
...
@@ -115,7 +115,8 @@ class OfficeORealIncome extends BaseModel
...
@@ -115,7 +115,8 @@ class OfficeORealIncome extends BaseModel
*/
*/
public
function
getIncomeListSum
(
$field
=
''
,
$params
=
''
)
public
function
getIncomeListSum
(
$field
=
''
,
$params
=
''
)
{
{
return
$this
->
alias
(
'e'
)
return
$this
->
field
(
$field
)
->
alias
(
'g'
)
->
join
(
'office_o_bargain a'
,
'g.bargain_id = a.id'
,
'left'
)
->
join
(
'office_o_report b'
,
'a.report_id = b.id'
,
'left'
)
->
join
(
'office_o_report b'
,
'a.report_id = b.id'
,
'left'
)
->
join
(
'office_o_order c'
,
'a.order_id = c.id'
,
'left'
)
->
join
(
'office_o_order c'
,
'a.order_id = c.id'
,
'left'
)
->
join
(
'office_g_room d'
,
'c.house_id = d.id'
,
'left'
)
->
join
(
'office_g_room d'
,
'c.house_id = d.id'
,
'left'
)
...
...
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