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/LostOrderAdminController.java | 219 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 149 insertions(+), 70 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 92befeb..9fedd37 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
@@ -16,6 +16,8 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+import com.yeshi.fanli.controller.admin.utils.AdminUtils;
import com.yeshi.fanli.entity.bus.user.LostOrder;
import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.bus.user.UserInfo;
@@ -219,34 +221,6 @@
}
- /**
- * 楠岃瘉缁熻淇℃伅鍙傛暟
- * @param shwoType
- * @param startTime
- * @param endTime
- * @return
- */
- public String validateParams(Integer shwoType, String startTime, String endTime) {
-
- if (shwoType == null) {
- return "璇烽�夋嫨瑙嗗浘绫诲瀷";
- }
-
- if (shwoType == 1 && (StringUtil.isNullOrEmpty(startTime) && StringUtil.isNullOrEmpty(endTime))) {
- return "璇烽�夋嫨鏃堕棿鍖洪棿";
- }
-
- if (!StringUtil.isNullOrEmpty(startTime) && StringUtil.isNullOrEmpty(endTime)) {
- return "璇烽�夌粨鏉熸棩鏈�";
- }
-
- if (StringUtil.isNullOrEmpty(startTime) && !StringUtil.isNullOrEmpty(endTime)) {
- return "璇烽�夎捣濮嬫棩鏈�";
- }
-
- return null;
- }
-
/**
* 缁熻鎻愮幇鐢宠鎬绘鏁�
@@ -259,45 +233,107 @@
* @param out
*/
@RequestMapping(value = "getLostNum")
- public void getLostNum(String callback, Integer dateType, Integer state, String year, String startTime,
- String endTime, PrintWriter out) {
+ public void getLostNum(String callback, Integer dateType, String stateArray, String year,
+ String startTime, String endTime, PrintWriter out) {
- String validateMsg = validateParams(dateType, startTime, endTime);
+ String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime);
if (validateMsg != null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg));
return;
}
+
+ if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
+ startTime = null;
+ endTime = null;
+ }
+
+ List<Integer> channelList = null;
+ if (stateArray != null && stateArray.trim().length() > 0) {
+ Gson gson = new Gson();
+ channelList = gson.fromJson(stateArray, new TypeToken<ArrayList<Integer>>() {}.getType());
+ }
+
+
+ if (dateType == 1 && year != null) {
+ year = null; // 璁剧疆涓虹┖
+ } else if (dateType == 2) {
+ if (startTime != null)
+ startTime = null;
+
+ if (endTime != null)
+ endTime = null;
+
+ } else if (dateType == 3) {
+ if (year != null)
+ year = null;
+
+ if (startTime != null)
+ startTime = null;
+
+ if (endTime != null)
+ endTime = null;
+ }
+
+ Gson gson = new Gson();
+ Object objectDate = null;
+ List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
+
try {
+
- if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
- startTime = null;
- endTime = null;
+ 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,
+ startTime, endTime);
+
+
+ JSONObject innerList = new JSONObject();
+ if (state == 1) {
+ innerList.put("name", "鏈鐞�");
+ } else if (state == 2) {
+ innerList.put("name", "鎴愬姛");
+ } else if (state == 3) {
+ innerList.put("name", "澶辫触");
+ }
+
+ if (dateType != 3) {
+ innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));
+ } else {
+ // 骞磋鍥�
+ Map<String, Object> map = AdminUtils.yearsDataFactory(list);
+
+ if (objectDate == null) {
+ objectDate = map.get("date");
+ }
+ innerList.put("data", gson.toJson(map.get("value")));
+ }
+
+ line_list.add(innerList);
+ }
+
}
- List<Map<String, Object>> resultList =lostOrderService.countLostNum(dateType, state, year,
- startTime, endTime);
-
- if (resultList == null) {
- resultList = new ArrayList<Map<String,Object>>();
- }
-
- JSONObject innerList = new JSONObject();
- innerList.put("name", "鏁伴噺");
- innerList.put("data_list", resultList);
-
- JSONArray outList = new JSONArray();
- outList.add(innerList);
-
JSONObject data = new JSONObject();
- data.put("result_list", outList);
+ if (objectDate != null) {
+ data.put("xAxis_list", gson.toJson(objectDate));
+ } 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("绯荤粺寮傚父"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
e.printStackTrace();
}
+
}
/**
@@ -313,38 +349,81 @@
public void getAppealMoney(String callback, Integer dateType, String year, String startTime, String endTime,
PrintWriter out) {
- String validateMsg = validateParams(dateType, startTime, endTime);
+ String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime);
if (validateMsg != null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg));
return;
}
+
+ if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
+ startTime = null;
+ endTime = null;
+ }
+
+ if (dateType == 1 && year != null) {
+ year = null; // 璁剧疆涓虹┖
+ } else if (dateType == 2) {
+ if (startTime != null)
+ startTime = null;
+
+ if (endTime != null)
+ endTime = null;
+
+ } else if (dateType == 3) {
+ if (year != null)
+ year = null;
+
+ if (startTime != null)
+ startTime = null;
+
+ if (endTime != null)
+ endTime = null;
+ }
+
+ Gson gson = new Gson();
+ Object objectDate = null;
+ List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
+
try {
-
- if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
- startTime = null;
- endTime = null;
- }
- List<Map<String, Object>> resultList =lostOrderService.countAppealMoney(dateType, year, startTime, endTime);
- if (resultList == null) {
- resultList = new ArrayList<Map<String,Object>>();
+
+ JSONArray line_list = new JSONArray();
+
+ List<Map<String, Object>> list = lostOrderService.countAppealMoney(dateType, year, startTime, endTime);
+
+
+ JSONObject innerList = new JSONObject();
+ innerList.put("name", "鎬昏");
+
+ if (dateType != 3) {
+ innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));
+ } else {
+ // 骞磋鍥�
+ Map<String, Object> map = AdminUtils.yearsDataFactory(list);
+
+ if (objectDate == null) {
+ objectDate = map.get("date");
+ }
+ innerList.put("data", gson.toJson(map.get("value")));
}
- JSONObject innerList = new JSONObject();
- innerList.put("name", "閲戦");
- innerList.put("data_list", resultList);
-
- JSONArray outList = new JSONArray();
- outList.add(innerList);
-
+ line_list.add(innerList);
+
+
JSONObject data = new JSONObject();
- data.put("result_list", outList);
+ if (objectDate != null) {
+ data.put("xAxis_list", gson.toJson(objectDate));
+ } 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("绯荤粺寮傚父"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
e.printStackTrace();
}
}
--
Gitblit v1.8.0