java/DolphinEnglish.git

			@@ -450,6 +450,7 @@
			tStudyListen.setRate(dto.getListenRate());
			tStudyListen.setStudySort(studyListenDTO.getStudySort());
			tStudyListen.setType(studyListenDTO.getType());
			tStudyListen.setSort(studyListenDTO.getSort());
			studyListenService.save(tStudyListen);
			}
			List<Integer> ids1 = studyLookService.lambdaQuery().eq(TStudyLook::getId, one.getId())
			@@ -560,6 +561,7 @@
			tStudyPair.setRate(dto.getPairRate());
			tStudyPair.setIsVip(studyPairDTO.getIsVip());
			tStudyPair.setStudySort(studyPairDTO.getStudySort());
			tStudyPair.setSort(studyPairDTO.getSort());
			studyPairService.save(tStudyPair);
			}
			}
			@@ -762,7 +764,8 @@
			// 听音选图
			List<TStudyListen> list = studyListenService.list(new QueryWrapper<TStudyListen>()
			.eq("week", week)
			.eq("day", day).orderByAsc("studySort"));
			// studySort 会有重复值，追加 id 升序作为二级排序，保证与提交数组顺序一致
			.eq("day", day).orderByAsc("studySort").orderByAsc("id"));
			List<TSubject> list9 = subjectService.list();

			for (TStudyListen tStudyListen : list) {
			@@ -782,6 +785,7 @@
			studyListenVO.setIsVip(tStudyListen.getIsVip());
			studyListenVO.setId(tStudyListen.getId());
			studyListenVO.setType(tStudyListen.getType());
			studyListenVO.setSort(tStudyListen.getSort());
			listenVOS.add(studyListenVO);
			}
			res.setListenRate(tStudyListen.getRate());
			@@ -790,7 +794,7 @@
			// 看音选图
			List<TStudyLook> list1 = studyLookService.list(new QueryWrapper<TStudyLook>()
			.eq("week", week)
			.eq("day", day).orderByAsc("studySort")
			.eq("day", day).orderByAsc("studySort").orderByAsc("id")
			);
			for (TStudyLook tStudyLook : list1) {
			int index = 0;
			@@ -825,7 +829,7 @@
			// 归纳排除
			List<TStudyInduction> list2 = studyInductionService.list(new QueryWrapper<TStudyInduction>()
			.eq("week", week)
			.eq("day", day).orderByAsc("studySort")
			.eq("day", day).orderByAsc("studySort").orderByAsc("id")
			);
			for (TStudyInduction tStudyInduction : list2) {
			StringBuilder names = new StringBuilder();
			@@ -853,7 +857,7 @@
			// 有问有答
			List<TStudyAnswer> list3 = studyAnswerService.list(new QueryWrapper<TStudyAnswer>()
			.eq("week", week)
			.eq("day", day).orderByAsc("studySort"));
			.eq("day", day).orderByAsc("studySort").orderByAsc("id"));
			for (TStudyAnswer tStudyAnswer : list3) {
			StringBuilder names = new StringBuilder();
			StudyAnswerVO studyAnswerVO = new StudyAnswerVO();
			@@ -906,7 +910,7 @@
			// 音图相配
			List<TStudyPair> list4 = studyPairService.list(new QueryWrapper<TStudyPair>()
			.eq("week", week)
			.eq("day", day).orderByAsc("studySort")
			.eq("day", day).orderByAsc("studySort").orderByAsc("id")
			);
			for (TStudyPair tStudyPair : list4) {
			StringBuilder names = new StringBuilder();
			@@ -925,6 +929,7 @@
			studyPairVO.setSubject(tStudyPair.getSubject());
			studyPairVO.setIsVip(tStudyPair.getIsVip());
			studyPairVO.setId(tStudyPair.getId());
			studyPairVO.setSort(tStudyPair.getSort());
			pairVOS.add(studyPairVO);
			}
			res.setPairRate(tStudyPair.getRate());
			@@ -1431,6 +1436,36 @@
			// 非会员只能查看非会员题目，会员可以查看所有题目
			List<TStudyListen> studyListens = studyListenService.listenSelectPicture(quarter, week, day);
			for (TStudyListen studyListen : studyListens) {
			if(studyListen.getType()==null \|\| studyListen.getType()==1){
			String sort = studyListen.getSort();
			if(sort!=null){
			String subject = studyListen.getSubject();
			String[] split = sort.split(",");
			String[] subjectIds = subject.split(",");
			ArrayList<Map<String, String>> maps = new ArrayList<>();
			for (int i = 0; i < split.length; i++) {
			HashMap<String, String> map = new HashMap<>();
			map.put("sort", split[i]);
			map.put("subject", subjectIds[i]);
			maps.add(map);
			}
			List<Map<String, String>> sort1 = maps.stream().sorted(Comparator.comparingInt(o -> Integer.parseInt(o.get("sort")))).collect(Collectors.toList());
			ArrayList<String> strings = new ArrayList<>();
			for (Map<String, String> stringStringMap : sort1) {
			String s = stringStringMap.get("subject");
			strings.add(s);
			}
			subject = strings.stream().collect(Collectors.joining(","));
			studyListen.setSubject(subject);
			}

			}


			}
			System.out.println("数据2！！"+studyListens);

			for (TStudyListen studyListen : studyListens) {
			if (studyListen.getIsVip() == 0) {
			// 需要会员查看
			if (!isVip) {
			@@ -1554,6 +1589,8 @@
			Boolean isVip = userService.isVip();
			// 非会员只能查看非会员题目，会员可以查看所有题目
			List<TStudyPair> pairList = studyPairService.pictureMateVoice(quarter, week, day);


			for (TStudyPair pair : pairList) {
			if (pair.getIsVip() == 0) {
			// 需要会员查看
			@@ -1562,6 +1599,30 @@
			return R.vipError("以下内容仅限会员查看，请通过家长端成为会员!");
			}
			}


			String sort = pair.getSort();
			if(sort!=null){
			String subject = pair.getSubject();
			String[] split = sort.split(",");
			String[] subjectIds = subject.split(",");
			ArrayList<Map<String, String>> maps = new ArrayList<>();
			for (int i = 0; i < split.length; i++) {
			HashMap<String, String> map = new HashMap<>();
			map.put("sort", split[i]);
			map.put("subject", subjectIds[i]);
			maps.add(map);
			}
			List<Map<String, String>> sort1 = maps.stream().sorted(Comparator.comparingInt(o -> Integer.parseInt(o.get("sort")))).collect(Collectors.toList());
			ArrayList<String> strings = new ArrayList<>();
			for (Map<String, String> stringStringMap : sort1) {
			String s = stringStringMap.get("subject");
			strings.add(s);
			}
			subject = strings.stream().collect(Collectors.joining(","));
			pair.setSubject(subject);
			}

			}
			return studyService.pictureMateVoice(week, day, pairList, tokenService.getLoginUserStudy().getUserid());
			}
			@@ -1578,9 +1639,12 @@
			}
			System.err.println("答题DTO"+answerQuestionDTO);
			TSubjectRecordDetail byId = subjectRecordDetailService.getById(answerQuestionDTO.getId());
			byId.setUserId(null);
			byId.setStatus(answerQuestionDTO.getStatus());
			subjectRecordDetailService.updateById(byId);
			if(byId.getStatus()==1){
			byId.setUserId(null);
			byId.setStatus(answerQuestionDTO.getStatus());
			subjectRecordDetailService.updateById(byId);
			}

			return R.ok();
			}