From 4bd8f5572e62c39225da1d53e6cd101796dc90d8 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 19 Jul 2022 09:02:53 +0800
Subject: [PATCH] 积分排行榜前十展示/根据派出所，日周月展示前15任务
---
src/main/java/org/springblade/modules/integral/controller/IntegralController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/integral/controller/IntegralController.java b/src/main/java/org/springblade/modules/integral/controller/IntegralController.java
index f152785..a85d0f2 100644
--- a/src/main/java/org/springblade/modules/integral/controller/IntegralController.java
+++ b/src/main/java/org/springblade/modules/integral/controller/IntegralController.java
@@ -34,6 +34,7 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -134,8 +135,9 @@
* @return
*/
@PostMapping("/selectCount")
- public R selectCount(String uid) {
+ public R selectCount(String uid,String type) {
List<Map<Object, Object>> list = integralService.selectCount(uid);
+ List<Map<Object, Object>> listAll = integralService.selectList(uid,type);
Map map = new HashMap();
Integer a = Integer.parseInt(list.get(0).get("integral").toString());
Integer b = Integer.parseInt(list.get(1).get("integral").toString());
@@ -145,7 +147,18 @@
map.put("yjf", list.get(1));
//剩余积分
map.put("sjf", a - b);
+ map.put("list",listAll);
return R.data(map);
}
+ /**
+ * 查询积分榜前十
+ * @return
+ */
+ @PostMapping("/order")
+ @ApiOperation(value = "排序")
+ public R order(){
+ List<Integral> list = integralService.order();
+ return R.data(list);
+ }
}
--
Gitblit v1.9.3