From 46906f31ebc49cde75b65d71bb06f228997148dc Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 24 十二月 2018 16:52:03 +0800
Subject: [PATCH] 优化资金明细
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserMoneyDetailServiceImpl.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 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 c8c730c..deda80a 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
@@ -43,9 +43,20 @@
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));
+ vo.setMonth(new UserMonthMoneyVO(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH) + 1));
finalList.add(vo);
+ } else {
+ if (maxTime != null) {//
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTimeInMillis(maxTime.getTime());
+ UserMoneyDetailHistoryVO vo = new UserMoneyDetailHistoryVO();
+ vo.setMonth(new UserMonthMoneyVO(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH) + 1));
+ vo.getMonth().setExpend("0");
+ vo.getMonth().setIncome("0");
+ finalList.add(vo);
+ }
}
+
} else {// 浜屾璇锋眰
int size = 21;
@@ -89,7 +100,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)+1));
+ vo.setMonth(new UserMonthMoneyVO(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH) + 1));
finalList.add(vo);
}
UserMoneyDetailHistoryVO vo = new UserMoneyDetailHistoryVO();
@@ -100,11 +111,11 @@
// 缁熻鏈堣祫閲�
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));
- }
+ if (finalList.size() > 1)
+ for (int i = 0; i < finalList.size(); i++) {
+ if (finalList.get(i).getMonth() != null)
+ monthMap.put(i, finalList.get(i));
+ }
if (!monthMap.isEmpty()) {
List<String> dateFormat = new ArrayList<>();
--
Gitblit v1.8.0