代码提交

44323

2024-05-22 2885941cf88da7397f2e641e383a26337f3c2b03

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java

@@ -268,6 +268,7 @@
                TStudyLook tStudyLook = new TStudyLook();
                tStudyLook.setStudyId(one.getId());
                tStudyLook.setDay(day);
                tStudyLook.setSort(studyLookDTO.getSort());
                tStudyLook.setSubject(studyLookDTO.getSubject());
                tStudyLook.setIntegral(studyLookDTO.getIntegral());
                tStudyLook.setWeek(week);
@@ -287,6 +288,7 @@
                tStudyInduction.setIntegral(studyInductionDTO.getIntegral());
                tStudyInduction.setWeek(week);
                tStudyInduction.setIsVip(studyInductionDTO.getIsVip());
                studyInductionService.save(tStudyInduction);
            }
            studyAnswerService.remove(new QueryWrapper<TStudyAnswer>()
                    .eq("studyId", one.getId())
@@ -440,6 +442,8 @@
            String string = temp.toString();
            studyListenVO.setName(string.substring(0, string.length() - 1));
            studyListenVO.setIntegral(tStudyListen.getIntegral());
            studyListenVO.setSubject(tStudyListen.getSubject());
            studyListenVO.setIsVip(tStudyListen.getIsVip());
            listenVOS.add(studyListenVO);
        }
        // 看音选图
@@ -465,6 +469,8 @@
            studyLookVO1.setName(string.substring(0, string.length() - 1));
            studyLookVO1.setSort(string1.substring(0, string1.length() - 1));
            studyLookVO1.setIntegral(tStudyLook.getIntegral());
            studyLookVO1.setSubject(tStudyLook.getSubject());
            studyLookVO1.setIsVip(tStudyLook.getIsVip());
            lookVOS.add(studyLookVO1);
        }
        // 归纳排除
@@ -477,17 +483,14 @@
            StudyInductionVO studyInductionVO = new StudyInductionVO();
            for (String s : tStudyInduction.getSubject().split(",")) {
                String replace = s.replace("-", "");
                if (s.contains("-")) {
                    TSubject byId = subjectService.getById(replace);
                    names.append("-").append(byId.getName()).append(",");
                } else {
                    TSubject byId = subjectService.getById(s);
                    names.append(byId.getName()).append(",");
                }
                TSubject byId = subjectService.getById(replace);
                names.append(byId.getName()).append(",");
            }
            String string = names.toString();
            studyInductionVO.setName(string.substring(0, string.length() - 1));
            studyInductionVO.setIntegral(tStudyInduction.getIntegral());
            studyInductionVO.setSubject(tStudyInduction.getSubject());
            studyInductionVO.setIsVip(tStudyInduction.getIsVip());
            inductionVOS.add(studyInductionVO);
        }
        // 有问有答
@@ -499,18 +502,21 @@
            StudyAnswerVO studyAnswerVO = new StudyAnswerVO();
            if (tStudyAnswer.getIsAnswer() == 1) {
                TSubject byId = subjectService.getById(tStudyAnswer.getSubject());
                names.append("-").append(byId.getName()).append(",");
                names.append(byId.getName()).append(",");
                TSubject byId1 = subjectService.getById(tStudyAnswer.getAnswerSubject());
                names.append("-").append(byId1.getName()).append(",");
                names.append(byId1.getName()).append(",");
            } else {
                TSubject byId = subjectService.getById(tStudyAnswer.getSubject());
                names.append(byId.getName()).append(",");
                TSubject byId1 = subjectService.getById(tStudyAnswer.getAnswerSubject());
                names.append("-").append(byId1.getName()).append(",");
                names.append(byId1.getName()).append(",");
            }
            String string = names.toString();
            studyAnswerVO.setName(string.substring(0, string.length() - 1));
            studyAnswerVO.setIntegral(tStudyAnswer.getIntegral());
            studyAnswerVO.setIsVip(tStudyAnswer.getIsVip());
            studyAnswerVO.setIsAnswer(tStudyAnswer.getIsAnswer());
            studyAnswerVO.setSubject(tStudyAnswer.getSubject()+","+tStudyAnswer.getAnswerSubject());
            answerVOS.add(studyAnswerVO);
        }
        // 音图相配
@@ -528,6 +534,8 @@
            String string = names.toString();
            studyPairVO.setName(string.substring(0, string.length() - 1));
            studyPairVO.setIntegral(tStudyPair.getIntegral());
            studyPairVO.setSubject(tStudyPair.getSubject());
            studyPairVO.setIsVip(tStudyPair.getIsVip());
            pairVOS.add(studyPairVO);
        }
        List<TGame> list5 = gameService.list(new QueryWrapper<TGame>()
@@ -650,7 +658,7 @@
            @ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "所属day", name = "day", dataType = "Integer", required = true)
    })
    public AjaxResult<StudyListenResultVO> listenSelectPicture(@RequestParam Integer week, @RequestParam Integer day) {
    public R<StudyListenResultVO> listenSelectPicture(@RequestParam Integer week, @RequestParam Integer day) {
        // 判断当前登录用户是否为 会员
        Boolean isVip = userService.isVip();
        LambdaQueryChainWrapper<TStudyListen> wrapper = studyListenService.lambdaQuery().eq(TStudyListen::getWeek, week)
@@ -660,7 +668,7 @@
            wrapper.eq(TStudyListen::getIsVip, 0);
        }
        List<TStudyListen> studyListens = wrapper.list();
        return AjaxResult.success(studyService.listenSelectPicture(week, day, studyListens));
        return R.ok(studyService.listenSelectPicture(week, day, studyListens));
    }

    /**