From d28bed1a1275131a5ca37f7da37961e2b518ac07 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 13:44:00 +0800
Subject: [PATCH] 淘礼金创建异常处理
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/utils/AdminUtils.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/utils/AdminUtils.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/utils/AdminUtils.java
index 74016b7..da98543 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/utils/AdminUtils.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/utils/AdminUtils.java
@@ -13,6 +13,7 @@
import com.google.gson.Gson;
import com.yeshi.fanli.util.StringUtil;
+
public class AdminUtils {
/**
@@ -93,12 +94,14 @@
- public static List<Object> dayOrMonthDataFactory(List<String> listDate , List<Map<String, Object>> list) throws Exception {
+ public static List<Object> dayOrMonthDataFactory(Integer dateType, List<String> listDate ,
+ List<Map<String, Object>> list) throws Exception {
List<Object> resultList = new ArrayList<Object>();
if (list != null && list.size() > 0) {
for (int i = 0; i < listDate.size(); i++) {
+
Object showValue = null;
if (list != null && list.size() > 0) {
// 鏃ユ湡鍖归厤璧嬪��
@@ -106,15 +109,21 @@
Map<String, Object> map = list.get(j);
String showDate = listDate.get(i);
- Object reslutDate = map.get("showDate");
- String month = reslutDate.toString();
+ if (dateType == 2 && Integer.parseInt(showDate) < 10 ) {
+ showDate = "0" + showDate;
+ }
- if (showDate.equalsIgnoreCase(month)) {
+ Object reslutDate = map.get("showDate");
+ String reslutTime = reslutDate.toString();
+
+ if (showDate.equalsIgnoreCase(reslutTime)) {
showValue = map.get("showValue");
break;
}
+
}
}
+
if (showValue == null) {
showValue = 0;
@@ -149,7 +158,7 @@
innerList.put("name", "鎬昏");
if (dateType != 3) {
- innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateList, list)));
+ innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));
} else {
// 骞磋鍥�
Map<String, Object> map = yearsDataFactory(list);
--
Gitblit v1.8.0