Skip to content

T
tl_estate
Commit d8a19696 authored by hujun's avatar hujun
Browse files
Options

''

parent d4f13de2
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
application/index/service/AmercementService.php
View file @ d8a19696
...@@ -502,8 +502,9 @@ class AmercementService ...@@ -502,8 +502,9 @@ class AmercementService
} }
$result_['list'] = $result; $result_['list'] = $result;
$result_['total'] = $result = $this->m_amercement->getAmercementTotal($conditions); $result_['total'] = $result = $this->m_amercement->getAmercementTotal($conditions);
$money = $this->m_amercement->getAmercementInfo($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->getAmercementInfo($conditions, 'sum(forfeit_penalty) as forfeit_penalty,sum(money_sum) as money_sum');
$result_['money'] = $money['forfeit_penalty'] + $money['money_sum'] . '';
return $result_; return $result_;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment