1020更新

liujie

1 天以前 afb2bc8e77e086ebeb358915e12fad41dac78a6a

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

@@ -448,6 +448,7 @@
                tStudyListen.setWeek(week);
                tStudyListen.setIsVip(studyListenDTO.getIsVip());
                tStudyListen.setRate(dto.getListenRate());
                tStudyListen.setStudySort(studyListenDTO.getStudySort());
                studyListenService.save(tStudyListen);
            }
            List<Integer> ids1 = studyLookService.lambdaQuery().eq(TStudyLook::getId, one.getId())
@@ -474,7 +475,7 @@
                tStudyLook.setWeek(week);
                tStudyLook.setIsVip(studyLookDTO.getIsVip());
                tStudyLook.setRate(dto.getLookRate());

                tStudyLook.setStudySort(studyLookDTO.getStudySort());
                studyLookService.save(tStudyLook);
            }
            List<Integer> ids2 = studyInductionService.lambdaQuery().eq(TStudyInduction::getId, one.getId())
@@ -499,8 +500,9 @@
                tStudyInduction.setIntegral(studyInductionDTO.getIntegral());
                tStudyInduction.setWeek(week);
                tStudyInduction.setRate(dto.getInductionRate());

                tStudyInduction.setIsVip(studyInductionDTO.getIsVip());
                tStudyInduction.setStudySort(studyInductionDTO.getStudySort());

                studyInductionService.save(tStudyInduction);
            }
            List<Integer> ids3 = studyAnswerService.lambdaQuery().eq(TStudyAnswer::getId, one.getId())
@@ -528,6 +530,9 @@
                tStudyAnswer.setWeek(week);
                tStudyAnswer.setRate(dto.getAnswerRate());
                tStudyAnswer.setIsVip(studyAnswerDTO.getIsVip());
                tStudyAnswer.setStudySort(studyAnswerDTO.getStudySort());


                studyAnswerService.save(tStudyAnswer);
            }
            List<Integer> ids4 = studyPairService.lambdaQuery().eq(TStudyPair::getId, one.getId())
@@ -553,6 +558,7 @@
                tStudyPair.setWeek(week);
                tStudyPair.setRate(dto.getPairRate());
                tStudyPair.setIsVip(studyPairDTO.getIsVip());
                tStudyPair.setStudySort(studyPairDTO.getStudySort());
                studyPairService.save(tStudyPair);
            }
        }
@@ -755,7 +761,7 @@
        // 听音选图
        List<TStudyListen> list = studyListenService.list(new QueryWrapper<TStudyListen>()
                .eq("week", week)
                .eq("day", day));
                .eq("day", day).orderByAsc("studySort"));
        List<TSubject> list9 = subjectService.list();

        for (TStudyListen tStudyListen : list) {
@@ -773,6 +779,8 @@
                studyListenVO.setIntegral(tStudyListen.getIntegral());
                studyListenVO.setSubject(tStudyListen.getSubject());
                studyListenVO.setIsVip(tStudyListen.getIsVip());
                studyListenVO.setId(tStudyListen.getId());
                studyListenVO.setType(tStudyListen.getType());
                listenVOS.add(studyListenVO);
            }
            res.setListenRate(tStudyListen.getRate());
@@ -781,7 +789,7 @@
        // 看音选图
        List<TStudyLook> list1 = studyLookService.list(new QueryWrapper<TStudyLook>()
                .eq("week", week)
                .eq("day", day)
                .eq("day", day).orderByAsc("studySort")
        );
        for (TStudyLook tStudyLook : list1) {
            int index = 0;
@@ -806,6 +814,8 @@
                studyLookVO1.setIntegral(tStudyLook.getIntegral());
                studyLookVO1.setSubject(tStudyLook.getSubject());
                studyLookVO1.setIsVip(tStudyLook.getIsVip());
                studyLookVO1.setId(tStudyLook.getId());

                lookVOS.add(studyLookVO1);
            }
            res.setLookRate(tStudyLook.getRate());
@@ -814,7 +824,7 @@
        // 归纳排除
        List<TStudyInduction> list2 = studyInductionService.list(new QueryWrapper<TStudyInduction>()
                .eq("week", week)
                .eq("day", day)
                .eq("day", day).orderByAsc("studySort")
        );
        for (TStudyInduction tStudyInduction : list2) {
            StringBuilder names = new StringBuilder();
@@ -832,6 +842,8 @@
                studyInductionVO.setIntegral(tStudyInduction.getIntegral());
                studyInductionVO.setSubject(tStudyInduction.getSubject());
                studyInductionVO.setIsVip(tStudyInduction.getIsVip());
                studyInductionVO.setId(tStudyInduction.getId());

                inductionVOS.add(studyInductionVO);
            }
            res.setInductionRate(tStudyInduction.getRate());
@@ -840,7 +852,7 @@
        // 有问有答
        List<TStudyAnswer> list3 = studyAnswerService.list(new QueryWrapper<TStudyAnswer>()
                .eq("week", week)
                .eq("day", day));
                .eq("day", day).orderByAsc("studySort"));
        for (TStudyAnswer tStudyAnswer : list3) {
            StringBuilder names = new StringBuilder();
            StudyAnswerVO studyAnswerVO = new StudyAnswerVO();
@@ -882,6 +894,8 @@
                studyAnswerVO.setIsVip(tStudyAnswer.getIsVip());
                studyAnswerVO.setIsAnswer(tStudyAnswer.getIsAnswer());
                studyAnswerVO.setSubject(tStudyAnswer.getSubject() + "," + tStudyAnswer.getAnswerSubject());
                studyAnswerVO.setId(tStudyAnswer.getId());

                answerVOS.add(studyAnswerVO);
                res.setAnswerRate(tStudyAnswer.getRate());

@@ -891,7 +905,7 @@
        // 音图相配
        List<TStudyPair> list4 = studyPairService.list(new QueryWrapper<TStudyPair>()
                .eq("week", week)
                .eq("day", day)
                .eq("day", day).orderByAsc("studySort")
        );
        for (TStudyPair tStudyPair : list4) {
            StringBuilder names = new StringBuilder();
@@ -909,6 +923,7 @@
                studyPairVO.setIntegral(tStudyPair.getIntegral());
                studyPairVO.setSubject(tStudyPair.getSubject());
                studyPairVO.setIsVip(tStudyPair.getIsVip());
                studyPairVO.setId(tStudyPair.getId());
                pairVOS.add(studyPairVO);
            }
            res.setPairRate(tStudyPair.getRate());
@@ -2492,5 +2507,19 @@
        return R.ok(update);
    }

    /**
     * 设置题组类型 常规 示例
     * @param dto
     * @return
     */
    @PostMapping("/setStudyType")
    public R<Object> setStudyType(@RequestBody SetStudyTypeDto dto){
        TStudyListen studyListen = studyListenService.getById(dto.getId());
        studyListen.setType(dto.getType());
        studyListen.setSubject(dto.getSubject());
        return R.ok(studyListenService.updateById(studyListen));

    }

}