From 92149d9419a08c3c6dff7dd98ca907437c4a7a42 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 21 十一月 2025 11:43:01 +0800
Subject: [PATCH] update
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 56 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
index 0dda7f6..9180f5b 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
@@ -1435,6 +1435,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);
+ }
+
+ }
+
+
+ }
+
+
+ for (TStudyListen studyListen : studyListens) {
if (studyListen.getIsVip() == 0) {
// 需要会员查看
if (!isVip) {
@@ -1558,6 +1588,8 @@
Boolean isVip = userService.isVip();
// 非会员只能查看非会员题目，会员可以查看所有题目
List<TStudyPair> pairList = studyPairService.pictureMateVoice(quarter, week, day);
+
+
for (TStudyPair pair : pairList) {
if (pair.getIsVip() == 0) {
// 需要会员查看
@@ -1566,6 +1598,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());
}
--
Gitblit v1.7.1