java/DolphinEnglish.git

			@@ -270,6 +270,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);
			@@ -289,6 +290,7 @@
			tStudyInduction.setIntegral(studyInductionDTO.getIntegral());
			tStudyInduction.setWeek(week);
			tStudyInduction.setIsVip(studyInductionDTO.getIsVip());
			studyInductionService.save(tStudyInduction);
			}
			studyAnswerService.remove(new QueryWrapper<TStudyAnswer>()
			.eq("studyId", one.getId())
			@@ -442,6 +444,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);
			}
			// 看音选图
			@@ -467,6 +471,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);
			}
			// 归纳排除
			@@ -479,17 +485,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);
			}
			// 有问有答
			@@ -501,18 +504,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);
			}
			// 音图相配
			@@ -530,6 +536,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>()