From ace6cd39557cd11adf44a38e5b060d3b5b01a744 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 04 九月 2025 16:20:32 +0800
Subject: [PATCH] 修改判断
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 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 8eecf77..6181be0 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
@@ -123,11 +123,11 @@
}
if (StringUtils.hasLength(query.getCategoryName())) {
// 查询分类id包含的
- List<Integer> collect = categoryService.lambdaQuery().eq(TCategory::getState, 2)
+ List<Integer> collect = categoryService.lambdaQuery().eq(TCategory::getState, 1)
.eq(TCategory::getType, 1)
.like(TCategory::getName, query.getCategoryName()).list()
.stream().map(TCategory::getId).collect(Collectors.toList());// 查询分类id包含的
- List<Integer> collect2 = categoryService.lambdaQuery().eq(TCategory::getState, 2)
+ List<Integer> collect2 = categoryService.lambdaQuery().eq(TCategory::getState, 1)
.eq(TCategory::getType, 2)
.like(TCategory::getName, query.getCategoryName()).list()
.stream().map(TCategory::getParentId).collect(Collectors.toList());
@@ -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);
}
@@ -1722,12 +1729,15 @@
// List<String> subjectId = getSubjectId(week);
-
- String[] split = game.getSubjectIds().split(",");
List<String> subjectId = new ArrayList<>();
- for (String s : split) {
- subjectId.add(s);
+ String subjectIds = game.getSubjectIds();
+ if(subjectIds!=null){
+ String[] split = subjectIds.split(",");
+ for (String s : split) {
+ subjectId.add(s);
+ }
}
+
List<String> newSubjectId = subjectId.stream().map(data -> {
if (data.startsWith(Constants.REDUCE)) {
@@ -1784,11 +1794,15 @@
throw new GlobalException("当前季度该周目暂无配置游戏数据！");
}
// List<String> subjectId = getSubjectId(week);
- String[] split = game.getSubjectIds().split(",");
List<String> subjectId = new ArrayList<>();
- for (String s : split) {
- subjectId.add(s);
+ String subjectIds = game.getSubjectIdsOne();
+ if(subjectIds!=null){
+ String[] split = subjectIds.split(",");
+ for (String s : split) {
+ subjectId.add(s);
+ }
}
+
List<String> subjectData = getSubjectData(game, subjectId);
List<TSubject> subjectList = getSubjectList(subjectData);
// 返回数据
--
Gitblit v1.7.1