From 233b0814bbb73b5c791ebe3643f4bd91ba2fa959 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 15 一月 2019 09:06:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
index cfb1355..147dba8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
@@ -1498,7 +1498,7 @@
year, startTime, endTime);
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 = AdminUtils.yearsDataFactory(list);
@@ -1585,7 +1585,7 @@
year, startTime, endTime);
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 = AdminUtils.yearsDataFactory(list);
@@ -1672,7 +1672,7 @@
year, startTime, endTime);
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 = AdminUtils.yearsDataFactory(list);
--
Gitblit v1.8.0