From a8d571b2c1b4881bff496f14e9d07ad1dc556f90 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 05 九月 2025 11:12:01 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 5ed1919..06eafd2 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
@@ -355,6 +355,7 @@
studyId.setRate(game.getRate());
studyId.setAnswerRate(game.getAnswerRate());
studyId.setSubjectIds(game.getSubjectIds());
+ studyId.setSubjectIdsOne(game.getSubjectIdsOne());
gameService.updateById(studyId);
} else {
// 判断当前周目配置的题目数量
@@ -384,6 +385,7 @@
tGame.setAnswerIntegral(game.getAnswerIntegral());
tGame.setAnswerCount(game.getAnswerCount());
tGame.setSubjectIds(game.getSubjectIds());
+ tGame.setSubjectIdsOne(game.getSubjectIdsOne());
gameService.save(tGame);
}
@@ -931,6 +933,11 @@
if(subjectIds!=null && subjectIds.length()>0){
gameVO.setSubjects(subjectService.list(new QueryWrapper<TSubject>()
.in("id", subjectIds.split(","))));
+ }
+ String subjectIdsOne = tGame.getSubjectIdsOne();
+ if(subjectIdsOne!=null && subjectIdsOne.length()>0){
+ gameVO.setSubjectsOne(subjectService.list(new QueryWrapper<TSubject>()
+ .in("id", subjectIdsOne.split(","))));
}
gameVOS.add(gameVO);
}
@@ -1788,7 +1795,7 @@
}
// List<String> subjectId = getSubjectId(week);
List<String> subjectId = new ArrayList<>();
- String subjectIds = game.getSubjectIds();
+ String subjectIds = game.getSubjectIdsOne();
if(subjectIds!=null){
String[] split = subjectIds.split(",");
for (String s : split) {
--
Gitblit v1.7.1