From 35f94becaa1ece93bae0398b18b5e3d94bf001ce Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 09 一月 2019 11:01:23 +0800
Subject: [PATCH] 资金明细列表BUG修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserMoneyDetailServiceImpl.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserMoneyDetailServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserMoneyDetailServiceImpl.java
index 66d82c5..1032961 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserMoneyDetailServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserMoneyDetailServiceImpl.java
@@ -95,7 +95,19 @@
list = tempList;
}
- if (list != null)
+ if (list != null) {
+ if (userMoneyDetailId != null&&list.size()>0) {
+ UserMoneyDetail umd = userMoneyDetailMapper.selectByPrimaryKey(userMoneyDetailId);
+ if (!TimeUtil.getGernalTime(umd.getCreateTime().getTime(), "yyyy-MM")
+ .equalsIgnoreCase(TimeUtil.getGernalTime(list.get(0).getCreateTime().getTime(), "yyyy-MM"))) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTimeInMillis(list.get(0).getCreateTime().getTime());
+ UserMoneyDetailHistoryVO vo = new UserMoneyDetailHistoryVO();
+ vo.setMonth(new UserMonthMoneyVO(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH) + 1));
+ finalList.add(vo);
+ }
+
+ }
for (int i = 0; i < list.size(); i++) {
if (i > 0 && !TimeUtil.getGernalTime(list.get(i - 1).getCreateTime().getTime(), "yyyy-MM")
.equalsIgnoreCase(TimeUtil.getGernalTime(list.get(i).getCreateTime().getTime(), "yyyy-MM"))) {// 鏈潯鏁版嵁涓庝笂鏉℃暟鎹笉鏄悓涓�鏈堝垯鎻掑叆鏈堜唤
@@ -109,6 +121,7 @@
vo.setDetail(list.get(i));
finalList.add(vo);
}
+ }
// 缁熻鏈堣祫閲�
@@ -137,7 +150,8 @@
keys = monthMap.keySet().iterator();
while (keys.hasNext()) {
Integer key = keys.next();
- finalList.get(key).getMonth().setExpend(voList.get(p).getExpend());
+ // 鍘婚櫎鏀嚭璐熷彿
+ finalList.get(key).getMonth().setExpend(voList.get(p).getExpend().replace("-", ""));
finalList.get(key).getMonth().setIncome(voList.get(p).getIncome());
p++;
}
--
Gitblit v1.8.0