From 75942ecc2e438012c5ea876715966ace593565a0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 四月 2025 15:17:41 +0800
Subject: [PATCH] 部分代码
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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 e6ae4b4..26c0859 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
@@ -21,6 +21,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import kotlin.random.Random;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
@@ -561,6 +562,21 @@
tStudy.setQuarter(dto.getQuarter());
studyService.saveOrUpdate(tStudy);
}
+ // 每次添加周目后需要根据季度来重新排序周目
+ if (dto.getType() == 1){
+ List<TStudy> list1 = studyService.lambdaQuery()
+ .eq(TStudy::getType, 1)
+ .orderByAsc(TStudy::getQuarter)
+ .orderByAsc(TStudy::getWeek)
+ .list();
+ int i = 1;
+ for (TStudy tStudy : list1) {
+ tStudy.setWeek(i);
+ i++;
+ }
+ studyService.updateBatchById(list1);
+ }
+
return R.ok();
}
@@ -633,7 +649,8 @@
res.setWeeks(type);
List<TStudy> list8 = studyService.list(new QueryWrapper<TStudy>()
.eq("type", dto.getType())
- .eq("week", dto.getWeek()));
+ .eq("week", dto.getWeek())
+ .orderByAsc("quarter"));
if (!list8.isEmpty()) {
res.setQuarter(list8.get(0).getQuarter());
res.setTitle(list8.get(0).getTitle());
@@ -1567,7 +1584,7 @@
private List<String> getData(TGame game, List<String> newSubjectId, int num) {
List<String> subjectData = new ArrayList<>();
- Random random = new Random();
+ java.util.Random random = new java.util.Random();
// 获取列表大小
int dataSize = newSubjectId.size();
// 生成随机索引并获取数据
--
Gitblit v1.7.1