1

491394d1 · 郑云飞 · 770b2e1a · 491394d1 · 491394d1 · 491394d1
Commit 491394d1 authored Jul 25, 2023 by 郑云飞
6 changed files
--- a/school-paper/pom.xml
+++ b/school-paper/pom.xml
@@ -27,15 +27,20 @@
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-sms</artifactId>
        </dependency>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-system</artifactId>
+        </dependency>
        <!-- 短信 用哪个导入哪个依赖 -->
-<!--        <dependency>-->
+        <!--        <dependency>-->
-<!--            <groupId>com.aliyun</groupId>-->
+        <!--            <groupId>com.aliyun</groupId>-->
-<!--            <artifactId>dysmsapi20170525</artifactId>-->
+        <!--            <artifactId>dysmsapi20170525</artifactId>-->
-<!--        </dependency>-->
+        <!--        </dependency>-->
-<!--        <dependency>-->
+        <!--        <dependency>-->
-<!--            <groupId>com.tencentcloudapi</groupId>-->
+        <!--            <groupId>com.tencentcloudapi</groupId>-->
 <!--            <artifactId>tencentcloud-sdk-java-sms</artifactId>-->
 <!--        </dependency>-->

--- a/school-paper/src/main/java/com/ruoyi/school/paper/controller/DbTestPaperController.java
+++ b/school-paper/src/main/java/com/ruoyi/school/paper/controller/DbTestPaperController.java
@@ -40,7 +40,7 @@ public class DbTestPaperController extends BaseController {
    private final IDbTestPaperService iDbTestPaperService;
    /**
-     * 查询试卷列表
+     * 【小程序】查询试卷列表
     */
    @GetMapping("/list")
    public TableDataInfo<DbTestPaperVo> list(DbTestPaperBo bo, PageQuery pageQuery) {

--- a/school-paper/src/main/java/com/ruoyi/school/paper/domain/DbTestPaper.java
+++ b/school-paper/src/main/java/com/ruoyi/school/paper/domain/DbTestPaper.java
@@ -42,6 +42,10 @@ public class DbTestPaper extends BaseEntity {
     */
    private Long classId;
    /**
+     * 强度：1基础，2中等，3提高（多个中间用逗号分割）
+     */
+    private String intensity;
+    /**
     * 总分：100，150
     */
    private Integer totalPoints;

--- a/school-paper/src/main/java/com/ruoyi/school/paper/domain/bo/DbTestPaperBo.java
+++ b/school-paper/src/main/java/com/ruoyi/school/paper/domain/bo/DbTestPaperBo.java
 package com.ruoyi.school.paper.domain.bo;
+import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-import java.util.Date;
-import com.ruoyi.common.core.domain.BaseEntity;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 /**
 * 试卷业务对象 db_test_paper
@@ -42,19 +41,25 @@ public class DbTestPaperBo extends BaseEntity {
    /**
     * 阶段id
     */
-    @NotNull(message = "阶段id不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "阶段id不能为空", groups = {AddGroup.class, EditGroup.class})
    private Long phaseId;
    /**
     * 班级id
     */
-    @NotNull(message = "班级id不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "班级id不能为空", groups = {AddGroup.class, EditGroup.class})
    private Long classId;
    /**
+     * 强度：1基础，2中等，3提高（多个中间用逗号分割）
+     */
+    @NotBlank(message = "强度不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String intensity;
+    /**
     * 总分：100，150
     */
-    @NotNull(message = "总分：100，150不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "总分：100，150不能为空", groups = {AddGroup.class, EditGroup.class})
    private Integer totalPoints;
    /**

--- a/school-paper/src/main/java/com/ruoyi/school/paper/domain/vo/DbTestPaperVo.java
+++ b/school-paper/src/main/java/com/ruoyi/school/paper/domain/vo/DbTestPaperVo.java
@@ -2,10 +2,7 @@ package com.ruoyi.school.paper.domain.vo;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
 import lombok.Data;
-import java.util.Date;
@@ -52,6 +49,12 @@ public class DbTestPaperVo {
    private Long classId;
    /**
+     * 强度：1基础，2中等，3提高（多个中间用逗号分割）
+     */
+    @ExcelProperty(value = "强度：1基础，2中等，3提高（多个中间用逗号分割）")
+    private String intensity;
+    /**
     * 总分：100，150
     */
    @ExcelProperty(value = "总分：100，150")

--- a/school-paper/src/main/java/com/ruoyi/school/paper/service/impl/DbTestPaperServiceImpl.java
+++ b/school-paper/src/main/java/com/ruoyi/school/paper/service/impl/DbTestPaperServiceImpl.java
 package com.ruoyi.school.paper.service.impl;
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.JsonUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.redis.RedisUtils;
@@ -17,7 +21,10 @@ import com.ruoyi.school.paper.mapper.DbQuestionBankAnswerTestPaperMapper;
 import com.ruoyi.school.paper.mapper.DbQuestionBankTestPaperMapper;
 import com.ruoyi.school.paper.mapper.DbTestPaperMapper;
 import com.ruoyi.school.paper.service.IDbTestPaperService;
+import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ISysUserService;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -38,6 +45,8 @@ public class DbTestPaperServiceImpl implements IDbTestPaperService {
    private final DbQuestionBankTestPaperMapper questionBankTestPaperMapper;
    private final DbQuestionBankAnswerMapper questionBankAnswerMapper;
    private final DbQuestionBankAnswerTestPaperMapper questionBankAnswerTestPaperMapper;
+    private final ISysUserService userService;
+    private final ISysDeptService deptService;
    private String DEFAULT_QUESTIOBN_BANK_KEY = "question_bank:default_question_bank";
    /**
@@ -45,7 +54,17 @@ public class DbTestPaperServiceImpl implements IDbTestPaperService {
     */
    @Override
    public TableDataInfo<DbTestPaperVo> queryPageList(DbTestPaperBo bo, PageQuery pageQuery) {
+        Long userId = LoginHelper.getUserId();
+        SysUser sysUser = userService.selectUserById(userId);
        LambdaQueryWrapper<DbTestPaper> lqw = buildQueryWrapper(bo);
+        if (sysUser.getSex().equals("0")) {
+            List<String> colList = CollUtil.newArrayList(sysUser.getDeptList().split(","));
+            List<SysDept> sysDepts = deptService.selectDeptListByList(colList.stream().mapToLong(t -> Long.parseLong(t.trim())).boxed().collect(Collectors.toList()));
+            SysDept sysDept = sysDepts.stream().filter(dept -> dept.getParentId().equals(0L)).findAny().orElse(null);
+            if (sysDept != null) {
+            }
+        }
        Page<DbTestPaperVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
        return TableDataInfo.build(result);
    }
@@ -68,6 +87,7 @@ public class DbTestPaperServiceImpl implements IDbTestPaperService {
        lqw.eq(bo.getClassId() != null, DbTestPaper::getClassId, bo.getClassId());
        lqw.eq(bo.getTotalPoints() != null, DbTestPaper::getTotalPoints, bo.getTotalPoints());
        lqw.eq(bo.getStatus() != null, DbTestPaper::getStatus, bo.getStatus());
+        lqw.last(StringUtils.isNotEmpty(bo.getIntensity()), "and FIND_IN_SET('" + bo.getIntensity() + "',intensity)");
        return lqw;
    }
@@ -135,6 +155,7 @@ public class DbTestPaperServiceImpl implements IDbTestPaperService {
        Map<Integer, List<DbQuestionBank>> collect = dbQuestionBanks.stream()
            .filter(bank -> bank.getCategoryId().equals(bo.getCategoryId())
                && bank.getPhaseId().equals(bo.getPhaseId())
+                && ArrayUtils.contains(bo.getIntensity().split(","), bank.getIntensity())
            ).collect(Collectors.groupingBy(DbQuestionBank::getSpecies));
        // 根据习题种类分组
        // 选择题