合并代码

puzhibing

2024-03-08 2a3d0885c11a73d41fb03c985f0032086cd8fa07

 cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java

@@ -51,7 +51,7 @@
        QueryWrapper<HonorRules> wrapper2 = new QueryWrapper<>();
        wrapper2.eq("type", type2);
        List<HonorRules> list2 = hrService.list(wrapper2);
        for (int i = 0; i < list1.size(); i++) {
        for (int i = 0; i < list2.size(); i++) {
            list2.get(i).setCondition(Integer.valueOf(condition2.get(i)));
        }
        hrService.updateBatchById(list2);
@@ -61,7 +61,7 @@
        QueryWrapper<HonorRules> wrapper3 = new QueryWrapper<>();
        wrapper3.eq("type", type3);
        List<HonorRules> list3 = hrService.list(wrapper3);
        for (int i = 0; i < list1.size(); i++) {
        for (int i = 0; i < list3.size(); i++) {
            list3.get(i).setCondition(Integer.valueOf(condition3.get(i)));
        }
        hrService.updateBatchById(list3);
@@ -71,10 +71,30 @@
        QueryWrapper<HonorRules> wrapper4 = new QueryWrapper<>();
        wrapper4.eq("type", type4);
        List<HonorRules> list4 = hrService.list(wrapper4);
        for (int i = 0; i < list1.size(); i++) {
        for (int i = 0; i < list4.size(); i++) {
            list4.get(i).setCondition(Integer.valueOf(condition4.get(i)));
        }
        hrService.updateBatchById(list4);

        Integer type5 = vo.getType5().getType();
        List<String> condition5 = vo.getType5().getCondition();
        QueryWrapper<HonorRules> wrapper5 = new QueryWrapper<>();
        wrapper5.eq("type", type5);
        List<HonorRules> list5 = hrService.list(wrapper5);
        for (int i = 0; i < list5.size(); i++) {
            list5.get(i).setCondition(Integer.valueOf(condition5.get(i)));
        }
        hrService.updateBatchById(list5);

        Integer type6 = vo.getType6().getType();
        List<String> condition6 = vo.getType6().getCondition();
        QueryWrapper<HonorRules> wrapper6 = new QueryWrapper<>();
        wrapper6.eq("type", type6);
        List<HonorRules> list6 = hrService.list(wrapper6);
        for (int i = 0; i < list6.size(); i++) {
            list6.get(i).setCondition(Integer.valueOf(condition6.get(i)));
        }
        hrService.updateBatchById(list6);

        return ResultUtil.success();
    }
@@ -129,6 +149,12 @@
                    case 4:
                        stuMedalVo.setMedalName("深度玩家");
                        break;
                    case 5:
                        stuMedalVo.setMedalName("赢家");
                        break;
                    case 6:
                        stuMedalVo.setMedalName("次数");
                        break;
                    default:
                        break;
                }