fix 二造

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/ExamSimulateAddBo.java

@@ -0,0 +1,48 @@
+package com.zhongzheng.modules.bank.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 模拟考生成试卷添加对象 exam_simulate
+ *
+ * @author hjl
+ * @date 2022-12-09
+ */
+@Data
+@ApiModel("模拟考生成试卷添加对象")
+public class ExamSimulateAddBo {
+
+    /**  状态 1正常 0关闭 */
+    @ApiModelProperty(" 状态 1正常 0关闭")
+    private Integer status;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+    /** 试卷名 */
+    @ApiModelProperty("试卷名")
+    private String examName;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 商品ID */
+    @ApiModelProperty("商品ID")
+    private Long goodsId;
+    /** 用户ID */
+    @ApiModelProperty("用户ID")
+    private Long userId;
+    /** 订单商品ID */
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
+    /** 来源试卷ID */
+    @ApiModelProperty("来源试卷ID")
+    private Long examId;
+    /** 试卷类型id */
+    @ApiModelProperty("试卷类型id")
+    private Long examPaperId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/ExamSimulateEditBo.java

@@ -0,0 +1,57 @@
+package com.zhongzheng.modules.bank.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 模拟考生成试卷编辑对象 exam_simulate
+ *
+ * @author hjl
+ * @date 2022-12-09
+ */
+@Data
+@ApiModel("模拟考生成试卷编辑对象")
+public class ExamSimulateEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long simulateExamId;
+
+    /**  状态 1正常 0关闭 */
+    @ApiModelProperty(" 状态 1正常 0关闭")
+    private Integer status;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+    /** 试卷名 */
+    @ApiModelProperty("试卷名")
+    private String examName;
+
+    /** 商品ID */
+    @ApiModelProperty("商品ID")
+    private Long goodsId;
+
+    /** 用户ID */
+    @ApiModelProperty("用户ID")
+    private Long userId;
+
+
+    /** 订单商品ID */
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
+
+    /** 来源试卷ID */
+    @ApiModelProperty("来源试卷ID")
+    private Long examId;
+
+    /** 试卷类型id */
+    @ApiModelProperty("试卷类型id")
+    private Long examPaperId;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/ExamSimulateQueryBo.java

@@ -0,0 +1,60 @@
+package com.zhongzheng.modules.bank.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;
+
+/**
+ * 模拟考生成试卷分页查询对象 exam_simulate
+ *
+ * @author hjl
+ * @date 2022-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("模拟考生成试卷分页查询对象")
+public class ExamSimulateQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/**  状态 1正常 0关闭 */
+	@ApiModelProperty(" 状态 1正常 0关闭")
+	private Integer status;
+	/** 试卷名 */
+	@ApiModelProperty("试卷名")
+	private String examName;
+	/** 商品ID */
+	@ApiModelProperty("商品ID")
+	private Long goodsId;
+	/** 用户ID */
+	@ApiModelProperty("用户ID")
+	private Long userId;
+	/** 订单商品ID */
+	@ApiModelProperty("订单商品ID")
+	private Long orderGoodsId;
+	/** 来源试卷ID */
+	@ApiModelProperty("来源试卷ID")
+	private Long examId;
+	/** 试卷类型id */
+	@ApiModelProperty("试卷类型id")
+	private Long examPaperId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/ExamSimulateQuestionAddBo.java

@@ -0,0 +1,30 @@
+package com.zhongzheng.modules.bank.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 模拟考试卷题目关系添加对象 exam_simulate_question
+ *
+ * @author hjl
+ * @date 2022-12-09
+ */
+@Data
+@ApiModel("模拟考试卷题目关系添加对象")
+public class ExamSimulateQuestionAddBo {
+
+    /** 试卷ID */
+    @ApiModelProperty("试卷ID")
+    private Long examId;
+    /** 题目ID */
+    @ApiModelProperty("题目ID")
+    private Long questionId;
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Long sort;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/ExamSimulateQuestionEditBo.java

@@ -0,0 +1,37 @@
+package com.zhongzheng.modules.bank.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 模拟考试卷题目关系编辑对象 exam_simulate_question
+ *
+ * @author hjl
+ * @date 2022-12-09
+ */
+@Data
+@ApiModel("模拟考试卷题目关系编辑对象")
+public class ExamSimulateQuestionEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 试卷ID */
+    @ApiModelProperty("试卷ID")
+    private Long examId;
+
+    /** 题目ID */
+    @ApiModelProperty("题目ID")
+    private Long questionId;
+
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Long sort;
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/ExamSimulateQuestionQueryBo.java

@@ -0,0 +1,48 @@
+package com.zhongzheng.modules.bank.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;
+
+/**
+ * 模拟考试卷题目关系分页查询对象 exam_simulate_question
+ *
+ * @author hjl
+ * @date 2022-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("模拟考试卷题目关系分页查询对象")
+public class ExamSimulateQuestionQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 试卷ID */
+	@ApiModelProperty("试卷ID")
+	private Long examId;
+	/** 题目ID */
+	@ApiModelProperty("题目ID")
+	private Long questionId;
+	/** 排序 */
+	@ApiModelProperty("排序")
+	private Long sort;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/ExamSimulateTypeBo.java

@@ -17,11 +17,11 @@ public class ExamSimulateTypeBo {
     private Integer qnum;
 
     /**  顺序数 */
-    @ApiModelProperty("顺序数 0-3 0不开启 1-3启动")
+    @ApiModelProperty("顺序数 1-3")
     private Integer orderNum;
 
     /**  随机数 */
-    @ApiModelProperty("随机数 0-1 0不开启 1启动")
+    @ApiModelProperty("1顺序 0随机")
     private Integer randomNum;
 
     @ApiModelProperty("知识点ID数组")

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/domain/ExamSimulate.java

@@ -0,0 +1,49 @@
+package com.zhongzheng.modules.bank.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;
+
+/**
+ * 模拟考生成试卷对象 exam_simulate
+ *
+ * @author hjl
+ * @date 2022-12-09
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("exam_simulate")
+public class ExamSimulate implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "simulate_exam_id")
+    private Long simulateExamId;
+    /** 来源试卷ID */
+    private Long examId;
+    /**  状态 1正常 0关闭 */
+    private Integer status;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 试卷名 */
+    private String examName;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 商品ID */
+    private Long goodsId;
+    /** 用户ID */
+    private Long userId;
+    /** 订单商品ID */
+    private Long orderGoodsId;
+    /** 试卷类型id */
+    private Long examPaperId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/domain/ExamSimulateQuestion.java

@@ -0,0 +1,35 @@
+package com.zhongzheng.modules.bank.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;
+
+/**
+ * 模拟考试卷题目关系对象 exam_simulate_question
+ *
+ * @author hjl
+ * @date 2022-12-09
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("exam_simulate_question")
+public class ExamSimulateQuestion implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 试卷ID */
+    private Long examId;
+    /** 题目ID */
+    private Long questionId;
+    /** 排序 */
+    private Long sort;
+}

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.bank.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.bank.domain.ExamSimulate;
+
+/**
+ * 模拟考生成试卷Mapper接口
+ *
+ * @author hjl
+ * @date 2022-12-09
+ */
+public interface ExamSimulateMapper extends BaseMapper<ExamSimulate> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.bank.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.bank.domain.ExamSimulateQuestion;
+
+/**
+ * 模拟考试卷题目关系Mapper接口
+ *
+ * @author hjl
+ * @date 2022-12-09
+ */
+public interface ExamSimulateQuestionMapper extends BaseMapper<ExamSimulateQuestion> {
+
+}

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

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.bank.service;
+
+import com.zhongzheng.modules.bank.bo.ExamSimulateQuestionAddBo;
+import com.zhongzheng.modules.bank.bo.ExamSimulateQuestionEditBo;
+import com.zhongzheng.modules.bank.bo.ExamSimulateQuestionQueryBo;
+import com.zhongzheng.modules.bank.domain.ExamSimulateQuestion;
+import com.zhongzheng.modules.bank.vo.ExamSimulateQuestionVo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 模拟考试卷题目关系Service接口
+ *
+ * @author hjl
+ * @date 2022-12-09
+ */
+public interface IExamSimulateQuestionService extends IService<ExamSimulateQuestion> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ExamSimulateQuestionVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<ExamSimulateQuestionVo> queryList(ExamSimulateQuestionQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入模拟考试卷题目关系
+	 * @param bo 模拟考试卷题目关系新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(ExamSimulateQuestionAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改模拟考试卷题目关系
+	 * @param bo 模拟考试卷题目关系编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(ExamSimulateQuestionEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.bank.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.bank.bo.ExamSimulateAddBo;
+import com.zhongzheng.modules.bank.bo.ExamSimulateEditBo;
+import com.zhongzheng.modules.bank.bo.ExamSimulateQueryBo;
+import com.zhongzheng.modules.bank.domain.ExamSimulate;
+import com.zhongzheng.modules.bank.vo.ExamSimulateVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 模拟考生成试卷Service接口
+ *
+ * @author hjl
+ * @date 2022-12-09
+ */
+public interface IExamSimulateService extends IService<ExamSimulate> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ExamSimulateVo queryById(Long examId);
+
+	/**
+	 * 查询列表
+	 */
+	List<ExamSimulateVo> queryList(ExamSimulateQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入模拟考生成试卷
+	 * @param bo 模拟考生成试卷新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(ExamSimulateAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改模拟考生成试卷
+	 * @param bo 模拟考生成试卷编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(ExamSimulateEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -0,0 +1,98 @@
+package com.zhongzheng.modules.bank.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.bank.domain.ExamSimulateQuestion;
+import com.zhongzheng.modules.bank.mapper.ExamSimulateQuestionMapper;
+import com.zhongzheng.modules.bank.service.IExamSimulateQuestionService;
+import com.zhongzheng.modules.bank.vo.ExamSimulateQuestionVo;
+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 com.zhongzheng.modules.bank.bo.ExamSimulateQuestionAddBo;
+import com.zhongzheng.modules.bank.bo.ExamSimulateQuestionQueryBo;
+import com.zhongzheng.modules.bank.bo.ExamSimulateQuestionEditBo;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 模拟考试卷题目关系Service业务层处理
+ *
+ * @author hjl
+ * @date 2022-12-09
+ */
+@Service
+public class ExamSimulateQuestionServiceImpl extends ServiceImpl<ExamSimulateQuestionMapper, ExamSimulateQuestion> implements IExamSimulateQuestionService {
+
+    @Override
+    public ExamSimulateQuestionVo queryById(Long id){
+        ExamSimulateQuestion db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, ExamSimulateQuestionVo.class);
+    }
+
+    @Override
+    public List<ExamSimulateQuestionVo> queryList(ExamSimulateQuestionQueryBo bo) {
+        LambdaQueryWrapper<ExamSimulateQuestion> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getExamId() != null, ExamSimulateQuestion::getExamId, bo.getExamId());
+        lqw.eq(bo.getQuestionId() != null, ExamSimulateQuestion::getQuestionId, bo.getQuestionId());
+        lqw.eq(bo.getSort() != null, ExamSimulateQuestion::getSort, bo.getSort());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ExamSimulateQuestionVo> entity2Vo(Collection<ExamSimulateQuestion> collection) {
+        List<ExamSimulateQuestionVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ExamSimulateQuestionVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ExamSimulateQuestion> page = (Page<ExamSimulateQuestion>)collection;
+            Page<ExamSimulateQuestionVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ExamSimulateQuestionAddBo bo) {
+        ExamSimulateQuestion add = BeanUtil.toBean(bo, ExamSimulateQuestion.class);
+        validEntityBeforeSave(add);
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ExamSimulateQuestionEditBo bo) {
+        ExamSimulateQuestion update = BeanUtil.toBean(bo, ExamSimulateQuestion.class);
+        validEntityBeforeSave(update);
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ExamSimulateQuestion 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/bank/service/impl/ExamSimulateServiceImpl.java

@@ -0,0 +1,105 @@
+package com.zhongzheng.modules.bank.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.bank.bo.ExamSimulateAddBo;
+import com.zhongzheng.modules.bank.bo.ExamSimulateEditBo;
+import com.zhongzheng.modules.bank.bo.ExamSimulateQueryBo;
+import com.zhongzheng.modules.bank.domain.ExamSimulate;
+import com.zhongzheng.modules.bank.mapper.ExamSimulateMapper;
+import com.zhongzheng.modules.bank.service.IExamSimulateService;
+import com.zhongzheng.modules.bank.vo.ExamSimulateVo;
+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 hjl
+ * @date 2022-12-09
+ */
+@Service
+public class ExamSimulateServiceImpl extends ServiceImpl<ExamSimulateMapper, ExamSimulate> implements IExamSimulateService {
+
+    @Override
+    public ExamSimulateVo queryById(Long examId){
+        ExamSimulate db = this.baseMapper.selectById(examId);
+        return BeanUtil.toBean(db, ExamSimulateVo.class);
+    }
+
+    @Override
+    public List<ExamSimulateVo> queryList(ExamSimulateQueryBo bo) {
+        LambdaQueryWrapper<ExamSimulate> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getStatus() != null, ExamSimulate::getStatus, bo.getStatus());
+        lqw.like(StrUtil.isNotBlank(bo.getExamName()), ExamSimulate::getExamName, bo.getExamName());
+        lqw.eq(bo.getGoodsId() != null, ExamSimulate::getGoodsId, bo.getGoodsId());
+        lqw.eq(bo.getUserId() != null, ExamSimulate::getUserId, bo.getUserId());
+        lqw.eq(bo.getOrderGoodsId() != null, ExamSimulate::getOrderGoodsId, bo.getOrderGoodsId());
+        lqw.eq(bo.getExamId() != null, ExamSimulate::getExamId, bo.getExamId());
+        lqw.eq(bo.getExamPaperId() != null, ExamSimulate::getExamPaperId, bo.getExamPaperId());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ExamSimulateVo> entity2Vo(Collection<ExamSimulate> collection) {
+        List<ExamSimulateVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ExamSimulateVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ExamSimulate> page = (Page<ExamSimulate>)collection;
+            Page<ExamSimulateVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ExamSimulateAddBo bo) {
+        ExamSimulate add = BeanUtil.toBean(bo, ExamSimulate.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ExamSimulateEditBo bo) {
+        ExamSimulate update = BeanUtil.toBean(bo, ExamSimulate.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ExamSimulate 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/bank/vo/ExamSimulateQuestionVo.java

@@ -0,0 +1,39 @@
+package com.zhongzheng.modules.bank.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 hjl
+ * @date 2022-12-09
+ */
+@Data
+@ApiModel("模拟考试卷题目关系视图对象")
+public class ExamSimulateQuestionVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 试卷ID */
+	@Excel(name = "试卷ID")
+	@ApiModelProperty("试卷ID")
+	private Long examId;
+	/** 题目ID */
+	@Excel(name = "题目ID")
+	@ApiModelProperty("题目ID")
+	private Long questionId;
+	/** 排序 */
+	@Excel(name = "排序")
+	@ApiModelProperty("排序")
+	private Long sort;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/vo/ExamSimulateVo.java

@@ -0,0 +1,55 @@
+package com.zhongzheng.modules.bank.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 hjl
+ * @date 2022-12-09
+ */
+@Data
+@ApiModel("模拟考生成试卷视图对象")
+public class ExamSimulateVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long simulateExamId;
+
+	/**  状态 1正常 0关闭 */
+	@Excel(name = " 状态 1正常 0关闭")
+	@ApiModelProperty(" 状态 1正常 0关闭")
+	private Integer status;
+	/** 试卷名 */
+	@Excel(name = "试卷名")
+	@ApiModelProperty("试卷名")
+	private String examName;
+	/** 商品ID */
+	@Excel(name = "商品ID")
+	@ApiModelProperty("商品ID")
+	private Long goodsId;
+	/** 用户ID */
+	@Excel(name = "用户ID")
+	@ApiModelProperty("用户ID")
+	private Long userId;
+	/** 订单商品ID */
+	@Excel(name = "订单商品ID")
+	@ApiModelProperty("订单商品ID")
+	private Long orderGoodsId;
+	/** 来源试卷ID */
+	@Excel(name = "来源试卷ID")
+	@ApiModelProperty("来源试卷ID")
+	private Long examId;
+	/** 试卷类型id */
+	@Excel(name = "试卷类型id")
+	@ApiModelProperty("试卷类型id")
+	private Long examPaperId;
+}

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

@@ -117,4 +117,7 @@ public class UserBankRecordAddBo {
     /** 少做题数 */
     @ApiModelProperty("少做题数")
     private Integer lessQuestionNum;
+    /** 模拟做题试卷ID */
+    @ApiModelProperty("模拟做题试卷ID")
+    private Long simulateExamId;
 }

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

@@ -120,4 +120,7 @@ public class UserBankRecordEditBo {
     /** 少做题数 */
     @ApiModelProperty("少做题数")
     private Integer lessQuestionNum;
+    /** 模拟做题试卷ID */
+    @ApiModelProperty("模拟做题试卷ID")
+    private Long simulateExamId;
 }

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

@@ -78,6 +78,8 @@ public class UserBankRecordQueryBo extends BaseEntity {
 	@ApiModelProperty("grade_id")
 	private Long gradeId;
 	private Integer currentStatus;
-
+	/** 模拟做题试卷ID */
+	@ApiModelProperty("模拟做题试卷ID")
+	private Long simulateExamId;
 
 }

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

@@ -89,6 +89,9 @@ public class UserExamRecordAddBo {
     @ApiModelProperty("提交时间")
     private Long commitTime;
     /** 做题模式 1章卷 2随机练习 */
-    @ApiModelProperty("做题模式 1章卷 2随机练习")
+    @ApiModelProperty("做题模式 1章卷 2随机练习 3模拟随机")
     private Long doMode;
+    /** 模拟做题试卷ID */
+    @ApiModelProperty("模拟做题试卷ID")
+    private Long simulateExamId;
 }

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

@@ -107,6 +107,9 @@ public class UserExamRecordEditBo {
     @ApiModelProperty("提交时间")
     private Long commitTime;
     /** 做题模式 1章卷 2随机练习 */
-    @ApiModelProperty("做题模式 1章卷 2随机练习")
+    @ApiModelProperty("做题模式 1章卷 2随机练习3模拟随机")
     private Long doMode;
+    /** 模拟做题试卷ID */
+    @ApiModelProperty("模拟做题试卷ID")
+    private Long simulateExamId;
 }

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

@@ -71,6 +71,9 @@ public class UserExamRecordQueryBo extends BaseEntity {
 	@ApiModelProperty("业务ID")
 	private Long businessId;
 	/** 做题模式 1章卷 2随机练习 */
-	@ApiModelProperty("做题模式 1章卷 2随机练习")
+	@ApiModelProperty("做题模式 1章卷 2随机练习3模拟随机")
 	private Long doMode;
+	/** 模拟做题试卷ID */
+	@ApiModelProperty("模拟做题试卷ID")
+	private Long simulateExamId;
 }

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

@@ -95,5 +95,9 @@ private static final long serialVersionUID=1L;
     private Integer allQuestionNum;
     /** 少做题数 */
     private Integer lessQuestionNum;
+    /** 做题模式 1章卷 2随机练习 */
+    private Long doMode;
+    /** 模拟做题试卷ID */
+    private Long simulateExamId;
 
 }

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

@@ -77,4 +77,6 @@ private static final long serialVersionUID=1L;
     private Long commitTime;
     /** 做题模式 1章卷 2随机练习 */
     private Long doMode;
+    /** 模拟做题试卷ID */
+    private Long simulateExamId;
 }

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

@@ -139,4 +139,12 @@ public class UserBankRecordVo {
 
 	@ApiModelProperty("试卷类型")
 	private String paperName;
+	/** 做题模式 1章卷 2随机练习 3模拟随机 */
+	@Excel(name = "做题模式 1章卷 2随机练习 3模拟随机")
+	@ApiModelProperty("做题模式 1章卷 2随机练习 3模拟随机")
+	private Long doMode;
+	/** 模拟做题试卷ID */
+	@Excel(name = "模拟做题试卷ID")
+	@ApiModelProperty("模拟做题试卷ID")
+	private Long simulateExamId;
 }

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

@@ -143,4 +143,8 @@ public class UserExamRecordVo {
 	@Excel(name = "做题模式 1章卷 2随机练习")
 	@ApiModelProperty("做题模式 1章卷 2随机练习")
 	private Long doMode;
+	/** 模拟做题试卷ID */
+	@Excel(name = "模拟做题试卷ID")
+	@ApiModelProperty("模拟做题试卷ID")
+	private Long simulateExamId;
 }

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

@@ -0,0 +1,21 @@
+<?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.bank.mapper.ExamSimulateMapper">
+
+    <resultMap type="com.zhongzheng.modules.bank.domain.ExamSimulate" id="ExamSimulateResult">
+        <result property="simulateExamId" column="simulate_exam_id"/>
+        <result property="examId" column="exam_id"/>
+        <result property="status" column="status"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="examName" column="exam_name"/>
+        <result property="createTime" column="create_time"/>
+        <result property="goodsId" column="goods_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="orderGoodsId" column="order_goods_id"/>
+        <result property="examPaperId" column="exam_paper_id"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -0,0 +1,15 @@
+<?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.bank.mapper.ExamSimulateQuestionMapper">
+
+    <resultMap type="com.zhongzheng.modules.bank.domain.ExamSimulateQuestion" id="ExamSimulateQuestionResult">
+        <result property="id" column="id"/>
+        <result property="examId" column="exam_id"/>
+        <result property="questionId" column="question_id"/>
+        <result property="sort" column="sort"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -24,6 +24,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="gradeId" column="grade_id"/>
         <result property="currentStatus" column="current_status"/>
         <result property="rightRate" column="right_rate"/>
+        <result property="doMode" column="do_mode"/>
+        <result property="simulateExamId" column="simulate_exam_id"/>
     </resultMap>
 
 
@@ -47,6 +49,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="gradeId" column="grade_id"/>
         <result property="currentStatus" column="current_status"/>
         <result property="rightRate" column="right_rate"/>
+        <result property="doMode" column="do_mode"/>
+        <result property="simulateExamId" column="simulate_exam_id"/>
     </resultMap>
 
     <select id="getUserBankList" parameterType="com.zhongzheng.modules.user.bo.UserBankRecordQueryBo" resultType="com.zhongzheng.modules.user.vo.UserBankRecordVo">

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

@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="lessQuestionNum" column="less_question_num"/>
         <result property="commitTime" column="commit_time"/>
         <result property="doMode" column="do_mode"/>
+        <result property="simulateExamId" column="simulate_exam_id"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.UserExamRecordVo" id="UserExamRecordVoResult">
@@ -62,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="orderGoodsId" column="order_goods_id"/>
         <result property="commitTime" column="commit_time"/>
         <result property="doMode" column="do_mode"/>
+        <result property="simulateExamId" column="simulate_exam_id"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.UserExamWrongRecordVo" id="UserExamRecordQuestionVoResult">