From 52461f1688e83970d4aa3aa6b835bdf7719f5769 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 31 十二月 2024 14:17:02 +0800
Subject: [PATCH] 全部代码和数据库
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 95 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 88 insertions(+), 7 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 933a84b..e6ae4b4 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
@@ -145,6 +145,8 @@
return R.ok();
}
+ @Autowired
+ private ICategoryService categoryService;
@PostMapping("/storyList")
// @ApiOperation(value = "配置学习类型选择故事", tags = {"题目管理"})
public R<PageInfo<TStory>> storyList(@RequestBody ChoiceStory query) {
@@ -152,6 +154,22 @@
QueryWrapper<TStory> wrapper = new QueryWrapper<>();
if (StringUtils.hasLength(query.getName())) {
wrapper.like("name", query.getName());
+ }
+ if (StringUtils.hasLength(query.getCategoryName())){
+ // 查询分类id包含的
+ List<Integer> collect = categoryService.lambdaQuery().eq(TCategory::getState, 2)
+ .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)
+ .eq(TCategory::getType,2)
+ .like(TCategory::getName, query.getCategoryName()).list()
+ .stream().map(TCategory::getParentId).collect(Collectors.toList());
+ collect.addAll(collect2);
+ if (collect.isEmpty()){
+ collect.add(-1);
+ }
+ wrapper.in("firstCategory", collect);
}
if (StringUtils.hasLength(query.getEnglish())) {
wrapper.like("english", query.getEnglish());
@@ -165,21 +183,30 @@
switch (query.getStoryType()) {
case 2:
List<TStory> list = storyService.list(wrapper);
- List<TStory> tSubjects = new ArrayList<>(list);
- res.setRecords(tSubjects);
- res.setTotal(tSubjects.size());
+ for (TStory tSubject : list) {
+ TCategory first = categoryService.getById(tSubject.getFirstCategory());
+
+ TCategory second = categoryService.getById(tSubject.getSecondCategory());
+ if (first!=null&& second!=null){
+ tSubject.setCategoryName(first.getName()+"-"+second.getName());
+ }
+ }
+ res.setRecords(list);
+ res.setTotal(list.size());
return R.ok(res);
case 1:
// 查询出error字段不为空的数据
wrapper.isNotNull("error");
List<TStory> list1 = storyService.list(wrapper);
for (TStory tStory : list1) {
- if (tStory.getError() != null && (!tStory.getError().isEmpty())) {
- tStories.add(tStory);
+ TCategory first = categoryService.getById(tStory.getFirstCategory());
+ TCategory second = categoryService.getById(tStory.getSecondCategory());
+ if (first!=null&& second!=null){
+ tStory.setCategoryName(first.getName()+"-"+second.getName());
}
}
- res.setRecords(tStories);
- res.setTotal(tStories.size());
+ res.setRecords(list1);
+ res.setTotal(list1.size());
return R.ok(res);
}
@@ -197,6 +224,22 @@
if (StringUtils.hasLength(query.getName())) {
wrapper.like("name", query.getName());
}
+ if (StringUtils.hasLength(query.getCategoryName())){
+ // 查询分类id包含的
+ 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, 1)
+ .eq(TCategory::getType,2)
+ .like(TCategory::getName, query.getCategoryName()).list()
+ .stream().map(TCategory::getParentId).collect(Collectors.toList());
+ collect.addAll(collect2);
+ if (collect.isEmpty()){
+ collect.add(-1);
+ }
+ wrapper.in("firstCategory", collect);
+ }
if (StringUtils.hasLength(query.getEnglish())) {
wrapper.like("english", query.getEnglish());
}
@@ -207,6 +250,15 @@
switch (query.getStudyType()) {
case 1:
List<TSubject> list = subjectService.list(wrapper);
+ for (TSubject tSubject : list) {
+ TCategory first = categoryService.getById(tSubject.getFirstCategory());
+
+ TCategory second = categoryService.getById(tSubject.getSecondCategory());
+
+ if (first!=null&&second!=null){
+ tSubject.setCategoryName(first.getName()+"-"+second.getName());
+ }
+ }
res.setRecords(list);
res.setTotal(list.size());
return R.ok(res);
@@ -216,6 +268,13 @@
List<TSubject> list1 = subjectService.list(wrapper);
List<TSubject> tSubjects = new ArrayList<>();
for (TSubject tSubject : list1) {
+ TCategory first = categoryService.getById(tSubject.getFirstCategory());
+
+ TCategory second = categoryService.getById(tSubject.getSecondCategory());
+
+ if (first!=null&&second!=null){
+ tSubject.setCategoryName(first.getName()+"-"+second.getName());
+ }
if (!tSubject.getError().isEmpty()) {
tSubjects.add(tSubject);
}
@@ -225,6 +284,14 @@
return R.ok(res);
case 3:
List<TSubject> list2 = subjectService.list(wrapper);
+ for (TSubject tSubject : list2) {
+ TCategory first = categoryService.getById(tSubject.getFirstCategory());
+ TCategory second = categoryService.getById(tSubject.getSecondCategory());
+
+ if (first!=null&&second!=null){
+ tSubject.setCategoryName(first.getName()+"-"+second.getName());
+ }
+ }
res.setRecords(list2);
res.setTotal(list2.size());
return R.ok(res);
@@ -234,6 +301,12 @@
List<TSubject> list3 = subjectService.list(wrapper);
List<TSubject> tSubjects3 = new ArrayList<>();
for (TSubject tSubject : list3) {
+ TCategory first = categoryService.getById(tSubject.getFirstCategory());
+
+ TCategory second = categoryService.getById(tSubject.getSecondCategory());
+ if (first!=null&&second!=null){
+ tSubject.setCategoryName(first.getName()+"-"+second.getName());
+ }
if (!tSubject.getError().isEmpty()) {
tSubjects3.add(tSubject);
}
@@ -243,6 +316,14 @@
return R.ok(res);
case 5:
List<TSubject> list4 = subjectService.list(wrapper);
+ for (TSubject tSubject : list4) {
+ TCategory first = categoryService.getById(tSubject.getFirstCategory());
+
+ TCategory second = categoryService.getById(tSubject.getSecondCategory());
+ if (first!=null&&second!=null){
+ tSubject.setCategoryName(first.getName()+"-"+second.getName());
+ }
+ }
res.setRecords(list4);
res.setTotal(list4.size());
return R.ok(res);
--
Gitblit v1.7.1