From 5a57b1b73022877150bb7a5fba58d1a636874dfa Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 23 十月 2025 15:01:31 +0800
Subject: [PATCH] 1020更新
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TSubjectController.java | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TSubjectController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TSubjectController.java
index 3c83d42..b580b79 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TSubjectController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TSubjectController.java
@@ -14,9 +14,13 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* <p>
@@ -50,13 +54,50 @@
@Autowired
private ITStudyService studyService;
+ @Autowired
+ private ICategoryService categoryService;
@PostMapping("/subjectList")
-// @ApiOperation(value = "列表查询", tags = {"题目管理"})
+ @ApiOperation(value = "列表查询", tags = {"题目管理"})
public R<PageInfo<SubjectVO>> subjectList(@RequestBody SubjectQuery query) {
PageInfo<SubjectVO> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
- List<SubjectVO> list = subjectService.listAll(query);
+ List<Integer> integers = new ArrayList<>();
+ int type=0;
+ 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::getId).collect(Collectors.toList());
+ collect.addAll(collect2);
+ if (collect2.isEmpty()) {
+ if (collect.isEmpty()) {
+ collect.add(-1);
+ }
+ type=1;
+ integers = collect;
+ }else{
+ type=2;
+ integers = collect2;
+ }
+ }
+
+ query.setIds(integers);
+ List<SubjectVO> list = subjectService.listAll(query,type,res);
+ Map<Integer, String> categoryMap = categoryService.list(null).stream()
+ .collect(Collectors.toMap(TCategory::getId, TCategory::getName));
for (SubjectVO subjectVO : list) {
+ if (subjectVO.getFirstCategory()!=null&&subjectVO.getSecondCategory()!=null){
+ String byId1 = categoryMap.get(subjectVO.getFirstCategory());
+ String byId2 = categoryMap.get(subjectVO.getSecondCategory());
+ if (byId1!=null&& byId2!=null){
+ subjectVO.setCategoryName(byId1+"-"+byId2);
+ }
+ }
// StringBuilder stringBuilder = new StringBuilder("");
// for (String s : subjectVO.getType().split(",")) {
// switch (s) {
@@ -82,11 +123,10 @@
subjectVO.setType(subjectVO.getType());
}
res.setRecords(list);
- res.setTotal(list.size());
return R.ok(res);
}
@PostMapping("/add")
-// @ApiOperation(value = "添加", tags = {"题目管理"})
+ @ApiOperation(value = "添加", tags = {"题目管理"})
public R add(@RequestBody SubjectDTO dto) {
TSubject tSubject = new TSubject();
BeanUtils.copyProperties(dto,tSubject);
@@ -94,7 +134,7 @@
return R.ok("添加成功");
}
@PostMapping("/update")
-// @ApiOperation(value = "编辑", tags = {"题目管理"})
+ @ApiOperation(value = "编辑", tags = {"题目管理"})
public R update(@RequestBody SubjectDTO dto) {
TSubject tSubject = new TSubject();
// 判断当前题目有没有被使用
--
Gitblit v1.7.1