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/TSubjectController.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 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..bc489fc 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,12 @@
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.stream.Collectors;
/**
* <p>
@@ -50,13 +53,43 @@
@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<Integer> integers = new ArrayList<>();
+ if (StringUtils.hasLength(query.getCategoryName())){
+ List<Integer> collect = categoryService.lambdaQuery()
+ .eq(TCategory::getType, 2)
+ .eq(TCategory::getState, 1)
+ .like(TCategory::getName, query.getCategoryName())
+ .list().stream().map(TCategory::getParentId).collect(Collectors.toList());
+ integers.addAll(collect);
+ List<Integer> collect2 = categoryService.lambdaQuery()
+ .eq(TCategory::getType, 1)
+ .eq(TCategory::getState, 1)
+ .like(TCategory::getName, query.getCategoryName())
+ .list().stream().map(TCategory::getId).collect(Collectors.toList());
+ integers.addAll(collect2);
+ }
+ if (StringUtils.hasLength(query.getCategoryName())){
+ if (integers.isEmpty()){
+ integers.add(-1);
+ }
+ }
+ query.setIds(integers);
List<SubjectVO> list = subjectService.listAll(query);
for (SubjectVO subjectVO : list) {
+ if (subjectVO.getFirstCategory()!=null&&subjectVO.getSecondCategory()!=null){
+ TCategory byId1 = categoryService.getById(subjectVO.getFirstCategory());
+ TCategory byId2 = categoryService.getById(subjectVO.getSecondCategory());
+ if (byId1!=null&& byId2!=null){
+ subjectVO.setCategoryName(byId1.getName()+"-"+byId2.getName());
+ }
+ }
// StringBuilder stringBuilder = new StringBuilder("");
// for (String s : subjectVO.getType().split(",")) {
// switch (s) {
@@ -86,7 +119,7 @@
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 +127,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