...
|
...
|
@@ -157,11 +157,11 @@ public class AssetsService { |
|
|
|
|
|
//TODO 内存中计算total
|
|
|
summary.setGoods_income(sum_goods_income);
|
|
|
summary.setGoodsIncome(String.valueOf(sum_goods_income));
|
|
|
summary.setGoodsIncome(sum_goods_income.setScale(2,BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
summary.setCompensate_income(compensate_income);
|
|
|
summary.setCompensateIncome(String.valueOf(compensate_income));
|
|
|
summary.setCompensateIncome(compensate_income.setScale(2,BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
summary.setTotal_income(sum_goods_income.add(compensate_income));
|
|
|
summary.setTotalIncome(String.valueOf(compensate_income));
|
|
|
summary.setTotalIncome(compensate_income.setScale(2,BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
return summary;
|
|
|
}
|
|
|
});
|
...
|
...
|
|