From e1cc0d03fadc2d251d36c0dc3650f75e830d5363 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 07 四月 2022 19:12:42 +0800
Subject: [PATCH] 功能完善
---
app/src/main/java/com/yeshi/makemoney/app/controller/admin/money/ExtractAdminController.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/app/src/main/java/com/yeshi/makemoney/app/controller/admin/money/ExtractAdminController.java b/app/src/main/java/com/yeshi/makemoney/app/controller/admin/money/ExtractAdminController.java
index 44ecc22..14bbf03 100644
--- a/app/src/main/java/com/yeshi/makemoney/app/controller/admin/money/ExtractAdminController.java
+++ b/app/src/main/java/com/yeshi/makemoney/app/controller/admin/money/ExtractAdminController.java
@@ -1,6 +1,7 @@
package com.yeshi.makemoney.app.controller.admin.money;
import com.google.gson.*;
+import com.yeshi.makemoney.app.entity.money.ExtractPayType;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.springframework.stereotype.Controller;
@@ -15,9 +16,11 @@
import java.lang.reflect.Type;
import java.util.Date;
import java.util.List;
+
import com.yeshi.makemoney.app.entity.money.Extract;
import com.yeshi.makemoney.app.service.inter.money.ExtractService;
import com.yeshi.makemoney.app.service.query.money.ExtractQuery;
+
@Controller
@RequestMapping("admin/api/money/extract")
public class ExtractAdminController {
@@ -26,10 +29,10 @@
private ExtractService extractService;
- @ResponseBody
+ @ResponseBody
@RequestMapping("list")
- public String list(ExtractQuery query, int page, int limit, String callback ) {
- List<Extract> list = extractService.list(query,page,limit);
+ public String list(ExtractQuery query, int page, int limit, String callback) {
+ List<Extract> list = extractService.list(query, page, limit);
long count = extractService.count(query);
JSONObject data = new JSONObject();
Gson gson = new GsonBuilder().registerTypeAdapter(Date.class, new JsonSerializer<Date>() {
@@ -38,11 +41,17 @@
public JsonElement serialize(Date date, Type type, JsonSerializationContext jsonSerializationContext) {
return date == null ? new JsonPrimitive("") : new JsonPrimitive(TimeUtil.getGernalTime(date.getTime(), "yyyy.MM.dd HH:mm"));
}
+ }).registerTypeAdapter(ExtractPayType.class, new JsonSerializer<ExtractPayType>() {
+
+ @Override
+ public JsonElement serialize(ExtractPayType date, Type type, JsonSerializationContext jsonSerializationContext) {
+ return date == null ? new JsonPrimitive("") : new JsonPrimitive(date.getName());
+ }
}).create();
data.put("list", gson.toJson(list));
data.put("count", count);
- return JsonUtil.loadJSONP(callback,JsonUtil.loadTrueResult(data));
+ return JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data));
}
@@ -51,16 +60,14 @@
@RequestMapping("get")
public String get(Long id, HttpSession session, String callback) {
Extract entity = extractService.get(id);
- if (entity !=null){
- return JsonUtil.loadJSONP(callback,JsonUtil.loadTrueResult(entity));
+ if (entity != null) {
+ return JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(entity));
} else {
- return JsonUtil.loadJSONP(callback,JsonUtil.loadFalseResult("ID涓嶅瓨鍦�"));
+ return JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("ID涓嶅瓨鍦�"));
}
}
-
-
}
--
Gitblit v1.8.0