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
93b253b1
Commit
93b253b1
authored
Oct 09, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
b86ac67e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
AmercementService.php
application/index/service/AmercementService.php
+2
-2
No files found.
application/index/service/AmercementService.php
View file @
93b253b1
...
...
@@ -503,8 +503,8 @@ class AmercementService
$result_
[
'list'
]
=
$result
;
$result_
[
'total'
]
=
$result
=
$this
->
m_amercement
->
getAmercementTotal
(
$conditions
);
$money
=
$this
->
m_amercement
->
getAmercement
Info
(
$conditions
,
'sum(forfeit_penalty) as forfeit_penalty,sum(money_sum) as
money_sum'
);
$result_
[
'money'
]
=
$money
[
'forfeit_penalty'
]
+
$money
[
'money_sum'
]
.
''
;
$money
=
$this
->
m_amercement
->
getAmercement
ListSum
(
$conditions
,
'
money_sum'
);
$result_
[
'money'
]
=
$money
.
''
;
return
$result_
;
}
...
...
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