Commit 93b253b1 authored by hujun's avatar hujun

1

parent b86ac67e
......@@ -503,8 +503,8 @@ class AmercementService
$result_['list'] = $result;
$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->getAmercementListSum($conditions, 'money_sum');
$result_['money'] = $money . '';
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