From 85b08b045c79180a81abd43be0ac7fd2ae50cd46 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 08 一月 2019 16:41:14 +0800
Subject: [PATCH] 后台数据统计+ 订单接口统计类型调整
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 74 +++++++++++++++++++++++++++++-------
1 files changed, 59 insertions(+), 15 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 1bf34dc..1e1dcd2 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
@@ -15,6 +15,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.springframework.stereotype.Controller;
@@ -1436,28 +1437,41 @@
* @param out
*/
@RequestMapping(value = "getAuditTotal")
- public void getAuditTotal(String callback,Integer state, Integer shwoType, String year,
+ public void getAuditTotal(String callback,Integer state, Integer dateType, String year,
String startTime, String endTime, PrintWriter out) {
- String validateMsg = validateParams(shwoType, startTime, endTime);
+ String validateMsg = validateParams(dateType, startTime, endTime);
if (validateMsg != null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg));
return;
}
- if (shwoType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
+ if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
startTime = null;
endTime = null;
}
try {
- List<Map<String, Object>> resultList = extractAuditRecordService.countAuditTotal(state, shwoType,
+ List<Map<String, Object>> resultList = extractAuditRecordService.countAuditTotal(state, dateType,
year, startTime, endTime);
+ JSONObject innerList = new JSONObject();
+ if (state == null) {
+ innerList.put("name", "鎬昏");
+ } else if (state == 1) {
+ innerList.put("name", "閫氳繃鏁�");
+ } else if (state == 2) {
+ innerList.put("name", "椹冲洖鏁�");
+ }
+ innerList.put("data_list", resultList);
+
+ JSONArray outList = new JSONArray();
+ outList.add(innerList);
+
JSONObject data = new JSONObject();
- data.put("result_list", resultList);
+ data.put("result_list", outList);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
@@ -1480,28 +1494,43 @@
* @param out
*/
@RequestMapping(value = "getExtractMoney")
- public void getExtractMoney(String callback,Integer state, Integer shwoType, String year,
+ public void getExtractMoney(String callback,Integer state, Integer dateType, String year,
String startTime, String endTime, PrintWriter out) {
- String validateMsg = validateParams(shwoType, startTime, endTime);
+ String validateMsg = validateParams(dateType, startTime, endTime);
if (validateMsg != null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg));
return;
}
- if (shwoType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
+ if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
startTime = null;
endTime = null;
}
try {
- List<Map<String, Object>> resultList = extractAuditRecordService.countExtractMoney(state, shwoType,
+ List<Map<String, Object>> resultList = extractAuditRecordService.countExtractMoney(state, dateType,
year, startTime, endTime);
+ JSONObject innerList = new JSONObject();
+ if (state == null) {
+ innerList.put("name", "鎬昏");
+ } else if (state == 0) {
+ innerList.put("name", "寰呭鏍�");
+ } else if (state == 1) {
+ innerList.put("name", "閫氳繃");
+ } else if (state == 2) {
+ innerList.put("name", "椹冲洖");
+ }
+ innerList.put("data_list", resultList);
+
+ JSONArray outList = new JSONArray();
+ outList.add(innerList);
+
JSONObject data = new JSONObject();
- data.put("result_list", resultList);
+ data.put("result_list", outList);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
@@ -1523,28 +1552,43 @@
* @param out
*/
@RequestMapping(value = "getExtractApplyNumber")
- public void getExtractApplyNumber(String callback,Integer state, Integer shwoType, String year,
+ public void getExtractApplyNumber(String callback,Integer state, Integer dateType, String year,
String startTime, String endTime, PrintWriter out) {
- String validateMsg = validateParams(shwoType, startTime, endTime);
+ String validateMsg = validateParams(dateType, startTime, endTime);
if (validateMsg != null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg));
return;
}
- if (shwoType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
+ if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
startTime = null;
endTime = null;
}
try {
- List<Map<String, Object>> resultList = extractAuditRecordService.countExtractApplyNumber(state, shwoType,
+ List<Map<String, Object>> resultList = extractAuditRecordService.countExtractApplyNumber(state, dateType,
year, startTime, endTime);
+ JSONObject innerList = new JSONObject();
+ if (state == null) {
+ innerList.put("name", "鎬昏");
+ } else if (state == 0) {
+ innerList.put("name", "寰呭鏍�");
+ } else if (state == 1) {
+ innerList.put("name", "閫氳繃");
+ } else if (state == 2) {
+ innerList.put("name", "椹冲洖");
+ }
+ innerList.put("data_list", resultList);
+
+ JSONArray outList = new JSONArray();
+ outList.add(innerList);
+
JSONObject data = new JSONObject();
- data.put("result_list", resultList);
+ data.put("result_list", outList);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
--
Gitblit v1.8.0