新增pc段审批阅卷列表查询

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java

@@ -52,4 +52,8 @@ public interface SysDeptMapper extends BaseMapperPlus<SysDeptMapper, SysDept, Sy
      */
     List<Long> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
 
+    /**
+     * 根据班级id获取阶段信息
+     */
+    SysDept getParent(Long classId);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java

@@ -136,4 +136,9 @@ public interface ISysDeptService {
      * 【PC】阶段列表
      */
     List<SysDept> getPhaseList();
+
+    /**
+     * 根据班级id获取阶段信息
+     */
+    SysDept getParent(Long classId);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -297,4 +297,12 @@ public class SysDeptServiceImpl implements ISysDeptService {
         return sysDepts;
     }
 
+    /**
+     * 根据班级id获取阶段信息
+     */
+    @Override
+    public SysDept getParent(Long classId) {
+        return baseMapper.getParent(classId);
+    }
+
 }

ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -71,4 +71,10 @@
         order by d.parent_id, d.order_num
     </select>
 
+    <select id="getParent" resultType="com.ruoyi.common.core.domain.entity.SysDept">
+        select phase.*
+        from sys_dept class
+                 left join sys_dept phase on class.parent_id = phase.dept_id
+        where class.dept_id = #{classId}
+    </select>
 </mapper>

school-paper/src/main/java/com/ruoyi/school/paper/controller/DbTestPaperRecordController.java

@@ -12,8 +12,10 @@ import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.school.paper.domain.bo.DbTestPaperBo;
 import com.ruoyi.school.paper.domain.bo.DbTestPaperRecordBo;
 import com.ruoyi.school.paper.domain.vo.DbTestPaperRecordVo;
+import com.ruoyi.school.paper.domain.vo.DbTestPaperVo;
 import com.ruoyi.school.paper.service.IDbTestPaperRecordService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -41,11 +43,19 @@ public class DbTestPaperRecordController extends BaseController {
     private final IDbTestPaperRecordService iDbTestPaperRecordService;
 
     /**
-     * 查询答题记录列表
+     * 【PC】 审批阅卷阶段列表
      */
-    @GetMapping("/list")
-    public TableDataInfo<DbTestPaperRecordVo> list(DbTestPaperRecordBo bo, PageQuery pageQuery) {
-        return iDbTestPaperRecordService.queryPageList(bo, pageQuery);
+    @GetMapping("/getPhaseList")
+    public TableDataInfo<DbTestPaperVo> getPhaseList(DbTestPaperBo bo, PageQuery pageQuery) {
+        return iDbTestPaperRecordService.getPhaseList(bo, pageQuery);
+    }
+
+    /**
+     * 【PC】 审批阅卷班级列表
+     */
+    @GetMapping("/getClassList")
+    public TableDataInfo<DbTestPaperVo> getClassList(DbTestPaperBo bo, PageQuery pageQuery) {
+        return iDbTestPaperRecordService.getClassList(bo, pageQuery);
     }
 
     /**

school-paper/src/main/java/com/ruoyi/school/paper/domain/bo/DbTestPaperBo.java

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * 试卷业务对象 db_test_paper
@@ -55,6 +56,7 @@ public class DbTestPaperBo extends BaseEntity {
      */
     @NotBlank(message = "强度不能为空", groups = {AddGroup.class, EditGroup.class})
     private String intensity;
+    private List<String> intensitys;
 
     /**
      * 总分：100，150

school-paper/src/main/java/com/ruoyi/school/paper/domain/vo/DbTestPaperRecordVo.java

@@ -38,9 +38,9 @@ public class DbTestPaperRecordVo {
     private Long testPaperId;
 
     /**
-     * 状态：0 批卷中，1 批卷完成
+     * 状态：0 答题中，1 待批阅，2批阅中，3 批阅完成
      */
-    @ExcelProperty(value = "状态：0 批卷中，1 批卷完成")
+    @ExcelProperty(value = "状态：0 答题中，1 待批阅，2批阅中，3 批阅完成")
     private Integer status;
 
     /**

school-paper/src/main/java/com/ruoyi/school/paper/mapper/DbTestPaperRecordMapper.java

@@ -3,8 +3,10 @@ package com.ruoyi.school.paper.mapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
 import com.ruoyi.school.paper.domain.DbTestPaperRecord;
+import com.ruoyi.school.paper.domain.bo.DbTestPaperBo;
 import com.ruoyi.school.paper.domain.bo.DbTestPaperRecordBo;
 import com.ruoyi.school.paper.domain.vo.DbTestPaperRecordVo;
+import com.ruoyi.school.paper.domain.vo.DbTestPaperVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -18,4 +20,9 @@ import org.apache.ibatis.annotations.Param;
 public interface DbTestPaperRecordMapper extends BaseMapperPlus<DbTestPaperRecordMapper, DbTestPaperRecord, DbTestPaperRecordVo> {
 
     Page<DbTestPaperRecordVo> getTestPaperlist(Page<Object> build, @Param("bo") DbTestPaperRecordBo bo);
+
+    /**
+     * pd段 审批阅卷阶段列表
+     */
+    Page<DbTestPaperVo> getPhaseList(Page<Object> build, @Param("bo") DbTestPaperBo bo);
 }

school-paper/src/main/java/com/ruoyi/school/paper/service/IDbTestPaperRecordService.java

@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.school.paper.domain.DbTestPaperRecord;
+import com.ruoyi.school.paper.domain.bo.DbTestPaperBo;
 import com.ruoyi.school.paper.domain.bo.DbTestPaperRecordBo;
 import com.ruoyi.school.paper.domain.vo.DbTestPaperRecordVo;
+import com.ruoyi.school.paper.domain.vo.DbTestPaperVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -57,4 +59,14 @@ public interface IDbTestPaperRecordService {
      * @return 结果
      */
     DbTestPaperRecord getOne(Wrapper<DbTestPaperRecord> wrapper);
+
+    /**
+     * 【PC】 审批阅卷阶段列表
+     */
+    TableDataInfo<DbTestPaperVo> getPhaseList(DbTestPaperBo bo, PageQuery pageQuery);
+
+    /**
+     * 【PC】 审批阅卷班级列表
+     */
+    TableDataInfo<DbTestPaperVo> getClassList(DbTestPaperBo bo, PageQuery pageQuery);
 }

school-paper/src/main/java/com/ruoyi/school/paper/service/impl/DbTestPaperRecordServiceImpl.java

@@ -8,8 +8,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.school.paper.domain.DbTestPaperRecord;
+import com.ruoyi.school.paper.domain.bo.DbTestPaperBo;
 import com.ruoyi.school.paper.domain.bo.DbTestPaperRecordBo;
 import com.ruoyi.school.paper.domain.vo.DbTestPaperRecordVo;
+import com.ruoyi.school.paper.domain.vo.DbTestPaperVo;
 import com.ruoyi.school.paper.mapper.DbTestPaperRecordMapper;
 import com.ruoyi.school.paper.service.IDbTestPaperRecordService;
 import lombok.RequiredArgsConstructor;
@@ -133,4 +135,21 @@ public class DbTestPaperRecordServiceImpl implements IDbTestPaperRecordService {
     public DbTestPaperRecord getOne(Wrapper<DbTestPaperRecord> wrapper) {
         return baseMapper.selectOne(wrapper);
     }
+
+    /**
+     * 审批阅卷阶段列表【PC】
+     */
+    @Override
+    public TableDataInfo<DbTestPaperVo> getPhaseList(DbTestPaperBo bo, PageQuery pageQuery) {
+        Page<DbTestPaperVo> result = baseMapper.getPhaseList(pageQuery.build(), bo);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 【PC】 审批阅卷班级列表
+     */
+    @Override
+    public TableDataInfo<DbTestPaperVo> getClassList(DbTestPaperBo bo, PageQuery pageQuery) {
+        return null;
+    }
 }

school-paper/src/main/java/com/ruoyi/school/paper/service/impl/DbTestPaperServiceImpl.java

@@ -151,6 +151,10 @@ public class DbTestPaperServiceImpl implements IDbTestPaperService {
     @Transactional(rollbackFor = Exception.class)
     public Boolean randomGeneration(DbTestPaperBo bo) {
         DbTestPaper add = BeanUtil.toBean(bo, DbTestPaper.class);
+        add.setIntensity(String.join(",", bo.getIntensitys()));
+        // 根据班级id获取阶段信息
+        SysDept phase = deptService.getParent(bo.getClassId());
+        add.setPhaseId(phase.getDeptId());
         baseMapper.insert(add);
         // 从redis中获取所有题目
         List<DbQuestionBank> dbQuestionBanks = JsonUtils.parseArray(RedisUtils.getCacheObject(DEFAULT_QUESTIOBN_BANK_KEY), DbQuestionBank.class);

school-paper/src/main/resources/mapper/school-paper/DbTestPaperRecordMapper.xml

@@ -23,4 +23,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join db_test_paper dtp on dtpr.test_paper_id = dtp.id
         where dtpr.user_id = #{bo.userId,jdbcType=BIGINT}
     </select>
+
+    <select id="getPhaseList" resultType="com.ruoyi.school.paper.domain.vo.DbTestPaperVo">
+        select dtpr.id,
+               dtp.test_name,
+               dtp.total_points,
+               concat(phase.dept_name, '', class.dept_name) as phase_class
+        from db_test_paper_record dtpr
+                 left join db_test_paper dtp on dtp.id = dtpr.test_paper_id
+                 LEFT JOIN sys_dept phase on dtp.phase_id = phase.dept_id
+                 left join sys_dept class on dtp.class_id = class.dept_id
+        where dtpr.status in (1, 2, 3)
+        <if test="bo.phaseId != null">
+            and dtp.phase_id = #{bo.phaseId,jdbcType=BIGINT}
+        </if>
+        <if test="bo.testName != null and bo.testName != ''">
+            and dtp.test_name like concat('%', #{bo.testName,jdbcType=VARCHAR}, '%')
+        </if>
+    </select>
 </mapper>