|
|
@@ -65,14 +65,14 @@ class ExpendController extends BaseController
|
|
|
}
|
|
|
if (isset($arr[$staffId])) {
|
|
|
//总支出
|
|
|
- $arr[$staffId]['totalAmount'] = bcadd($arr[$staffId]['totalAmount'], $currentAmount);
|
|
|
+ $arr[$staffId]['totalAmount'] = floatval(bcadd($arr[$staffId]['totalAmount'], $currentAmount));
|
|
|
//已报销
|
|
|
$arr[$staffId]['hasAmount'] = floatval(bcadd($arr[$staffId]['hasAmount'], $hasAmount));
|
|
|
//待报销
|
|
|
$arr[$staffId]['amount'] = floatval(bcadd($arr[$staffId]['amount'], $unAmount));
|
|
|
$arr[$staffId]['num'] = bcadd($arr[$staffId]['num'], 1);
|
|
|
} else {
|
|
|
- $arr[$staffId]['totalAmount'] = $currentAmount;
|
|
|
+ $arr[$staffId]['totalAmount'] = floatval($currentAmount);
|
|
|
$arr[$staffId]['hasAmount'] = floatval($hasAmount);
|
|
|
$arr[$staffId]['amount'] = floatval($unAmount);
|
|
|
$arr[$staffId]['staffName'] = $staffName;
|