From 0c78c7aaeaa5a427bc8a5c5faf3cd6bbb589c2da Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 08 十月 2019 12:08:38 +0800
Subject: [PATCH] map 改造
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 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 fa2417c..7e853d1 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
@@ -24,6 +24,7 @@
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.yeshi.fanli.controller.admin.utils.AdminUtils;
+import com.yeshi.fanli.dto.ChartTDO;
import com.yeshi.fanli.entity.bus.user.Extract;
import com.yeshi.fanli.entity.bus.user.ExtractAuditRecord;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
@@ -821,9 +822,8 @@
innerList.put("name", "椹冲洖鏁�");
}
- List<Map<String, Object>> list = extractAuditRecordService.countAuditTotal(state, dateType, year,
+ List<ChartTDO> list = extractAuditRecordService.countAuditTotal(state, dateType, year,
startTime, endTime);
-
if (dateType != 3) {
innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));
} else {
@@ -835,7 +835,6 @@
}
innerList.put("data", gson.toJson(map.get("value")));
}
-
line_list.add(innerList);
}
@@ -847,9 +846,7 @@
}
data.put("line_list", line_list);
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
e.printStackTrace();
@@ -875,7 +872,6 @@
@RequestMapping(value = "getExtractApplyMoney")
public void getExtractApplyMoney(String callback, Integer dateType, String year, String startTime, String endTime,
PrintWriter out) {
-
String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime);
if (validateMsg != null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg));
@@ -908,12 +904,10 @@
List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
Gson gson = new Gson();
- JSONArray line_list = new JSONArray();
-
JSONObject innerList = new JSONObject();
innerList.put("name", "鎬昏");
- List<Map<String, Object>> list = extractAuditRecordService.countExtractApplyMoney(null, dateType, year,
+ List<ChartTDO> list = extractAuditRecordService.countExtractApplyMoney(null, dateType, year,
startTime, endTime);
if (dateType != 3) {
@@ -928,6 +922,7 @@
innerList.put("data", gson.toJson(map.get("value")));
}
+ JSONArray line_list = new JSONArray();
line_list.add(innerList);
JSONObject data = new JSONObject();
@@ -938,9 +933,7 @@
}
data.put("line_list", line_list);
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
e.printStackTrace();
@@ -968,7 +961,6 @@
@RequestMapping(value = "getExtractApplyNumber")
public void getExtractApplyNumber(String callback, Integer state, Integer dateType, String year, String startTime,
String endTime, PrintWriter out) {
-
String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime);
if (validateMsg != null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg));
@@ -996,17 +988,15 @@
}
try {
-
Object objectDate = null;
+ Gson gson = new Gson();
List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
- Gson gson = new Gson();
- JSONArray line_list = new JSONArray();
JSONObject innerList = new JSONObject();
innerList.put("name", "鎬昏");
- List<Map<String, Object>> list = extractAuditRecordService.countExtractApplyNumber(null, dateType, year,
+ List<ChartTDO> list = extractAuditRecordService.countExtractApplyNumber(null, dateType, year,
startTime, endTime);
if (dateType != 3) {
@@ -1021,6 +1011,7 @@
innerList.put("data", gson.toJson(map.get("value")));
}
+ JSONArray line_list = new JSONArray();
line_list.add(innerList);
JSONObject data = new JSONObject();
@@ -1031,9 +1022,7 @@
}
data.put("line_list", line_list);
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
e.printStackTrace();
--
Gitblit v1.8.0