模拟考试

zhongzheng-api/src/main/java/com/zhongzheng/controller/bank/QuestionSimulateController.java

@@ -37,7 +37,7 @@ import io.swagger.annotations.ApiOperation;
 @Api(value = "模拟题库控制器", tags = {"模拟题库管理"})
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
-@RequestMapping("/system/simulate")
+@RequestMapping("/bank/simulate")
 public class QuestionSimulateController extends BaseController {
 
     private final IQuestionSimulateService iQuestionSimulateService;
@@ -54,18 +54,7 @@ public class QuestionSimulateController extends BaseController {
         return getDataTable(list);
     }
 
-    /**
-     * 导出模拟题库列表
-     */
-    @ApiOperation("导出模拟题库列表")
-    @PreAuthorize("@ss.hasPermi('system:simulate:export')")
-    @Log(title = "模拟题库", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<QuestionSimulateVo> export(QuestionSimulateQueryBo bo) {
-        List<QuestionSimulateVo> list = iQuestionSimulateService.queryList(bo);
-        ExcelUtil<QuestionSimulateVo> util = new ExcelUtil<QuestionSimulateVo>(QuestionSimulateVo.class);
-        return util.exportExcel(list, "模拟题库");
-    }
+
 
     /**
      * 获取模拟题库详细信息

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserStudyRecordController.java

@@ -0,0 +1,88 @@
+package com.zhongzheng.controller.user;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.user.bo.UserStudyRecordAddBo;
+import com.zhongzheng.modules.user.bo.UserStudyRecordEditBo;
+import com.zhongzheng.modules.user.bo.UserStudyRecordQueryBo;
+import com.zhongzheng.modules.user.service.IUserStudyRecordService;
+import com.zhongzheng.modules.user.vo.UserStudyRecordVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 用户学习记录Controller
+ *
+ * @author ruoyi
+ * @date 2021-06-25
+ */
+@Api(value = "用户学习记录控制器", tags = {"用户学习记录管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/study/record")
+public class UserStudyRecordController extends BaseController {
+
+    private final IUserStudyRecordService iUserStudyRecordService;
+
+    /**
+     * 查询用户学习记录列表
+     */
+    @ApiOperation("查询用户学习记录列表")
+    @GetMapping("/list")
+    public TableDataInfo<UserStudyRecordVo> list(UserStudyRecordQueryBo bo) {
+        startPage();
+        List<UserStudyRecordVo> list = iUserStudyRecordService.queryList(bo);
+        return getDataTable(list);
+    }
+
+
+
+    /**
+     * 获取用户学习记录详细信息
+     */
+    @ApiOperation("获取用户学习记录详细信息")
+    @GetMapping("/{recordId}")
+    public AjaxResult<UserStudyRecordVo> getInfo(@PathVariable("recordId" ) Long recordId) {
+        return AjaxResult.success(iUserStudyRecordService.queryById(recordId));
+    }
+
+    /**
+     * 新增用户学习记录
+     */
+    @ApiOperation("新增用户学习记录")
+    @Log(title = "用户学习记录", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody UserStudyRecordAddBo bo) {
+        return toAjax(iUserStudyRecordService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改用户学习记录
+     */
+    @ApiOperation("修改用户学习记录")
+    @Log(title = "用户学习记录", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult<Void> edit(@RequestBody UserStudyRecordEditBo bo) {
+        return toAjax(iUserStudyRecordService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/mapper/QuestionBankSectionMapper.java

@@ -8,6 +8,7 @@ import com.zhongzheng.modules.bank.vo.QuestionBankSectionVo;
 import com.zhongzheng.modules.bank.vo.QuestionBankVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 题库小节Mapper接口
@@ -18,4 +19,6 @@ import java.util.List;
 public interface QuestionBankSectionMapper extends BaseMapper<QuestionBankSection> {
 
     List<QuestionBankSectionVo> selectBankSectionList(QuestionBankSectionQueryBo bo);
+
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/mapper/QuestionMapper.java

@@ -2,6 +2,11 @@ package com.zhongzheng.modules.bank.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.bank.domain.Question;
+import com.zhongzheng.modules.bank.vo.QuestionBankSectionVo;
+import com.zhongzheng.modules.bank.vo.QuestionVo;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 题库题目Mapper接口
@@ -10,5 +15,5 @@ import com.zhongzheng.modules.bank.domain.Question;
  * @date 2021-05-20
  */
 public interface QuestionMapper extends BaseMapper<Question> {
-
+    List<QuestionVo> selectQuestionSimulateList(Map<String,Object> param);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/IQuestionSimulateService.java

@@ -23,6 +23,8 @@ public interface IQuestionSimulateService extends IService<QuestionSimulate> {
 	 */
 	QuestionSimulateVo queryById(Long simulateId);
 
+
+
 	/**
 	 * 查询列表
 	 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionSimulateServiceImpl.java

@@ -2,23 +2,31 @@ package com.zhongzheng.modules.bank.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.bank.bo.QuestionSimulateAddBo;
 import com.zhongzheng.modules.bank.bo.QuestionSimulateEditBo;
 import com.zhongzheng.modules.bank.bo.QuestionSimulateQueryBo;
+import com.zhongzheng.modules.bank.domain.Question;
 import com.zhongzheng.modules.bank.domain.QuestionSimulate;
+import com.zhongzheng.modules.bank.mapper.QuestionBankExamMapper;
+import com.zhongzheng.modules.bank.mapper.QuestionBankSectionMapper;
+import com.zhongzheng.modules.bank.mapper.QuestionMapper;
 import com.zhongzheng.modules.bank.mapper.QuestionSimulateMapper;
 import com.zhongzheng.modules.bank.service.IQuestionSimulateService;
+import com.zhongzheng.modules.bank.vo.QuestionBankSectionVo;
 import com.zhongzheng.modules.bank.vo.QuestionSimulateVo;
+import com.zhongzheng.modules.bank.vo.QuestionVo;
+import com.zhongzheng.modules.exam.mapper.ExamConfigMapper;
+import com.zhongzheng.modules.exam.vo.ExamConfigVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.Page;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -30,8 +38,66 @@ import java.util.stream.Collectors;
 @Service
 public class QuestionSimulateServiceImpl extends ServiceImpl<QuestionSimulateMapper, QuestionSimulate> implements IQuestionSimulateService {
 
+    @Autowired
+    private ExamConfigMapper examConfigMapper;
+
+    @Autowired
+    private QuestionMapper questionMapper;
+
     @Override
     public QuestionSimulateVo queryById(Long simulateId){
+        Map<String,Object> param = new HashMap<>();
+        Long bandId = 2L;
+        param.put("bandId",bandId);
+        ExamConfigVo vo = examConfigMapper.selectBankExamConfig(param);
+        if(vo==null){
+            throw new CustomException("该题库暂不支持模拟考试");
+        }
+        Long bank_section_id = 9L;
+        //抽选单选题
+        Map<String,Object> param1 = new HashMap<>();
+        param1.put("bankSectionId",bank_section_id);
+        param1.put("type",1);
+        param1.put("num",vo.getSingleChoiceNum());
+        List<QuestionVo> list1 = questionMapper.selectQuestionSimulateList(param1);
+        String type1_ids ="";
+        for (QuestionVo s : list1) {
+            type1_ids += s.getQuestionId()+",";
+        }
+        //抽选多选题
+        Map<String,Object> param2 = new HashMap<>();
+        param2.put("bankSectionId",bank_section_id);
+        param2.put("type",2);
+        param2.put("num",vo.getSingleChoiceNum());
+        List<QuestionVo> list2 = questionMapper.selectQuestionSimulateList(param2);
+        String type2_ids ="";
+        for (QuestionVo s : list2) {
+            type2_ids += s.getQuestionId()+",";
+        }
+        //抽选判断题
+        Map<String,Object> param3 = new HashMap<>();
+        param3.put("bankSectionId",bank_section_id);
+        param3.put("type",3);
+        param3.put("num",vo.getSingleChoiceNum());
+        List<QuestionVo> list3 = questionMapper.selectQuestionSimulateList(param3);
+        String type3_ids ="";
+        for (QuestionVo s : list3) {
+            type3_ids += s.getQuestionId()+",";
+        }
+        //抽选案例题
+        Map<String,Object> param4 = new HashMap<>();
+        param4.put("bankSectionId",bank_section_id);
+        param4.put("type",4);
+        param4.put("num",vo.getSingleChoiceNum());
+        List<QuestionVo> list4 = questionMapper.selectQuestionSimulateList(param4);
+        String type4_ids ="";
+        for (QuestionVo s : list4) {
+            type4_ids += s.getQuestionId()+",";
+        }
+        QuestionSimulateAddBo bo = new QuestionSimulateAddBo();
+        bo.setBankId(bandId);
+
+
         QuestionSimulate db = this.baseMapper.selectById(simulateId);
         return BeanUtil.toBean(db, QuestionSimulateVo.class);
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/mapper/ExamConfigMapper.java

@@ -9,6 +9,7 @@ import com.zhongzheng.modules.exam.domain.ExamConfig;
 import com.zhongzheng.modules.exam.vo.ExamConfigVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 考题配置Mapper接口
@@ -18,4 +19,6 @@ import java.util.List;
  */
 public interface ExamConfigMapper extends BaseMapper<ExamConfig> {
     List<ExamConfigVo> selectExamConfigList(ExamConfigQueryBo bo);
+
+    ExamConfigVo selectBankExamConfig(Map<String,Object> param);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserStudyRecordAddBo.java

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 用户学习记录添加对象 user_study_record
+ *
+ * @author ruoyi
+ * @date 2021-06-25
+ */
+@Data
+@ApiModel("用户学习记录添加对象")
+public class UserStudyRecordAddBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long userId;
+    /** 课程ID */
+    @ApiModelProperty("课程ID")
+    private Long courseId;
+    /** 节ID */
+    @ApiModelProperty("节ID")
+    private Long sectionId;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+    /** 学习时长 */
+    @ApiModelProperty("学习时长")
+    private Long studyDuration;
+    /** 开始时间 */
+    @ApiModelProperty("开始时间")
+    private Long startTime;
+    /** 结束时间 */
+    @ApiModelProperty("结束时间")
+    private Long endTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserStudyRecordEditBo.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 用户学习记录编辑对象 user_study_record
+ *
+ * @author ruoyi
+ * @date 2021-06-25
+ */
+@Data
+@ApiModel("用户学习记录编辑对象")
+public class UserStudyRecordEditBo {
+
+
+    /** 学习记录ID */
+    @ApiModelProperty("学习记录ID")
+    private Long recordId;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long userId;
+
+    /** 课程ID */
+    @ApiModelProperty("课程ID")
+    private Long courseId;
+
+    /** 节ID */
+    @ApiModelProperty("节ID")
+    private Long sectionId;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+
+    /** 学习时长 */
+    @ApiModelProperty("学习时长")
+    private Long studyDuration;
+
+    /** 开始时间 */
+    @ApiModelProperty("开始时间")
+    private Long startTime;
+
+    /** 结束时间 */
+    @ApiModelProperty("结束时间")
+    private Long endTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserStudyRecordQueryBo.java

@@ -0,0 +1,58 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 用户学习记录分页查询对象 user_study_record
+ *
+ * @author ruoyi
+ * @date 2021-06-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("用户学习记录分页查询对象")
+public class UserStudyRecordQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	private Long userId;
+	/** 课程ID */
+	@ApiModelProperty("课程ID")
+	private Long courseId;
+	/** 节ID */
+	@ApiModelProperty("节ID")
+	private Long sectionId;
+	/** 学习时长 */
+	@ApiModelProperty("学习时长")
+	private Long studyDuration;
+	/** 开始时间 */
+	@ApiModelProperty("开始时间")
+	private Long startTime;
+	/** 结束时间 */
+	@ApiModelProperty("结束时间")
+	private Long endTime;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserStudyRecord.java

@@ -0,0 +1,57 @@
+package com.zhongzheng.modules.user.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 用户学习记录对象 user_study_record
+ *
+ * @author ruoyi
+ * @date 2021-06-25
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("user_study_record")
+public class UserStudyRecord implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+
+    /** 学习记录ID */
+    @TableId(value = "record_id")
+    private Long recordId;
+
+    /** $column.columnComment */
+    private Long userId;
+
+    /** 课程ID */
+    private Long courseId;
+
+    /** 节ID */
+    private Long sectionId;
+
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+
+    /** $column.columnComment */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+
+    /** 学习时长 */
+    private Long studyDuration;
+
+    /** 开始时间 */
+    private Long startTime;
+
+    /** 结束时间 */
+    private Long endTime;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserStudyRecordMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.user.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.user.domain.UserStudyRecord;
+
+/**
+ * 用户学习记录Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-06-25
+ */
+public interface UserStudyRecordMapper extends BaseMapper<UserStudyRecord> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserStudyRecordService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.user.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.user.bo.UserStudyRecordAddBo;
+import com.zhongzheng.modules.user.bo.UserStudyRecordEditBo;
+import com.zhongzheng.modules.user.bo.UserStudyRecordQueryBo;
+import com.zhongzheng.modules.user.domain.UserStudyRecord;
+import com.zhongzheng.modules.user.vo.UserStudyRecordVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 用户学习记录Service接口
+ *
+ * @author ruoyi
+ * @date 2021-06-25
+ */
+public interface IUserStudyRecordService extends IService<UserStudyRecord> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	UserStudyRecordVo queryById(Long recordId);
+
+	/**
+	 * 查询列表
+	 */
+	List<UserStudyRecordVo> queryList(UserStudyRecordQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入用户学习记录
+	 * @param bo 用户学习记录新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(UserStudyRecordAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改用户学习记录
+	 * @param bo 用户学习记录编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(UserStudyRecordEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserStudyRecordServiceImpl.java

@@ -0,0 +1,104 @@
+package com.zhongzheng.modules.user.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.user.bo.UserStudyRecordAddBo;
+import com.zhongzheng.modules.user.bo.UserStudyRecordEditBo;
+import com.zhongzheng.modules.user.bo.UserStudyRecordQueryBo;
+import com.zhongzheng.modules.user.domain.UserStudyRecord;
+import com.zhongzheng.modules.user.mapper.UserStudyRecordMapper;
+import com.zhongzheng.modules.user.service.IUserStudyRecordService;
+import com.zhongzheng.modules.user.vo.UserStudyRecordVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 用户学习记录Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-06-25
+ */
+@Service
+public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMapper, UserStudyRecord> implements IUserStudyRecordService {
+
+    @Override
+    public UserStudyRecordVo queryById(Long recordId){
+        UserStudyRecord db = this.baseMapper.selectById(recordId);
+        return BeanUtil.toBean(db, UserStudyRecordVo.class);
+    }
+
+    @Override
+    public List<UserStudyRecordVo> queryList(UserStudyRecordQueryBo bo) {
+        LambdaQueryWrapper<UserStudyRecord> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getUserId() != null, UserStudyRecord::getUserId, bo.getUserId());
+        lqw.eq(bo.getCourseId() != null, UserStudyRecord::getCourseId, bo.getCourseId());
+        lqw.eq(bo.getSectionId() != null, UserStudyRecord::getSectionId, bo.getSectionId());
+        lqw.eq(bo.getStudyDuration() != null, UserStudyRecord::getStudyDuration, bo.getStudyDuration());
+        lqw.eq(bo.getStartTime() != null, UserStudyRecord::getStartTime, bo.getStartTime());
+        lqw.eq(bo.getEndTime() != null, UserStudyRecord::getEndTime, bo.getEndTime());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<UserStudyRecordVo> entity2Vo(Collection<UserStudyRecord> collection) {
+        List<UserStudyRecordVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, UserStudyRecordVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<UserStudyRecord> page = (Page<UserStudyRecord>)collection;
+            Page<UserStudyRecordVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(UserStudyRecordAddBo bo) {
+        UserStudyRecord add = BeanUtil.toBean(bo, UserStudyRecord.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(UserStudyRecordEditBo bo) {
+        UserStudyRecord update = BeanUtil.toBean(bo, UserStudyRecord.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(UserStudyRecord entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserStudyRecordVo.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.user.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 用户学习记录视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-06-25
+ */
+@Data
+@ApiModel("用户学习记录视图对象")
+public class UserStudyRecordVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 学习记录ID */
+	@ApiModelProperty("学习记录ID")
+	private Long recordId;
+
+	/** $column.columnComment */
+	@Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()")
+	@ApiModelProperty("$column.columnComment")
+	private Long userId;
+	/** 课程ID */
+	@Excel(name = "课程ID")
+	@ApiModelProperty("课程ID")
+	private Long courseId;
+	/** 节ID */
+	@Excel(name = "节ID")
+	@ApiModelProperty("节ID")
+	private Long sectionId;
+	/** 学习时长 */
+	@Excel(name = "学习时长")
+	@ApiModelProperty("学习时长")
+	private Long studyDuration;
+	/** 开始时间 */
+	@Excel(name = "开始时间")
+	@ApiModelProperty("开始时间")
+	private Long startTime;
+	/** 结束时间 */
+	@Excel(name = "结束时间")
+	@ApiModelProperty("结束时间")
+	private Long endTime;
+
+}

zhongzheng-system/src/main/resources/mapper/modules/bank/QuestionMapper.xml

@@ -20,5 +20,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="jsonStr" column="json_str"/>
     </resultMap>
 
-
+    <select id="selectQuestionSimulateList" parameterType="map"  resultMap="QuestionResult">
+        SELECT
+            *
+        FROM
+            question
+        WHERE
+            bank_section_id = #{bankSectionId}
+          AND type = #{type}
+        ORDER BY
+            RAND()
+            LIMIT #{num}
+    </select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/exam/ExamConfigMapper.xml

@@ -42,4 +42,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND ex.category_id = #{categoryId}
         </if>
     </select>
+
+    <select id="selectBankExamConfig" parameterType="map"  resultMap="ExamConfigResult">
+        SELECT
+        ex.*
+        FROM
+        question_bank qb
+        RIGHT JOIN exam_config ex ON qb.category_id = ex.category_id
+        WHERE
+        qb.bank_id = #{bankId}
+
+    </select>
+
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/user/UserStudyRecordMapper.xml

@@ -0,0 +1,20 @@
+<?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">
+<mapper namespace="com.zhongzheng.modules.user.mapper.UserStudyRecordMapper">
+
+    <resultMap type="com.zhongzheng.modules.user.domain.UserStudyRecord" id="UserStudyRecordResult">
+        <result property="recordId" column="record_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="courseId" column="course_id"/>
+        <result property="sectionId" column="section_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="studyDuration" column="study_duration"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
+    </resultMap>
+
+
+</mapper>