From ab9e60fa9a8e43d797446730a5dc9ebfb6b3f4e6 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期四, 27 六月 2019 09:48:17 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinDetailServiceImpl.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinDetailServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinDetailServiceImpl.java index e97725b..8906804 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinDetailServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinDetailServiceImpl.java @@ -170,9 +170,13 @@ keys = monthMap.keySet().iterator(); while (keys.hasNext()) { Integer key = keys.next(); + + BigDecimal expend = new BigDecimal(voList.get(p).getExpend()); + BigDecimal income = new BigDecimal(voList.get(p).getIncome()); + // 鍘婚櫎鏀嚭璐熷彿 - finalList.get(key).getMonth().setExpend(voList.get(p).getExpend().replace("-", "")); - finalList.get(key).getMonth().setIncome(voList.get(p).getIncome()); + finalList.get(key).getMonth().setExpend(expend.setScale(2).toString().replace("-", "")); + finalList.get(key).getMonth().setIncome(income.setScale(2).toString()); p++; } } -- Gitblit v1.8.0