Skip to content

S
school-paper-admin
Commit ac480bc7 by 邹磊浩
Options

代码提交

parent 7e57bafb
Showing with 242 additions and 43 deletions
school-paper/src/main/java/com/ruoyi/school/paper/controller/DbCollectListController.java
......@@ -5,9 +5,12 @@ import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import cn.dev33.satoken.annotation.SaIgnore;
import com.ruoyi.school.paper.domain.vo.MyCollectListVo;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
......@@ -42,11 +45,11 @@ public class DbCollectListController extends BaseController {
private final IDbCollectListService iDbCollectListService;
/**
* 查询收藏列表
* 查询我的收藏列表
*/
@GetMapping("/list")
public TableDataInfo<DbCollectListVo> list(DbCollectListBo bo, PageQuery pageQuery) {
return iDbCollectListService.queryPageList(bo, pageQuery);
public TableDataInfo<MyCollectListVo> list(@RequestParam("categoryId") Integer categoryId, PageQuery pageQuery) {
return iDbCollectListService.queryPageList(categoryId, getUserId(), pageQuery);
}
/**
......@@ -66,12 +69,13 @@ public class DbCollectListController extends BaseController {
*/
@GetMapping("/{id}")
public R<DbCollectListVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
@PathVariable Long id) {
return R.ok(iDbCollectListService.queryById(id));
}
/**
* 【小程序】新增收藏
* 【小程序】新增收藏
*
* @param bo 参数
* @return
*/
......
school-paper/src/main/java/com/ruoyi/school/paper/controller/DbErrorListController.java
......@@ -5,9 +5,15 @@ import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import cn.dev33.satoken.annotation.SaIgnore;
import com.ruoyi.school.paper.domain.request.ErrorTopicRequest;
import com.ruoyi.school.paper.domain.vo.ErrorTopicListDetailVo;
import com.ruoyi.school.paper.domain.vo.ErrorTopicListVo;
import com.ruoyi.school.paper.domain.vo.MyErrorTopicListVo;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
......@@ -42,11 +48,20 @@ public class DbErrorListController extends BaseController {
private final IDbErrorListService iDbErrorListService;
/**
* 查询错题集列表
* 【后台】查询错题集列表
*/
@GetMapping("/list")
public TableDataInfo<DbErrorListVo> list(DbErrorListBo bo, PageQuery pageQuery) {
return iDbErrorListService.queryPageList(bo, pageQuery);
public TableDataInfo<ErrorTopicListVo> findErrorTopicPage(ErrorTopicRequest request, PageQuery pageQuery) {
return iDbErrorListService.findErrorTopicPage(pageQuery, request);
}
/**
* 【小程序】我的错题集列表
*/
@GetMapping("/MyErrorTopicList")
public TableDataInfo<MyErrorTopicListVo> findMyErrorTopicListVoPage(ErrorTopicRequest request, PageQuery pageQuery) {
request.setUserId(1L);
return iDbErrorListService.findMyErrorTopicListVoPage(pageQuery, request);
}
/**
......@@ -65,8 +80,8 @@ public class DbErrorListController extends BaseController {
* @param id 主键
*/
@GetMapping("/{id}")
public R<DbErrorListVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
public R<ErrorTopicListDetailVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(iDbErrorListService.queryById(id));
}
......
school-paper/src/main/java/com/ruoyi/school/paper/controller/DbQuestionBankController.java
......@@ -36,7 +36,6 @@ import com.ruoyi.common.core.page.TableDataInfo;
@RequiredArgsConstructor
@RestController
@RequestMapping("/school-paper/questionBank")
@SaIgnore
public class DbQuestionBankController extends BaseController {
private final IDbQuestionBankService iDbQuestionBankService;
......@@ -46,6 +45,7 @@ public class DbQuestionBankController extends BaseController {
*/
@GetMapping("/list")
public TableDataInfo<DbQuestionBankVo> list(DbQuestionBankBo bo, PageQuery pageQuery) {
return iDbQuestionBankService.queryPageList(bo, pageQuery);
}
......
school-paper/src/main/java/com/ruoyi/school/paper/domain/DbTestPaperRecordDetail.java
......@@ -43,6 +43,10 @@ public class DbTestPaperRecordDetail extends BaseEntity {
*/
private String answer;
/**
* 正确答案
*/
private String correctAnswer;
/**
* 得分
*/
private BigDecimal score;
......
school-paper/src/main/java/com/ruoyi/school/paper/domain/bo/DbTestPaperRecordDetailBo.java
package com.ruoyi.school.paper.domain.bo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import lombok.Data;
......@@ -27,55 +28,51 @@ public class DbTestPaperRecordDetailBo extends BaseEntity {
/**
* 主键id
*/
@NotNull(message = "主键id不能为空", groups = { EditGroup.class })
private Long id;
/**
* 记录id
*/
@NotNull(message = "记录id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long recordId;
/**
* 题目id
*/
@NotNull(message = "题目id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long questionBankId;
/**
* 答案
*/
@NotBlank(message = "答案不能为空", groups = { AddGroup.class, EditGroup.class })
private String answer;
/**
* 得分
*/
@NotNull(message = "得分不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal score;
/**
* 是否优秀答案：0是，1不是
*/
@NotNull(message = "是否优秀答案：0是，1不是不能为空", groups = { AddGroup.class, EditGroup.class })
private Integer good;
/**
* 备注
*/
@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
private String remark;
/**
* 正确答案
*/
private String correctAnswer;
/**
* 状态：0正常，1 删除
*/
@NotNull(message = "状态：0正常，1 删除不能为空", groups = { AddGroup.class, EditGroup.class })
private Integer status;
/**
* 创建时间
*/
@NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date cerateTime;
......
school-paper/src/main/java/com/ruoyi/school/paper/domain/vo/DbTestPaperRecordDetailVo.java
......@@ -49,6 +49,12 @@ public class DbTestPaperRecordDetailVo {
private String answer;
/**
* 正确答案
*/
@ExcelProperty(value = "正确答案")
private String correctAnswer;
/**
* 得分
*/
@ExcelProperty(value = "得分")
......
school-paper/src/main/java/com/ruoyi/school/paper/mapper/DbCollectListMapper.java
package com.ruoyi.school.paper.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.school.paper.domain.DbCollectList;
import com.ruoyi.school.paper.domain.request.ErrorTopicRequest;
import com.ruoyi.school.paper.domain.vo.DbCollectListVo;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import com.ruoyi.school.paper.domain.vo.ErrorTopicListVo;
import com.ruoyi.school.paper.domain.vo.MyCollectListVo;
import com.ruoyi.school.paper.domain.vo.MyErrorTopicListVo;
import org.apache.ibatis.annotations.Param;
/**
* 收藏Mapper接口
......@@ -11,5 +18,5 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
* @date 2023-07-20
*/
public interface DbCollectListMapper extends BaseMapperPlus<DbCollectListMapper, DbCollectList, DbCollectListVo> {
Page<MyCollectListVo> findMyECollectListVoPage(IPage<MyCollectListVo> iPage,@Param("userId") Long userId, @Param("categoryId") Integer categoryId);
}
school-paper/src/main/java/com/ruoyi/school/paper/mapper/DbErrorListMapper.java
package com.ruoyi.school.paper.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.school.paper.domain.DbErrorList;
import com.ruoyi.school.paper.domain.request.ErrorTopicRequest;
import com.ruoyi.school.paper.domain.vo.DbErrorListVo;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import com.ruoyi.school.paper.domain.vo.ErrorTopicListDetailVo;
import com.ruoyi.school.paper.domain.vo.ErrorTopicListVo;
import com.ruoyi.school.paper.domain.vo.MyErrorTopicListVo;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
/**
* 错题集Mapper接口
......@@ -11,5 +22,9 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
* @date 2023-07-20
*/
public interface DbErrorListMapper extends BaseMapperPlus<DbErrorListMapper, DbErrorList, DbErrorListVo> {
Page<ErrorTopicListVo> findErrorTopicPage(IPage<ErrorTopicListVo> iPage, @Param("request") ErrorTopicRequest request);
List<ErrorTopicListDetailVo> findErrorTopicListDetailById(@Param("id") Long id);
Page<MyErrorTopicListVo> findMyErrorTopicListVoPage(IPage<ErrorTopicListVo> iPage, @Param("request") ErrorTopicRequest request);
}
school-paper/src/main/java/com/ruoyi/school/paper/service/IDbCollectListService.java
......@@ -5,6 +5,7 @@ import com.ruoyi.school.paper.domain.vo.DbCollectListVo;
import com.ruoyi.school.paper.domain.bo.DbCollectListBo;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.school.paper.domain.vo.MyCollectListVo;
import java.util.Collection;
import java.util.List;
......@@ -25,7 +26,7 @@ public interface IDbCollectListService {
/**
* 查询收藏列表
*/
TableDataInfo<DbCollectListVo> queryPageList(DbCollectListBo bo, PageQuery pageQuery);
TableDataInfo<MyCollectListVo> queryPageList(Integer categoryId,Long userId, PageQuery pageQuery);
/**
* 查询收藏列表
......
school-paper/src/main/java/com/ruoyi/school/paper/service/IDbErrorListService.java
package com.ruoyi.school.paper.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.school.paper.domain.DbErrorList;
import com.ruoyi.school.paper.domain.request.ErrorTopicRequest;
import com.ruoyi.school.paper.domain.vo.DbErrorListVo;
import com.ruoyi.school.paper.domain.bo.DbErrorListBo;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.school.paper.domain.vo.ErrorTopicListDetailVo;
import com.ruoyi.school.paper.domain.vo.ErrorTopicListVo;
import com.ruoyi.school.paper.domain.vo.MyErrorTopicListVo;
import java.util.Collection;
import java.util.List;
......@@ -20,7 +25,7 @@ public interface IDbErrorListService {
/**
* 查询错题集
*/
DbErrorListVo queryById(Long id);
ErrorTopicListDetailVo queryById(Long id);
/**
* 查询错题集列表
......@@ -46,4 +51,20 @@ public interface IDbErrorListService {
* 校验并批量删除错题集信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 错题集列表
* @param request
* @return
*/
TableDataInfo<ErrorTopicListVo> findErrorTopicPage(PageQuery pageQuery,ErrorTopicRequest request);
/**
* 我的错题列表
* @param pageQuery
* @param request
* @return
*/
TableDataInfo<MyErrorTopicListVo> findMyErrorTopicListVoPage(PageQuery pageQuery, ErrorTopicRequest request);
}
school-paper/src/main/java/com/ruoyi/school/paper/service/impl/DbCollectListServiceImpl.java
......@@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.school.paper.domain.vo.MyCollectListVo;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.ruoyi.school.paper.domain.bo.DbCollectListBo;
......@@ -35,7 +36,7 @@ public class DbCollectListServiceImpl implements IDbCollectListService {
* 查询收藏
*/
@Override
public DbCollectListVo queryById(Long id){
public DbCollectListVo queryById(Long id) {
return baseMapper.selectVoById(id);
}
......@@ -43,9 +44,8 @@ public class DbCollectListServiceImpl implements IDbCollectListService {
* 查询收藏列表
*/
@Override
public TableDataInfo<DbCollectListVo> queryPageList(DbCollectListBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<DbCollectList> lqw = buildQueryWrapper(bo);
Page<DbCollectListVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
public TableDataInfo<MyCollectListVo> queryPageList(Integer categoryId, Long userId, PageQuery pageQuery) {
Page<MyCollectListVo> result = baseMapper.findMyECollectListVoPage(pageQuery.build(), userId, categoryId);
return TableDataInfo.build(result);
}
......@@ -94,7 +94,7 @@ public class DbCollectListServiceImpl implements IDbCollectListService {
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(DbCollectList entity){
private void validEntityBeforeSave(DbCollectList entity) {
//TODO 做一些数据校验,如唯一约束
}
......@@ -103,7 +103,7 @@ public class DbCollectListServiceImpl implements IDbCollectListService {
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
......
school-paper/src/main/java/com/ruoyi/school/paper/service/impl/DbErrorListServiceImpl.java
package com.ruoyi.school.paper.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.school.paper.domain.DbQuestionBankAnswerTestPaper;
import com.ruoyi.school.paper.domain.request.ErrorTopicRequest;
import com.ruoyi.school.paper.domain.vo.*;
import com.ruoyi.school.paper.mapper.DbQuestionBankAnswerTestPaperMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.ruoyi.school.paper.domain.bo.DbErrorListBo;
import com.ruoyi.school.paper.domain.vo.DbErrorListVo;
import com.ruoyi.school.paper.domain.DbErrorList;
import com.ruoyi.school.paper.mapper.DbErrorListMapper;
import com.ruoyi.school.paper.service.IDbErrorListService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.*;
import java.util.stream.Collectors;
/**
* 错题集Service业务层处理
......@@ -31,12 +34,35 @@ public class DbErrorListServiceImpl implements IDbErrorListService {
private final DbErrorListMapper baseMapper;
private final DbQuestionBankAnswerTestPaperMapper dbQuestionBankAnswerTestPaperMapper;
/**
* 查询错题集
*/
@Override
public DbErrorListVo queryById(Long id){
return baseMapper.selectVoById(id);
public ErrorTopicListDetailVo queryById(Long id) {
List<ErrorTopicListDetailVo> errorTopicListDetailVoList = baseMapper.findErrorTopicListDetailById(id);
if (CollectionUtils.isNotEmpty(errorTopicListDetailVoList)) {
List<OptionVo> list = errorTopicListDetailVoList.stream()
.map(errorTopicListDetailVo -> {
OptionVo optionVo = new OptionVo();
optionVo.setOptionTag(errorTopicListDetailVo.getOptionTag());
optionVo.setOptionContent(errorTopicListDetailVo.getOptionContent());
return optionVo;
})
.collect(Collectors.toList());
ErrorTopicListDetailVo firstErrorTopicListDetailVo = errorTopicListDetailVoList.get(0);
ErrorTopicListDetailVo errorTopicListDetailVo = new ErrorTopicListDetailVo();
errorTopicListDetailVo.setTopic(firstErrorTopicListDetailVo.getTopic());
errorTopicListDetailVo.setIntensity(firstErrorTopicListDetailVo.getIntensity());
errorTopicListDetailVo.setSpecies(firstErrorTopicListDetailVo.getSpecies());
errorTopicListDetailVo.setTypeName(firstErrorTopicListDetailVo.getTypeName());
errorTopicListDetailVo.setRightAnswers(firstErrorTopicListDetailVo.getRightAnswers());
errorTopicListDetailVo.setOptions(list);
return errorTopicListDetailVo;
}
return null;
}
/**
......@@ -95,7 +121,7 @@ public class DbErrorListServiceImpl implements IDbErrorListService {
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(DbErrorList entity){
private void validEntityBeforeSave(DbErrorList entity) {
//TODO 做一些数据校验,如唯一约束
}
......@@ -104,9 +130,32 @@ public class DbErrorListServiceImpl implements IDbErrorListService {
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
@Override
public TableDataInfo<ErrorTopicListVo> findErrorTopicPage(PageQuery pageQuery, ErrorTopicRequest request) {
Page<ErrorTopicListVo> result = baseMapper.findErrorTopicPage(pageQuery.build(), request);
return TableDataInfo.build(result);
}
@Override
public TableDataInfo<MyErrorTopicListVo> findMyErrorTopicListVoPage(PageQuery pageQuery, ErrorTopicRequest request) {
Page<MyErrorTopicListVo> myErrorTopicListVoPage = baseMapper.findMyErrorTopicListVoPage(pageQuery.build(), request);
List<MyErrorTopicListVo> records = myErrorTopicListVoPage.getRecords();
if (CollectionUtils.isNotEmpty(records)) {
records.forEach(myErrorTopicListVo -> {
//根据每到题目查询对应的选项
Optional.ofNullable(dbQuestionBankAnswerTestPaperMapper.selectList(Wrappers.<DbQuestionBankAnswerTestPaper>lambdaQuery().eq(DbQuestionBankAnswerTestPaper::getQuestionBankId, myErrorTopicListVo.getQuestionBankId())))
.ifPresent(dbQuestionBankAnswerTestPapers -> {
//拿到对应选项填充至每道错题当中
myErrorTopicListVo.setOptions(dbQuestionBankAnswerTestPapers);
});
});
}
return TableDataInfo.build(myErrorTopicListVoPage);
}
}
school-paper/src/main/resources/mapper/school-paper/DbCollectListMapper.xml
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.school.paper.mapper.DbCollectListMapper">
<resultMap type="com.ruoyi.school.paper.domain.DbCollectList" id="DbCollectListResult">
......@@ -15,6 +15,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
</resultMap>
<select id="findMyECollectListVoPage" resultType="com.ruoyi.school.paper.domain.vo.MyCollectListVo">
SELECT
dcl.question_bank_id questionBankId,
dqb.topic AS topic,
dqb.right_answers AS rightAnswers,
dqb.right_answers_pic AS rightAnswersPic
FROM
db_collect_list AS dcl
LEFT JOIN db_question_bank AS dqb ON dcl.question_bank_id = dqb.id
LEFT JOIN db_question_bank_answer AS dqba ON dqba.question_bank_id = dqb.id
<where>
dcl.user_id = #{userId}
<if test="categoryId != null">
and dqb.category_id = #{categoryId}
</if>
</where>
</select>
</mapper>
school-paper/src/main/resources/mapper/school-paper/DbErrorListMapper.xml
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.school.paper.mapper.DbErrorListMapper">
<resultMap type="com.ruoyi.school.paper.domain.DbErrorList" id="DbErrorListResult">
......@@ -16,6 +16,67 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
</resultMap>
<select id="findErrorTopicPage" resultType="com.ruoyi.school.paper.domain.vo.ErrorTopicListVo"
parameterType="com.ruoyi.school.paper.domain.request.ErrorTopicRequest">
SELECT
del.id AS id,
del.question_bank_id AS questionBankId,
dqbtp.topic as topic
FROM
db_error_list AS del
LEFT JOIN db_test_paper_record AS dtpr ON del.paper_id = dtpr.test_paper_id
LEFT JOIN db_test_paper_record_detail AS dtprd ON dtpr.id = dtprd.record_id
LEFT JOIN db_question_bank_test_paper AS dqbtp ON dqbtp.test_paper_id = del.paper_id
<where>
<if test="request.categoryId != null">
dqbtp.category_id = #{request.categoryId}
</if>
<if test="request.species != null">
and dqbtp.species = #{request.species}
</if>
<if test="request.type != null">
and dqbtp.type = #{request.type}
</if>
<if test="request.intensity != null">
and dqbtp.intensity = #{request.intensity}
</if>
</where>
</select>
<select id="findErrorTopicListDetailById" resultType="com.ruoyi.school.paper.domain.vo.ErrorTopicListDetailVo"
parameterType="java.lang.Long">
SELECT dqt.type_value AS typeName,
dqbtp.intensity AS intensity,
dqbtp.species AS species,
dqbtp.topic AS topic,
dqbtp.right_answers AS rightAnswers,
dpbatp.option_tag AS optionTag,
dpbatp.option_content AS optionContent
FROM db_error_list AS del
LEFT JOIN db_test_paper_record AS dtpr ON del.paper_id = dtpr.test_paper_id
LEFT JOIN db_test_paper_record_detail AS dtprd ON dtpr.id = dtprd.record_id
LEFT JOIN db_question_bank_answer_test_paper AS dpbatp
ON dtprd.question_bank_id = dpbatp.question_bank_id
LEFT JOIN db_question_bank_test_paper AS dqbtp ON dqbtp.test_paper_id = del.paper_id
LEFT JOIN db_question_type AS dqt ON dqt.id = dqbtp.category_id
WHERE del.id = #{id}
</select>
<select id="findMyErrorTopicListVoPage" resultType="com.ruoyi.school.paper.domain.vo.MyErrorTopicListVo">
SELECT
del.id AS id,
dtprd.question_bank_id AS questionBankId,
dqbtp.topic AS topic,
dtprd.answer AS answer,
dtprd.correct_answer AS correctAnswer
FROM
db_error_list AS del
LEFT JOIN db_test_paper_record AS dtpr ON del.paper_id = dtpr.test_paper_id
LEFT JOIN db_test_paper_record_detail AS dtprd ON del.question_bank_id = dtprd.question_bank_id
LEFT JOIN db_question_bank_test_paper AS dqbtp ON dtprd.question_bank_id = dqbtp.id
<where>
del.user_id = #{request.userId}
<if test="request.categoryId != null">
and dqbtp.category_id = #{request.categoryId}
</if>
</where>
</select>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment