From 16da7b547decb88029b267fa7c68bd7c3396e734 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 24 十二月 2018 14:04:28 +0800
Subject: [PATCH] zhanghumingxi
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserMoneyDetailServiceImpl.java | 46 ++++++++++++++++++++++++----------------------
1 files changed, 24 insertions(+), 22 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 59a9273..c8c730c 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
@@ -3,7 +3,6 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -44,7 +43,7 @@
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)));
+ vo.setMonth(new UserMonthMoneyVO(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH)+1));
finalList.add(vo);
}
} else {// 浜屾璇锋眰
@@ -90,7 +89,7 @@
Calendar calendar = Calendar.getInstance();
calendar.setTimeInMillis(list.get(i).getCreateTime().getTime());
UserMoneyDetailHistoryVO vo = new UserMoneyDetailHistoryVO();
- vo.setMonth(new UserMonthMoneyVO(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH)));
+ vo.setMonth(new UserMonthMoneyVO(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH)+1));
finalList.add(vo);
}
UserMoneyDetailHistoryVO vo = new UserMoneyDetailHistoryVO();
@@ -101,31 +100,34 @@
// 缁熻鏈堣祫閲�
Map<Integer, UserMoneyDetailHistoryVO> monthMap = new TreeMap<>();
+ if(finalList.size()>1)
for (int i = 0; i < finalList.size(); i++) {
if (finalList.get(i).getMonth() != null)
monthMap.put(i, finalList.get(i));
}
- List<String> dateFormat = new ArrayList<>();
- Iterator<Integer> keys = monthMap.keySet().iterator();
- while (keys.hasNext()) {
- Integer key = keys.next();
- String date = "";
- date += monthMap.get(key).getMonth().getYear();
- date += "-";
- date += (monthMap.get(key).getMonth().getMonth() + "").length() < 2
- ? "0" + monthMap.get(key).getMonth().getMonth() : monthMap.get(key).getMonth().getMonth();
- dateFormat.add(date);
- }
- List<UserMonthMoneyVO> voList = userMoneyDetailMapper.selectMonthMoneyByUid(uid, dateFormat);
+ if (!monthMap.isEmpty()) {
+ List<String> dateFormat = new ArrayList<>();
+ Iterator<Integer> keys = monthMap.keySet().iterator();
+ while (keys.hasNext()) {
+ Integer key = keys.next();
+ String date = "";
+ date += monthMap.get(key).getMonth().getYear();
+ date += "-";
+ date += (monthMap.get(key).getMonth().getMonth() + "").length() < 2
+ ? "0" + monthMap.get(key).getMonth().getMonth() : monthMap.get(key).getMonth().getMonth();
+ dateFormat.add(date);
+ }
+ List<UserMonthMoneyVO> voList = userMoneyDetailMapper.selectMonthMoneyByUid(uid, dateFormat);
- int p = 0;
- keys = monthMap.keySet().iterator();
- while (keys.hasNext()) {
- Integer key = keys.next();
- finalList.get(key).getMonth().setExpend(voList.get(p).getExpend());
- finalList.get(key).getMonth().setIncome(voList.get(p).getIncome());
- p++;
+ int p = 0;
+ keys = monthMap.keySet().iterator();
+ while (keys.hasNext()) {
+ Integer key = keys.next();
+ finalList.get(key).getMonth().setExpend(voList.get(p).getExpend());
+ finalList.get(key).getMonth().setIncome(voList.get(p).getIncome());
+ p++;
+ }
}
return finalList;
}
--
Gitblit v1.8.0