代码提交

44323

2024-05-24 a623f1eb91b1d89872e3582b5747e9d7096ea225

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

@@ -177,6 +177,9 @@
        TStudy one = studyService.getOne(new QueryWrapper<TStudy>()
                .eq("week", week)
                .eq("type", type));
        one.setQuarter(dto.getQuarter());
        one.setTitle(dto.getTitle());
        studyService.updateById(one);
        GameDTO game = dto.getGame();
        StoryListenDTO storyListen = dto.getStoryListen();
        if (day == 6) {
@@ -336,12 +339,23 @@
     */
    @PostMapping("/addWeek")
    public R<Object> addWeek(@RequestBody AddWeekDTO dto) {
        TStudy one = studyService.getOne(new QueryWrapper<TStudy>()
                .eq("week", dto.getWeek())
                .eq("type", dto.getType()));
        if (one!=null){
            one.setType(dto.getType());
            one.setWeek(dto.getWeek());
            one.setTitle(dto.getTitle());
            one.setQuarter(dto.getQuarter());
            studyService.saveOrUpdate(one);
        }else{
        TStudy tStudy = new TStudy();
        tStudy.setType(dto.getType());
        tStudy.setWeek(dto.getWeek());
        tStudy.setTitle(dto.getTitle());
        tStudy.setQuarter(dto.getQuarter());
        studyService.save(tStudy);
            studyService.saveOrUpdate(tStudy);
        }
        return R.ok();
    }

@@ -437,6 +451,7 @@
        for (TStudyListen tStudyListen : list) {
            StringBuilder temp = new StringBuilder();
            StudyListenVO studyListenVO = new StudyListenVO();
            if (StringUtils.hasLength(tStudyListen.getSubject())){
            for (String s : tStudyListen.getSubject().split(",")) {
                TSubject byId = subjectService.getById(s);
                temp.append(byId.getName()).append(",");
@@ -448,6 +463,8 @@
            studyListenVO.setIsVip(tStudyListen.getIsVip());
            listenVOS.add(studyListenVO);
        }

        }
        // 看音选图
        List<TStudyLook> list1 = studyLookService.list(new QueryWrapper<TStudyLook>()
                .eq("week", week)
@@ -458,6 +475,7 @@
            StringBuilder names = new StringBuilder();
            StringBuilder sorts = new StringBuilder();
            StudyLookVO studyLookVO1 = new StudyLookVO();
            if (StringUtils.hasLength(tStudyLook.getSubject())){
            for (String s : tStudyLook.getSubject().split(",")) {
                TSubject byId = subjectService.getById(s);
                names.append(byId.getName()).append(",");
@@ -475,6 +493,8 @@
            studyLookVO1.setIsVip(tStudyLook.getIsVip());
            lookVOS.add(studyLookVO1);
        }

        }
        // 归纳排除
        List<TStudyInduction> list2 = studyInductionService.list(new QueryWrapper<TStudyInduction>()
                .eq("week", week)
@@ -483,6 +503,7 @@
        for (TStudyInduction tStudyInduction : list2) {
            StringBuilder names = new StringBuilder();
            StudyInductionVO studyInductionVO = new StudyInductionVO();
            if (StringUtils.hasLength(tStudyInduction.getSubject())){
            for (String s : tStudyInduction.getSubject().split(",")) {
                String replace = s.replace("-", "");
                TSubject byId = subjectService.getById(replace);
@@ -495,6 +516,8 @@
            studyInductionVO.setIsVip(tStudyInduction.getIsVip());
            inductionVOS.add(studyInductionVO);
        }

        }
        // 有问有答
        List<TStudyAnswer> list3 = studyAnswerService.list(new QueryWrapper<TStudyAnswer>()
                .eq("week", week)
@@ -502,17 +525,28 @@
        for (TStudyAnswer tStudyAnswer : list3) {
            StringBuilder names = new StringBuilder();
            StudyAnswerVO studyAnswerVO = new StudyAnswerVO();
            if (tStudyAnswer.getIsAnswer() != null){
            if (tStudyAnswer.getIsAnswer() == 1) {
                    if (tStudyAnswer.getSubject()!=null){
                TSubject byId = subjectService.getById(tStudyAnswer.getSubject());
                names.append(byId.getName()).append(",");
                TSubject byId1 = subjectService.getById(tStudyAnswer.getAnswerSubject());
                names.append(byId1.getName()).append(",");
            } else {
                TSubject byId = subjectService.getById(tStudyAnswer.getSubject());
                names.append(byId.getName()).append(",");
                    }
                    if (tStudyAnswer.getAnswerSubject()!=null) {
                TSubject byId1 = subjectService.getById(tStudyAnswer.getAnswerSubject());
                names.append(byId1.getName()).append(",");
            }
                } else {
                    if (tStudyAnswer.getSubject()!=null) {
                        TSubject byId = subjectService.getById(tStudyAnswer.getSubject());
                        names.append(byId.getName()).append(",");
                    }
                    if (tStudyAnswer.getAnswerSubject()!=null) {
                        TSubject byId1 = subjectService.getById(tStudyAnswer.getAnswerSubject());
                        names.append(byId1.getName()).append(",");
                    }
                }
            }
            if (StringUtils.hasLength(names)){
            String string = names.toString();
            studyAnswerVO.setName(string.substring(0, string.length() - 1));
            studyAnswerVO.setIntegral(tStudyAnswer.getIntegral());
@@ -520,6 +554,8 @@
            studyAnswerVO.setIsAnswer(tStudyAnswer.getIsAnswer());
            studyAnswerVO.setSubject(tStudyAnswer.getSubject()+","+tStudyAnswer.getAnswerSubject());
            answerVOS.add(studyAnswerVO);
            }

        }
        // 音图相配
        List<TStudyPair> list4 = studyPairService.list(new QueryWrapper<TStudyPair>()
@@ -529,6 +565,7 @@
        for (TStudyPair tStudyPair : list4) {
            StringBuilder names = new StringBuilder();
            StudyPairVO studyPairVO = new StudyPairVO();
            if (StringUtils.hasLength(tStudyPair.getSubject())){
            for (String s : tStudyPair.getSubject().split(",")) {
                TSubject byId = subjectService.getById(s);
                names.append(byId.getName()).append(",");
@@ -539,6 +576,8 @@
            studyPairVO.setSubject(tStudyPair.getSubject());
            studyPairVO.setIsVip(tStudyPair.getIsVip());
            pairVOS.add(studyPairVO);
            }

        }
        List<TGame> list5 = gameService.list(new QueryWrapper<TGame>()
                .eq("week", week));
@@ -562,29 +601,44 @@
            StringBuilder names1 = new StringBuilder();
            StringBuilder sort = new StringBuilder();
            StringBuilder sort1 = new StringBuilder();
            if (StringUtils.hasLength(tStory.getStory())){
            for (String s : tStory.getStory().split(",")) {
                TStory byId = storyService.getById(s);
                names.append(byId.getName()).append(",");
            }
            }
            if (StringUtils.hasLength(tStory.getLookStory())){
            for (String s : tStory.getLookStory().split(",")) {
                TStory byId = storyService.getById(s);
                names1.append(byId.getName()).append(",");
            }
            }
            if (StringUtils.hasLength(tStory.getSort())){
            for (String s : tStory.getSort().split(",")) {
                sort.append(s).append(",");
            }
            }
            if (StringUtils.hasLength(tStory.getLookSort())){
            for (String s : tStory.getLookSort().split(",")) {
                sort1.append(s).append(",");
            }
            }
            if (StringUtils.hasLength(names)){
            storyVO.setName(names.substring(0, names.length() - 1));

            }if (StringUtils.hasLength(sort)){
            storyVO.setSort(sort.substring(0, sort.length() - 1));
            storyVO.setIntegral(tStory.getIntegral());

            }if (StringUtils.hasLength(names1)){
            storyVO.setLookName(names1.substring(0, names1.length() - 1));

            }if (StringUtils.hasLength(sort1)){
            storyVO.setLookSort(sort1.substring(0, sort1.length() - 1));
            }
            storyVO.setIntegral(tStory.getIntegral());
            storyVO.setLookIntegral(tStory.getLookIntegral());
            storyVOS.add(storyVO);
        }

        res.setAnswer(answerVOS);
        res.setPair(pairVOS);
        res.setListen(listenVOS);