From a79be5c75d4409bd14a36b648c1a398b409cad65 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 08 一月 2019 16:48:39 +0800
Subject: [PATCH] Merge branch 'div1'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractAuditRecordServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractAuditRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractAuditRecordServiceImpl.java
index 8860463..967cc49 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractAuditRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractAuditRecordServiceImpl.java
@@ -162,9 +162,9 @@
if (startTime.equals(endTime)) {
Map<String, Object> map = list.get(0);
- Object total = map.get("total");
+ Object total = map.get("showValue");
if (total == null) {
- map.put("total", 0);
+ map.put("showValue", 0);
}
listObject.add(map);
return listObject;
@@ -186,7 +186,7 @@
Object createDate = map.get("showDate");
String month = createDate.toString();
if (plusDay.equalsIgnoreCase(month)) {
- total = map.get("total");
+ total = map.get("showValue");
break;
}
}
@@ -194,7 +194,7 @@
if (total == null) {
total = 0;
}
- mapObject.put("total", total);
+ mapObject.put("showValue", total);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy/MM/dd");
@@ -225,7 +225,7 @@
Object createDate = map.get("showDate");
String month = createDate.toString();
if ((i + "").equalsIgnoreCase(month) || i == Integer.parseInt(month)) {
- total = map.get("total");
+ total = map.get("showValue");
break;
}
}
@@ -233,7 +233,7 @@
if (total == null) {
total = 0;
}
- mapObject.put("total", total);
+ mapObject.put("showValue", total);
mapObject.put("showDate", i + "鏈�");
@@ -248,12 +248,12 @@
for (int i = 0; i < list.size(); i++) {
Map<String, Object> map = list.get(i);
- Object total = map.get("total");
+ Object total = map.get("showValue");
if (total == null) {
total = 0;
}
- map.put("total", total);
+ map.put("showValue", total);
listObject.add(map);
}
--
Gitblit v1.8.0