From ee88b54979c633a4ade518d4c124a2d07d378562 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 11 十月 2019 10:56:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/LostOrderAdminController.java | 30 ++++--------------------------
1 files changed, 4 insertions(+), 26 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/LostOrderAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/LostOrderAdminController.java
index 9d21266..16d8c94 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/LostOrderAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/LostOrderAdminController.java
@@ -15,6 +15,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.LostOrder;
import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.bus.user.UserInfo;
@@ -214,7 +215,6 @@
@RequestMapping(value = "getLostNum")
public void getLostNum(String callback, Integer dateType, String stateArray, 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));
@@ -226,7 +226,6 @@
endTime = null;
}
-
List<Integer> channelList = null;
if (stateArray != null && stateArray.trim().length() > 0) {
Gson gson = new Gson();
@@ -257,20 +256,14 @@
Gson gson = new Gson();
Object objectDate = null;
List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
-
try {
-
-
JSONArray line_list = new JSONArray();
if (channelList == null || channelList.size() == 0) {
} else {
for (Integer state : channelList) {
-
- List<Map<String, Object>> list = lostOrderService.countLostNum(dateType, state, year,
+ List<ChartTDO> list = lostOrderService.countLostNum(dateType, state, year,
startTime, endTime);
-
-
JSONObject innerList = new JSONObject();
if (state == 1) {
innerList.put("name", "鏈鐞�");
@@ -285,7 +278,6 @@
} else {
// 骞磋鍥�
Map<String, Object> map = AdminUtils.yearsDataFactory(list);
-
if (objectDate == null) {
objectDate = map.get("date");
}
@@ -294,7 +286,6 @@
line_list.add(innerList);
}
-
}
JSONObject data = new JSONObject();
@@ -305,9 +296,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();
@@ -363,17 +352,11 @@
Gson gson = new Gson();
Object objectDate = null;
List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
-
try {
-
-
JSONArray line_list = new JSONArray();
-
- List<Map<String, Object>> list = lostOrderService.countAppealMoney(dateType, year, startTime, endTime);
-
-
+ List<ChartTDO> list = lostOrderService.countAppealMoney(dateType, year, startTime, endTime);
JSONObject innerList = new JSONObject();
- innerList.put("name", "鎬昏");
+ innerList.put("name", "鎬昏");
if (dateType != 3) {
innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));
@@ -386,9 +369,7 @@
}
innerList.put("data", gson.toJson(map.get("value")));
}
-
line_list.add(innerList);
-
JSONObject data = new JSONObject();
if (objectDate != null) {
@@ -396,11 +377,8 @@
} else {
data.put("xAxis_list", gson.toJson(dateList));
}
-
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