From 5b03cdbe799e8a91f9fcd0fd4f636a6c2c4440fd Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 07 Mar 2022 11:33:10 +0800
Subject: [PATCH] 任务增加类型
---
src/main/java/org/springblade/modules/integral/controller/IntegralController.java | 4 +++-
1 files changed, 3 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..b60be97 100644
--- a/src/main/java/org/springblade/modules/integral/controller/IntegralController.java
+++ b/src/main/java/org/springblade/modules/integral/controller/IntegralController.java
@@ -134,8 +134,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,6 +146,7 @@
map.put("yjf", list.get(1));
//剩余积分
map.put("sjf", a - b);
+ map.put("list",listAll);
return R.data(map);
}
--
Gitblit v1.9.3