From c036557db88c6297b9a626a892dce35c14ab8ee5 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 09 十一月 2023 18:30:31 +0800
Subject: [PATCH] 11.6
---
cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java
index 39a8f85..a35f8b5 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java
@@ -42,7 +42,7 @@
wrapper1.eq("type",type1);
List<HonorRules> list1 = hrService.list(wrapper1);
for (int i = 0; i < list1.size(); i++) {
- list1.get(i).setCondition(condition1.get(i));
+ list1.get(i).setCondition(Integer.valueOf(condition1.get(i)));
}
hrService.updateBatchById(list1);
@@ -52,7 +52,7 @@
wrapper2.eq("type",type2);
List<HonorRules> list2 = hrService.list(wrapper2);
for (int i = 0; i < list1.size(); i++) {
- list2.get(i).setCondition(condition2.get(i));
+ list2.get(i).setCondition(Integer.valueOf(condition2.get(i)));
}
hrService.updateBatchById(list2);
@@ -62,7 +62,7 @@
wrapper3.eq("type",type3);
List<HonorRules> list3 = hrService.list(wrapper3);
for (int i = 0; i < list1.size(); i++) {
- list3.get(i).setCondition(condition3.get(i));
+ list3.get(i).setCondition(Integer.valueOf(condition3.get(i)));
}
hrService.updateBatchById(list3);
@@ -72,21 +72,49 @@
wrapper4.eq("type",type4);
List<HonorRules> list4 = hrService.list(wrapper4);
for (int i = 0; i < list1.size(); i++) {
- list4.get(i).setCondition(condition4.get(i));
+ list4.get(i).setCondition(Integer.valueOf(condition4.get(i)));
}
hrService.updateBatchById(list4);
return ResultUtil.success();
}
+ @Autowired
+ private HonorRulesService honorRulesService;
+ @PostMapping("/base/honor/getHonor")
+ public HonorRules getHonor(@RequestBody List<Integer> integers){
+// HonorRules one = honorRulesService.getOne(new QueryWrapper<HonorRules>().eq("type", integers.get(0)).le("condition", String.valueOf(integers.get(1))).last("limit 1"));
+ HonorRules one = honorRulesService.getOne(new QueryWrapper<HonorRules>()
+ .eq("type", integers.get(0))
+ .le("`condition`",integers.get(1)).orderByDesc("level")
+ .last("LIMIT 1"));
+
+ if (one ==null){
+ HonorRules one1 = honorRulesService.getOne(new QueryWrapper<HonorRules>()
+ .eq("type", integers.get(0))
+ .eq("level",1)
+ .last("LIMIT 1"));
+ return one1;
+ }
+
+ if (one.getLevel().equals("10")){
+ return one;
+ }
+ HonorRules one2 = honorRulesService.getOne(new QueryWrapper<HonorRules>().eq("type", integers.get(0)).eq("level", Integer.valueOf(one.getLevel()) + 1));
+ return one2;
+ }
+
@PostMapping("/base/honor/stuHonors")
public List<StuMedalVo> getStuHonors(@RequestBody List<Integer> honorIds){
List<StuMedalVo> stuMedalVos = new ArrayList<>();
List<HonorRules> honorRules = hrService.querylistOfIds(honorIds);
+
+
+
if (honorRules.size() > 0){
honorRules.forEach(hrs -> {
StuMedalVo stuMedalVo = new StuMedalVo();
- stuMedalVo.setLevelNum(Integer.getInteger(hrs.getLevel()));
+ stuMedalVo.setLevelNum(Integer.getInteger(String.valueOf(hrs.getLevel())));
stuMedalVo.setMedalType(hrs.getType());
switch (hrs.getType()){
case 1:
@@ -105,9 +133,9 @@
break;
}
if (!Objects.equals(hrs.getLevel(), "10")){
- stuMedalVo.setLevelNum(Integer.parseInt(hrs.getLevel()));
- stuMedalVo.setNextLevel(Integer.parseInt(hrs.getLevel())+1);
- stuMedalVo.setUpgradeConditions(hrs.getCondition());
+ stuMedalVo.setLevelNum(Integer.parseInt(String.valueOf(hrs.getLevel())));
+ stuMedalVo.setNextLevel(Integer.parseInt(String.valueOf(hrs.getLevel()))+1);
+ stuMedalVo.setUpgradeConditions(String.valueOf(hrs.getCondition()));
stuMedalVo.setIsTopLevel(2);
}else {
stuMedalVo.setIsTopLevel(1);
--
Gitblit v1.7.1