change 3 жил өмнө
parent
commit
1fb6bcaaa8
29 өөрчлөгдсөн 1947 нэмэгдсэн , 0 устгасан
  1. 108 0
      zhongzheng-admin/src/main/java/com/zhongzheng/controller/user/UserSubscribeController.java
  2. 46 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamGoodsAddBo.java
  3. 54 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamGoodsEditBo.java
  4. 59 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamGoodsQueryBo.java
  5. 43 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamGoodsSupplementAddBo.java
  6. 51 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamGoodsSupplementEditBo.java
  7. 56 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamGoodsSupplementQueryBo.java
  8. 66 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserSubscribeAddBo.java
  9. 83 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserSubscribeCertificateEditBo.java
  10. 85 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserSubscribeEditBo.java
  11. 84 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserSubscribeQueryBo.java
  12. 48 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserExamGoods.java
  13. 45 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserExamGoodsSupplement.java
  14. 63 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserSubscribe.java
  15. 23 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserExamGoodsMapper.java
  16. 14 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserExamGoodsSupplementMapper.java
  17. 19 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserSubscribeMapper.java
  18. 56 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserExamGoodsService.java
  19. 52 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserExamGoodsSupplementService.java
  20. 57 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserSubscribeService.java
  21. 123 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserExamGoodsServiceImpl.java
  22. 103 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserExamGoodsSupplementServiceImpl.java
  23. 139 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserSubscribeServiceImpl.java
  24. 79 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserExamGoodsSupplementVo.java
  25. 86 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserExamGoodsVo.java
  26. 128 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserSubscribeVo.java
  27. 71 0
      zhongzheng-system/src/main/resources/mapper/modules/user/UserExamGoodsMapper.xml
  28. 17 0
      zhongzheng-system/src/main/resources/mapper/modules/user/UserExamGoodsSupplementMapper.xml
  29. 89 0
      zhongzheng-system/src/main/resources/mapper/modules/user/UserSubscribeMapper.xml

+ 108 - 0
zhongzheng-admin/src/main/java/com/zhongzheng/controller/user/UserSubscribeController.java

@@ -0,0 +1,108 @@
+package com.zhongzheng.controller.user;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.exam.vo.ExamApplyVo;
+import com.zhongzheng.modules.user.bo.*;
+import com.zhongzheng.modules.user.service.IUserExamGoodsService;
+import com.zhongzheng.modules.user.vo.UserExamGoodsVo;
+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.modules.user.vo.UserSubscribeVo;
+import com.zhongzheng.modules.user.service.IUserSubscribeService;
+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-12-07
+ */
+@Api(value = "用户预约考试控制器", tags = {"用户预约考试管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/subscribe")
+public class UserSubscribeController extends BaseController {
+
+    private final IUserSubscribeService iUserSubscribeService;
+
+    private final IUserExamGoodsService iUserExamGoodsService;
+
+    /**
+     * 查询用户预约考试列表
+     */
+    @ApiOperation("查询用户预约考试列表")
+    @PreAuthorize("@ss.hasPermi('system:subscribe:list')")
+    @GetMapping("/list")
+    public TableDataInfo<UserSubscribeVo> listSubscribe(UserSubscribeQueryBo bo) {
+        startPage();
+        List<UserSubscribeVo> list = iUserSubscribeService.listSubscribe(bo);
+        return getDataTable(list);
+    }
+
+
+
+    /**
+     * 修改用户预约考试
+     */
+    @ApiOperation("批量取消预约,批量选考试登记状态,批量修改预约状态")
+    @PreAuthorize("@ss.hasPermi('system:subscribe:edit')")
+    @Log(title = "用户预约考试", businessType = BusinessType.UPDATE)
+    @PostMapping("edit")
+    public AjaxResult<Void> edit(@RequestBody UserSubscribeEditBo bo) {
+        return toAjax(iUserSubscribeService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改用户预约考试
+     */
+    @ApiOperation("批量取消预约,批量选考试登记状态")
+    @PreAuthorize("@ss.hasPermi('system:subscribe:edit')")
+    @Log(title = "用户预约考试", businessType = BusinessType.UPDATE)
+    @PostMapping()
+    public AjaxResult<Void> editCertificate(@RequestBody List<UserSubscribeCertificateEditBo> bo) {
+        return toAjax(iUserSubscribeService.editCertificate(bo) ? 1 : 0);
+    }
+
+    /**
+     * 查询用户下这个商品的考试次数,前培次数列表
+     */
+    @ApiOperation("查询用户下商品的考试次数,前培次数列表")
+    @PreAuthorize("@ss.hasPermi('system:goods:list')")
+    @GetMapping("/listUserExam")
+    public TableDataInfo<UserExamGoodsVo> listUserExam(UserExamGoodsQueryBo bo) {
+        startPage();
+        List<UserExamGoodsVo> list = iUserExamGoodsService.listUserExam(bo);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 查询详细商品考试次数,前培次数
+     */
+    @ApiOperation("查询详细商品考试次数,前培次数")
+    @PreAuthorize("@ss.hasPermi('system:apply:query')")
+    @GetMapping("/UserExam")
+    public AjaxResult<UserExamGoodsVo> getUserExamInfo(UserExamGoodsQueryBo userExamGoodsQueryBo) {
+        UserExamGoodsVo userExamGoodsVo = iUserExamGoodsService.getUserExamInfo(userExamGoodsQueryBo);
+        return AjaxResult.success(userExamGoodsVo);
+    }
+
+}

+ 46 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamGoodsAddBo.java

@@ -0,0 +1,46 @@
+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_exam_goods
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@ApiModel("用户下这个商品的考试次数,前培次数添加对象")
+public class UserExamGoodsAddBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long userId;
+    /** 商品ID */
+    @ApiModelProperty("商品ID")
+    private Long goodsId;
+    /** 该商品下考试次数 */
+    @ApiModelProperty("该商品下考试次数")
+    private Long examNumber;
+    /** 该商品下前培次数 */
+    @ApiModelProperty("该商品下前培次数")
+    private Long doNumber;
+
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+    /** 已消耗考试次数 */
+    @ApiModelProperty("已消耗考试次数")
+    private Long expendNumber;
+    /** 已消耗前培次数 */
+    @ApiModelProperty("已消耗前培次数")
+    private Long expendBefore;
+}

+ 54 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamGoodsEditBo.java

@@ -0,0 +1,54 @@
+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_exam_goods
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@ApiModel("用户下这个商品的考试次数,前培次数编辑对象")
+public class UserExamGoodsEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long userExamGoodsId;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long userId;
+
+    /** 商品ID */
+    @ApiModelProperty("商品ID")
+    private Long goodsId;
+
+    /** 该商品下考试次数 */
+    @ApiModelProperty("该商品下考试次数")
+    private Long examNumber;
+
+    /** 该商品下前培次数 */
+    @ApiModelProperty("该商品下前培次数")
+    private Long doNumber;
+
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+    /** 已消耗考试次数 */
+    @ApiModelProperty("已消耗考试次数")
+    private Long expendNumber;
+    /** 已消耗前培次数 */
+    @ApiModelProperty("已消耗前培次数")
+    private Long expendBefore;
+
+}

+ 59 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamGoodsQueryBo.java

@@ -0,0 +1,59 @@
+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_exam_goods
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("用户下这个商品的考试次数,前培次数分页查询对象")
+public class UserExamGoodsQueryBo 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 goodsId;
+	/** 该商品下考试次数 */
+	@ApiModelProperty("该商品下考试次数")
+	private Long examNumber;
+	/** 该商品下前培次数 */
+	@ApiModelProperty("该商品下前培次数")
+	private Long doNumber;
+
+	/** 已消耗考试次数 */
+	@ApiModelProperty("已消耗考试次数")
+	private Long expendNumber;
+	/** 已消耗前培次数 */
+	@ApiModelProperty("已消耗前培次数")
+	private Long expendBefore;
+
+}

+ 43 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamGoodsSupplementAddBo.java

@@ -0,0 +1,43 @@
+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_exam_goods_supplement
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@ApiModel("用户下这个商品的考试次数,前培次数增加添加对象")
+public class UserExamGoodsSupplementAddBo {
+
+    /** 绑定用户商品 */
+    @ApiModelProperty("绑定用户商品")
+    private Long userExamGoodsId;
+    /** 补考或前培商品 */
+    @ApiModelProperty("补考或前培商品")
+    private Long goodsId;
+    /** 1补考 2前培 */
+    @ApiModelProperty("1补考 2前培")
+    private Integer status;
+    /** 该商品下考试次数(增加的次数) */
+    @ApiModelProperty("该商品下考试次数(增加的次数)")
+    private Long examNumber;
+    /** 该商品下前培次数(增加的次数) */
+    @ApiModelProperty("该商品下前培次数(增加的次数)")
+    private Long doNumber;
+
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+}

+ 51 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamGoodsSupplementEditBo.java

@@ -0,0 +1,51 @@
+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_exam_goods_supplement
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@ApiModel("用户下这个商品的考试次数,前培次数增加编辑对象")
+public class UserExamGoodsSupplementEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 绑定用户商品 */
+    @ApiModelProperty("绑定用户商品")
+    private Long userExamGoodsId;
+
+    /** 补考或前培商品 */
+    @ApiModelProperty("补考或前培商品")
+    private Long goodsId;
+
+    /** 1补考 2前培 */
+    @ApiModelProperty("1补考 2前培")
+    private Integer status;
+
+    /** 该商品下考试次数(增加的次数) */
+    @ApiModelProperty("该商品下考试次数(增加的次数)")
+    private Long examNumber;
+
+    /** 该商品下前培次数(增加的次数) */
+    @ApiModelProperty("该商品下前培次数(增加的次数)")
+    private Long doNumber;
+
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+}

+ 56 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamGoodsSupplementQueryBo.java

@@ -0,0 +1,56 @@
+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_exam_goods_supplement
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("用户下这个商品的考试次数,前培次数增加分页查询对象")
+public class UserExamGoodsSupplementQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 绑定用户商品 */
+	@ApiModelProperty("绑定用户商品")
+	private Long userExamGoodsId;
+	/** 补考或前培商品 */
+	@ApiModelProperty("补考或前培商品")
+	private Long goodsId;
+	/** 1补考 2前培 */
+	@ApiModelProperty("1补考 2前培")
+	private Integer status;
+	/** 该商品下考试次数(增加的次数) */
+	@ApiModelProperty("该商品下考试次数(增加的次数)")
+	private Long examNumber;
+	/** 该商品下前培次数(增加的次数) */
+	@ApiModelProperty("该商品下前培次数(增加的次数)")
+	private Long doNumber;
+
+
+}

+ 66 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserSubscribeAddBo.java

@@ -0,0 +1,66 @@
+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_subscribe
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@ApiModel("用户预约考试添加对象")
+public class UserSubscribeAddBo {
+
+    /** 绑定的商品 */
+    @ApiModelProperty("绑定的商品")
+    private Long goodsId;
+    /** 学员ID */
+    @ApiModelProperty("学员ID")
+    private Long userId;
+    /** 1正常 2取消 */
+    @ApiModelProperty("1正常 2取消")
+    private Integer subscribeStatus;
+    /** 1 已开通 */
+    @ApiModelProperty("1 已开通")
+    private Integer beforeStatus;
+    /** 0 待登记 1正常 2缺考 3作弊 4替考 */
+    @ApiModelProperty("0 待登记 1正常 2缺考 3作弊 4替考")
+    private Integer examStatus;
+    /** 成绩 */
+    @ApiModelProperty("成绩")
+    private Long performance;
+    /** 1通过 0不通过 */
+    @ApiModelProperty("1通过 0不通过")
+    private Integer result;
+    /** 证书编号 */
+    @ApiModelProperty("证书编号")
+    private String certificateCode;
+    /** 登记补充 */
+    @ApiModelProperty("登记补充")
+    private String remark;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long applyId;
+    /** 1非补考学员 2补考学员 */
+    @ApiModelProperty("1非补考学员 2补考学员")
+    private Integer studentType;
+    /** 1 消耗次数 */
+    @ApiModelProperty("1 消耗次数")
+    private Integer examExpend;
+    /** 1 前培次数消耗 */
+    @ApiModelProperty("1 前培次数消耗")
+    private Integer beforeExpend;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+}

+ 83 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserSubscribeCertificateEditBo.java

@@ -0,0 +1,83 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 用户预约考试编辑对象 user_subscribe
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@ApiModel("用户预约考试编辑对象")
+public class UserSubscribeCertificateEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long subscribeId;
+
+    /** 绑定的商品 */
+    @ApiModelProperty("绑定的商品")
+    private Long goodsId;
+
+    /** 学员ID */
+    @ApiModelProperty("学员ID")
+    private Long userId;
+
+    /** 1正常 2取消 */
+    @ApiModelProperty("1正常 2取消")
+    private Integer subscribeStatus;
+
+    /** 1 已开通 */
+    @ApiModelProperty("1 已开通")
+    private Integer beforeStatus;
+
+    /** 0 待登记 1正常 2缺考 3作弊 4替考 */
+    @ApiModelProperty("0 待登记 1正常 2缺考 3作弊 4替考")
+    private Integer examStatus;
+
+    /** 成绩 */
+    @ApiModelProperty("成绩")
+    private Long performance;
+
+    /** 1通过 0不通过 */
+    @ApiModelProperty("1通过 0不通过")
+    private Integer result;
+
+    /** 证书编号 */
+    @ApiModelProperty("证书编号")
+    private String certificateCode;
+
+    /** 登记补充 */
+    @ApiModelProperty("登记补充")
+    private String remark;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long applyId;
+
+    /** 1非补考学员 2补考学员 */
+    @ApiModelProperty("1非补考学员 2补考学员")
+    private Integer studentType;
+
+    /** 1 消耗次数 */
+    @ApiModelProperty("1 消耗次数")
+    private Integer examExpend;
+
+    /** 1 前培次数消耗 */
+    @ApiModelProperty("1 前培次数消耗")
+    private Integer beforeExpend;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+    /** 前培Id */
+    @ApiModelProperty("前培Id")
+    private Long beforeId;
+
+
+}

+ 85 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserSubscribeEditBo.java

@@ -0,0 +1,85 @@
+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_subscribe
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@ApiModel("用户预约考试编辑对象")
+public class UserSubscribeEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long[] subscribeId;
+
+    /** 绑定的商品 */
+    @ApiModelProperty("绑定的商品")
+    private Long goodsId;
+
+    /** 学员ID */
+    @ApiModelProperty("学员ID")
+    private Long userId;
+
+    /** 1正常 2取消 */
+    @ApiModelProperty("1正常 2取消")
+    private Integer subscribeStatus;
+
+    /** 1 已开通 */
+    @ApiModelProperty("1 已开通")
+    private Integer beforeStatus;
+
+    /** 0 待登记 1正常 2缺考 3作弊 4替考 */
+    @ApiModelProperty("0 待登记 1正常 2缺考 3作弊 4替考")
+    private Integer examStatus;
+
+    /** 成绩 */
+    @ApiModelProperty("成绩")
+    private Long performance;
+
+    /** 1通过 0不通过 */
+    @ApiModelProperty("1通过 0不通过")
+    private Integer result;
+
+    /** 证书编号 */
+    @ApiModelProperty("证书编号")
+    private String certificateCode;
+
+    /** 登记补充 */
+    @ApiModelProperty("登记补充")
+    private String remark;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long applyId;
+
+    /** 1非补考学员 2补考学员 */
+    @ApiModelProperty("1非补考学员 2补考学员")
+    private Integer studentType;
+
+    /** 1 消耗次数 */
+    @ApiModelProperty("1 消耗次数")
+    private Integer examExpend;
+
+    /** 1 前培次数消耗 */
+    @ApiModelProperty("1 前培次数消耗")
+    private Integer beforeExpend;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+    /** 前培Id */
+    @ApiModelProperty("前培Id")
+    private Long beforeId;
+
+
+}

+ 84 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserSubscribeQueryBo.java

@@ -0,0 +1,84 @@
+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_subscribe
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("用户预约考试分页查询对象")
+public class UserSubscribeQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 绑定的商品 */
+	@ApiModelProperty("绑定的商品")
+	private Long goodsId;
+	/** 学员ID */
+	@ApiModelProperty("学员ID")
+	private Long userId;
+
+	/** 专业Id */
+	@ApiModelProperty("专业Id")
+	private Long majorId;
+
+	/** 专业Id */
+	@ApiModelProperty("学员姓名")
+	private String realname;
+	/** 1正常 2取消 */
+	@ApiModelProperty("1正常 2取消")
+	private Integer subscribeStatus;
+	/** 1 已开通 */
+	@ApiModelProperty("1 已开通")
+	private Integer beforeStatus;
+	/** 0 待登记 1正常 2缺考 3作弊 4替考 */
+	@ApiModelProperty("0 待登记 1正常 2缺考 3作弊 4替考")
+	private Integer examStatus;
+	/** 成绩 */
+	@ApiModelProperty("成绩")
+	private Long performance;
+	/** 1通过 0不通过 */
+	@ApiModelProperty("1通过 0不通过")
+	private Integer result;
+	/** 证书编号 */
+	@ApiModelProperty("证书编号")
+	private String certificateCode;
+
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	private Long applyId;
+	/** 1非补考学员 2补考学员 */
+	@ApiModelProperty("1非补考学员 2补考学员")
+	private Integer studentType;
+	/** 1 消耗次数 */
+	@ApiModelProperty("1 消耗次数")
+	private Integer examExpend;
+	/** 1 前培次数消耗 */
+	@ApiModelProperty("1 前培次数消耗")
+	private Integer beforeExpend;
+}

+ 48 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserExamGoods.java

@@ -0,0 +1,48 @@
+package com.zhongzheng.modules.user.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
+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_exam_goods
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("user_exam_goods")
+public class UserExamGoods implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "user_exam_goods_id")
+    private Long userExamGoodsId;
+    /** $column.columnComment */
+    private Long userId;
+    /** 商品ID */
+    private Long goodsId;
+    /** 该商品下考试次数 */
+    private Long examNumber;
+    /** 该商品下前培次数 */
+    private Long doNumber;
+    /** 创建时间 */
+    private Long createTime;
+    /** 更新时间 */
+    private Long updateTime;
+
+    /** 已消耗考试次数 */
+    private Long expendNumber;
+    /** 已消耗前培次数 */
+    private Long expendBefore;
+
+}

+ 45 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserExamGoodsSupplement.java

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.user.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
+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_exam_goods_supplement
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("user_exam_goods_supplement")
+public class UserExamGoodsSupplement implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 绑定用户商品 */
+    private Long userExamGoodsId;
+    /** 补考或前培商品 */
+    private Long goodsId;
+    /** 1补考 2前培 */
+    private Integer status;
+    /** 该商品下考试次数(增加的次数) */
+    private Long examNumber;
+    /** 该商品下前培次数(增加的次数) */
+    private Long doNumber;
+
+    /** 创建时间 */
+    private Long createTime;
+    /** 更新时间 */
+    private Long updateTime;
+}

+ 63 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserSubscribe.java

@@ -0,0 +1,63 @@
+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_subscribe
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("user_subscribe")
+public class UserSubscribe implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "subscribe_id")
+    private Long subscribeId;
+    /** 绑定的商品 */
+    private Long goodsId;
+    /** 学员ID */
+    private Long userId;
+    /** 1正常 2取消 */
+    private Integer subscribeStatus;
+    /** 1 已开通 */
+    private Integer beforeStatus;
+    /** 0 待登记 1正常 2缺考 3作弊 4替考 */
+    private Integer examStatus;
+    /** 成绩 */
+    private Long performance;
+    /** 1通过 0不通过 */
+    private Integer result;
+    /** 证书编号 */
+    private String certificateCode;
+    /** 登记补充 */
+    private String remark;
+    /** $column.columnComment */
+    private Long applyId;
+    /** 1非补考学员 2补考学员 */
+    private Integer studentType;
+    /** 1 消耗次数 */
+    private Integer examExpend;
+    /** 1 前培次数消耗 */
+    private Integer beforeExpend;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 前培Id */
+    private Long beforeId;
+}

+ 23 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserExamGoodsMapper.java

@@ -0,0 +1,23 @@
+package com.zhongzheng.modules.user.mapper;
+
+import com.zhongzheng.modules.user.bo.UserExamGoodsQueryBo;
+import com.zhongzheng.modules.user.domain.UserExamGoods;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.user.vo.UserExamGoodsSupplementVo;
+import com.zhongzheng.modules.user.vo.UserExamGoodsVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 用户下这个商品的考试次数,前培次数Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+public interface UserExamGoodsMapper extends BaseMapper<UserExamGoods> {
+
+    List<UserExamGoodsVo> listUserExam(UserExamGoodsQueryBo bo);
+
+    List<UserExamGoodsSupplementVo> getUserExam(@Param("userExamGoodsId") Long userExamGoodsId,@Param("status") Long i);
+}

+ 14 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserExamGoodsSupplementMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.user.mapper;
+
+import com.zhongzheng.modules.user.domain.UserExamGoodsSupplement;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 用户下这个商品的考试次数,前培次数增加Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+public interface UserExamGoodsSupplementMapper extends BaseMapper<UserExamGoodsSupplement> {
+
+}

+ 19 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserSubscribeMapper.java

@@ -0,0 +1,19 @@
+package com.zhongzheng.modules.user.mapper;
+
+import com.zhongzheng.modules.user.bo.UserSubscribeQueryBo;
+import com.zhongzheng.modules.user.domain.UserSubscribe;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.user.vo.UserSubscribeVo;
+
+import java.util.List;
+
+/**
+ * 用户预约考试Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+public interface UserSubscribeMapper extends BaseMapper<UserSubscribe> {
+
+    List<UserSubscribeVo> listSubscribe(UserSubscribeQueryBo bo);
+}

+ 56 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserExamGoodsService.java

@@ -0,0 +1,56 @@
+package com.zhongzheng.modules.user.service;
+
+import com.zhongzheng.modules.user.domain.UserExamGoods;
+import com.zhongzheng.modules.user.vo.UserExamGoodsVo;
+import com.zhongzheng.modules.user.bo.UserExamGoodsQueryBo;
+import com.zhongzheng.modules.user.bo.UserExamGoodsAddBo;
+import com.zhongzheng.modules.user.bo.UserExamGoodsEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 用户下这个商品的考试次数,前培次数Service接口
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+public interface IUserExamGoodsService extends IService<UserExamGoods> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	UserExamGoodsVo queryById(Long userExamGoodsId);
+
+	/**
+	 * 查询列表
+	 */
+	List<UserExamGoodsVo> queryList(UserExamGoodsQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入用户下这个商品的考试次数,前培次数
+	 * @param bo 用户下这个商品的考试次数,前培次数新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(UserExamGoodsAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改用户下这个商品的考试次数,前培次数
+	 * @param bo 用户下这个商品的考试次数,前培次数编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(UserExamGoodsEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+	List<UserExamGoodsVo> listUserExam(UserExamGoodsQueryBo bo);
+
+	UserExamGoodsVo getUserExamInfo(UserExamGoodsQueryBo userExamGoodsQueryBo);
+}

+ 52 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserExamGoodsSupplementService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.user.service;
+
+import com.zhongzheng.modules.user.domain.UserExamGoodsSupplement;
+import com.zhongzheng.modules.user.vo.UserExamGoodsSupplementVo;
+import com.zhongzheng.modules.user.bo.UserExamGoodsSupplementQueryBo;
+import com.zhongzheng.modules.user.bo.UserExamGoodsSupplementAddBo;
+import com.zhongzheng.modules.user.bo.UserExamGoodsSupplementEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 用户下这个商品的考试次数,前培次数增加Service接口
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+public interface IUserExamGoodsSupplementService extends IService<UserExamGoodsSupplement> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	UserExamGoodsSupplementVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<UserExamGoodsSupplementVo> queryList(UserExamGoodsSupplementQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入用户下这个商品的考试次数,前培次数增加
+	 * @param bo 用户下这个商品的考试次数,前培次数增加新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(UserExamGoodsSupplementAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改用户下这个商品的考试次数,前培次数增加
+	 * @param bo 用户下这个商品的考试次数,前培次数增加编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(UserExamGoodsSupplementEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

+ 57 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserSubscribeService.java

@@ -0,0 +1,57 @@
+package com.zhongzheng.modules.user.service;
+
+import com.zhongzheng.modules.user.bo.UserSubscribeCertificateEditBo;
+import com.zhongzheng.modules.user.domain.UserSubscribe;
+import com.zhongzheng.modules.user.vo.UserSubscribeVo;
+import com.zhongzheng.modules.user.bo.UserSubscribeQueryBo;
+import com.zhongzheng.modules.user.bo.UserSubscribeAddBo;
+import com.zhongzheng.modules.user.bo.UserSubscribeEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 用户预约考试Service接口
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+public interface IUserSubscribeService extends IService<UserSubscribe> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	UserSubscribeVo queryById(Long subscribeId);
+
+	/**
+	 * 查询列表
+	 */
+	List<UserSubscribeVo> queryList(UserSubscribeQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入用户预约考试
+	 * @param bo 用户预约考试新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(UserSubscribeAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改用户预约考试
+	 * @param bo 用户预约考试编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(UserSubscribeEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<UserSubscribeVo> listSubscribe(UserSubscribeQueryBo bo);
+
+	boolean editCertificate(List<UserSubscribeCertificateEditBo> bo);
+}

+ 123 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserExamGoodsServiceImpl.java

@@ -0,0 +1,123 @@
+package com.zhongzheng.modules.user.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.user.vo.UserExamGoodsSupplementVo;
+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.user.bo.UserExamGoodsAddBo;
+import com.zhongzheng.modules.user.bo.UserExamGoodsQueryBo;
+import com.zhongzheng.modules.user.bo.UserExamGoodsEditBo;
+import com.zhongzheng.modules.user.domain.UserExamGoods;
+import com.zhongzheng.modules.user.mapper.UserExamGoodsMapper;
+import com.zhongzheng.modules.user.vo.UserExamGoodsVo;
+import com.zhongzheng.modules.user.service.IUserExamGoodsService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 用户下这个商品的考试次数,前培次数Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Service
+public class UserExamGoodsServiceImpl extends ServiceImpl<UserExamGoodsMapper, UserExamGoods> implements IUserExamGoodsService {
+
+    @Override
+    public UserExamGoodsVo queryById(Long userExamGoodsId){
+        UserExamGoods db = this.baseMapper.selectById(userExamGoodsId);
+        return BeanUtil.toBean(db, UserExamGoodsVo.class);
+    }
+
+    @Override
+    public List<UserExamGoodsVo> queryList(UserExamGoodsQueryBo bo) {
+        LambdaQueryWrapper<UserExamGoods> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getUserId() != null, UserExamGoods::getUserId, bo.getUserId());
+        lqw.eq(bo.getGoodsId() != null, UserExamGoods::getGoodsId, bo.getGoodsId());
+        lqw.eq(bo.getExamNumber() != null, UserExamGoods::getExamNumber, bo.getExamNumber());
+        lqw.eq(bo.getDoNumber() != null, UserExamGoods::getDoNumber, bo.getDoNumber());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<UserExamGoodsVo> entity2Vo(Collection<UserExamGoods> collection) {
+        List<UserExamGoodsVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, UserExamGoodsVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<UserExamGoods> page = (Page<UserExamGoods>)collection;
+            Page<UserExamGoodsVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(UserExamGoodsAddBo bo) {
+        UserExamGoods add = BeanUtil.toBean(bo, UserExamGoods.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(UserExamGoodsEditBo bo) {
+        UserExamGoods update = BeanUtil.toBean(bo, UserExamGoods.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(UserExamGoods entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+
+    @Override
+    public List<UserExamGoodsVo> listUserExam(UserExamGoodsQueryBo bo) {
+        return baseMapper.listUserExam(bo);
+    }
+
+    @Override
+    public UserExamGoodsVo getUserExamInfo(UserExamGoodsQueryBo bo) {
+        List<UserExamGoodsVo> userExamGoodsVo = baseMapper.listUserExam(bo);
+        if (!CollectionUtils.isEmpty(userExamGoodsVo)) {
+            UserExamGoodsVo userExamGoodsVos = userExamGoodsVo.get(0);
+            List<UserExamGoodsSupplementVo> userExamGoodsSupplement = baseMapper.getUserExam(userExamGoodsVos.getUserExamGoodsId(), 1L);
+            List<UserExamGoodsSupplementVo> userExamGoodsSupplementVos = baseMapper.getUserExam(userExamGoodsVos.getUserExamGoodsId(), 2L);
+            userExamGoodsVos.setUserExamGoodsSupplementVos(userExamGoodsSupplementVos);
+            userExamGoodsVos.setUserExamGoodsSupplement(userExamGoodsSupplement);
+            return userExamGoodsVos;
+        }
+        return null;
+    }
+}

+ 103 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserExamGoodsSupplementServiceImpl.java

@@ -0,0 +1,103 @@
+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 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.user.bo.UserExamGoodsSupplementAddBo;
+import com.zhongzheng.modules.user.bo.UserExamGoodsSupplementQueryBo;
+import com.zhongzheng.modules.user.bo.UserExamGoodsSupplementEditBo;
+import com.zhongzheng.modules.user.domain.UserExamGoodsSupplement;
+import com.zhongzheng.modules.user.mapper.UserExamGoodsSupplementMapper;
+import com.zhongzheng.modules.user.vo.UserExamGoodsSupplementVo;
+import com.zhongzheng.modules.user.service.IUserExamGoodsSupplementService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 用户下这个商品的考试次数,前培次数增加Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Service
+public class UserExamGoodsSupplementServiceImpl extends ServiceImpl<UserExamGoodsSupplementMapper, UserExamGoodsSupplement> implements IUserExamGoodsSupplementService {
+
+    @Override
+    public UserExamGoodsSupplementVo queryById(Long id){
+        UserExamGoodsSupplement db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, UserExamGoodsSupplementVo.class);
+    }
+
+    @Override
+    public List<UserExamGoodsSupplementVo> queryList(UserExamGoodsSupplementQueryBo bo) {
+        LambdaQueryWrapper<UserExamGoodsSupplement> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getUserExamGoodsId() != null, UserExamGoodsSupplement::getUserExamGoodsId, bo.getUserExamGoodsId());
+        lqw.eq(bo.getGoodsId() != null, UserExamGoodsSupplement::getGoodsId, bo.getGoodsId());
+        lqw.eq(bo.getStatus() != null, UserExamGoodsSupplement::getStatus, bo.getStatus());
+        lqw.eq(bo.getExamNumber() != null, UserExamGoodsSupplement::getExamNumber, bo.getExamNumber());
+        lqw.eq(bo.getDoNumber() != null, UserExamGoodsSupplement::getDoNumber, bo.getDoNumber());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<UserExamGoodsSupplementVo> entity2Vo(Collection<UserExamGoodsSupplement> collection) {
+        List<UserExamGoodsSupplementVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, UserExamGoodsSupplementVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<UserExamGoodsSupplement> page = (Page<UserExamGoodsSupplement>)collection;
+            Page<UserExamGoodsSupplementVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(UserExamGoodsSupplementAddBo bo) {
+        UserExamGoodsSupplement add = BeanUtil.toBean(bo, UserExamGoodsSupplement.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(UserExamGoodsSupplementEditBo bo) {
+        UserExamGoodsSupplement update = BeanUtil.toBean(bo, UserExamGoodsSupplement.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(UserExamGoodsSupplement entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

+ 139 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserSubscribeServiceImpl.java

@@ -0,0 +1,139 @@
+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.UserSubscribeCertificateEditBo;
+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.user.bo.UserSubscribeAddBo;
+import com.zhongzheng.modules.user.bo.UserSubscribeQueryBo;
+import com.zhongzheng.modules.user.bo.UserSubscribeEditBo;
+import com.zhongzheng.modules.user.domain.UserSubscribe;
+import com.zhongzheng.modules.user.mapper.UserSubscribeMapper;
+import com.zhongzheng.modules.user.vo.UserSubscribeVo;
+import com.zhongzheng.modules.user.service.IUserSubscribeService;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 用户预约考试Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Service
+public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, UserSubscribe> implements IUserSubscribeService {
+
+    @Override
+    public UserSubscribeVo queryById(Long subscribeId){
+        UserSubscribe db = this.baseMapper.selectById(subscribeId);
+        return BeanUtil.toBean(db, UserSubscribeVo.class);
+    }
+
+    @Override
+    public List<UserSubscribeVo> queryList(UserSubscribeQueryBo bo) {
+        LambdaQueryWrapper<UserSubscribe> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getGoodsId() != null, UserSubscribe::getGoodsId, bo.getGoodsId());
+        lqw.eq(bo.getUserId() != null, UserSubscribe::getUserId, bo.getUserId());
+        lqw.eq(bo.getSubscribeStatus() != null, UserSubscribe::getSubscribeStatus, bo.getSubscribeStatus());
+        lqw.eq(bo.getBeforeStatus() != null, UserSubscribe::getBeforeStatus, bo.getBeforeStatus());
+        lqw.eq(bo.getExamStatus() != null, UserSubscribe::getExamStatus, bo.getExamStatus());
+        lqw.eq(bo.getPerformance() != null, UserSubscribe::getPerformance, bo.getPerformance());
+        lqw.eq(bo.getResult() != null, UserSubscribe::getResult, bo.getResult());
+        lqw.eq(StrUtil.isNotBlank(bo.getCertificateCode()), UserSubscribe::getCertificateCode, bo.getCertificateCode());
+        lqw.eq(bo.getApplyId() != null, UserSubscribe::getApplyId, bo.getApplyId());
+        lqw.eq(bo.getStudentType() != null, UserSubscribe::getStudentType, bo.getStudentType());
+        lqw.eq(bo.getExamExpend() != null, UserSubscribe::getExamExpend, bo.getExamExpend());
+        lqw.eq(bo.getBeforeExpend() != null, UserSubscribe::getBeforeExpend, bo.getBeforeExpend());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<UserSubscribeVo> entity2Vo(Collection<UserSubscribe> collection) {
+        List<UserSubscribeVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, UserSubscribeVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<UserSubscribe> page = (Page<UserSubscribe>)collection;
+            Page<UserSubscribeVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(UserSubscribeAddBo bo) {
+        UserSubscribe add = BeanUtil.toBean(bo, UserSubscribe.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByEditBo(UserSubscribeEditBo bo) {
+        for (Long subscribe : bo.getSubscribeId()) {
+            UserSubscribe update = new UserSubscribe();
+            update.setSubscribeId(subscribe);
+            update.setSubscribeStatus(bo.getSubscribeStatus());
+            update.setExamStatus(bo.getExamStatus());
+            update.setRemark(bo.getRemark());
+            update.setBeforeId(bo.getBeforeId());
+            update.setBeforeStatus(bo.getBeforeStatus());
+            boolean b = this.updateById(update);
+        }
+        return true;
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(UserSubscribe entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+
+    @Override
+    public List<UserSubscribeVo> listSubscribe(UserSubscribeQueryBo bo) {
+        return baseMapper.listSubscribe(bo);
+    }
+
+    @Override
+    public boolean editCertificate(List<UserSubscribeCertificateEditBo> bo) {
+        for (UserSubscribeCertificateEditBo userSubscribeCertificateEditBo : bo) {
+            UserSubscribe update = new UserSubscribe();
+            update.setSubscribeId(userSubscribeCertificateEditBo.getSubscribeId());
+            update.setPerformance(userSubscribeCertificateEditBo.getPerformance());
+            update.setResult(userSubscribeCertificateEditBo.getResult());
+            update.setCertificateCode(userSubscribeCertificateEditBo.getCertificateCode());
+            update.setRemark(userSubscribeCertificateEditBo.getRemark());
+            boolean b = this.updateById(update);
+        }
+        return true;
+    }
+}

+ 79 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserExamGoodsSupplementVo.java

@@ -0,0 +1,79 @@
+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.math.BigDecimal;
+import java.util.Date;
+
+
+
+/**
+ * 用户下这个商品的考试次数,前培次数增加视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@ApiModel("用户下这个商品的考试次数,前培次数增加视图对象")
+public class UserExamGoodsSupplementVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 绑定用户商品 */
+	@Excel(name = "绑定用户商品")
+	@ApiModelProperty("绑定用户商品")
+	private Long userExamGoodsId;
+	/** 补考或前培商品 */
+	@Excel(name = "补考或前培商品")
+	@ApiModelProperty("补考或前培商品")
+	private Long goodsId;
+
+	/** 商品名称 */
+	@Excel(name = "商品名称")
+	@ApiModelProperty("商品名称")
+	private String goodsName;
+	/** 补考或前培开始时间 */
+	@ApiModelProperty("补考或前培开始时间")
+	private Long makeStartTime;
+	/** 补考或前培结束时间 */
+	@ApiModelProperty("补考或前培结束时间")
+	private Long makeEndTime;
+	/** 编码 */
+	@Excel(name = "编码")
+	@ApiModelProperty("编码")
+	private String code;
+
+	/** 编码 */
+	@ApiModelProperty("1 有效 2过期")
+	private Long timeStatus;
+
+	/** 标准价格 */
+	@Excel(name = "标准价格")
+	@ApiModelProperty("标准价格")
+	private BigDecimal standPrice;
+	/** 1补考 2前培 */
+	@Excel(name = "1补考 2前培")
+	@ApiModelProperty("1补考 2前培")
+	private Integer status;
+	/** 该商品下考试次数(增加的次数) */
+	@Excel(name = "该商品下考试次数" , readConverterExp = "增=加的次数")
+	@ApiModelProperty("该商品下考试次数(增加的次数)")
+	private Long examNumber;
+	/** 该商品下前培次数(增加的次数) */
+	@Excel(name = "该商品下前培次数" , readConverterExp = "增=加的次数")
+	@ApiModelProperty("该商品下前培次数(增加的次数)")
+	private Long doNumber;
+	/** 创建时间 */
+	@ApiModelProperty("创建时间")
+	private Long createTime;
+	/** 更新时间 */
+	@ApiModelProperty("更新时间")
+	private Long updateTime;
+}

+ 86 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserExamGoodsVo.java

@@ -0,0 +1,86 @@
+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.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 用户下这个商品的考试次数,前培次数视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@ApiModel("用户下这个商品的考试次数,前培次数视图对象")
+public class UserExamGoodsVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long userExamGoodsId;
+
+	/** $column.columnComment */
+	@Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()")
+	@ApiModelProperty("$column.columnComment")
+	private Long userId;
+	/** 商品ID */
+	@Excel(name = "商品ID")
+	@ApiModelProperty("商品ID")
+	private Long goodsId;
+
+	/** 商品名称 */
+	@Excel(name = "商品名称")
+	@ApiModelProperty("商品名称")
+	private String goodsName;
+
+	/** 编码 */
+	@Excel(name = "编码")
+	@ApiModelProperty("编码")
+	private String code;
+
+	/** 标准价格 */
+	@Excel(name = "标准价格")
+	@ApiModelProperty("标准价格")
+	private BigDecimal standPrice;
+	/** 该商品下考试次数 */
+	@Excel(name = "该商品下考试次数")
+	@ApiModelProperty("该商品下考试次数")
+	private Long examNumber;
+	/** 该商品下前培次数 */
+	@Excel(name = "该商品下前培次数")
+	@ApiModelProperty("该商品下前培次数")
+	private Long doNumber;
+
+	/** 创建时间 */
+	@ApiModelProperty("创建时间")
+	private Long createTime;
+	/** 更新时间 */
+	@ApiModelProperty("更新时间")
+	private Long updateTime;
+
+	/** 已消耗考试次数 */
+	@Excel(name = "已消耗考试次数")
+	@ApiModelProperty("已消耗考试次数")
+	private Long expendNumber;
+	/** 已消耗前培次数 */
+	@Excel(name = "已消耗前培次数")
+	@ApiModelProperty("已消耗前培次数")
+	private Long expendBefore;
+
+	/** 已消耗前培次数 */
+	@Excel(name = "补考商品自带考试次数")
+	@ApiModelProperty("补考商品自带考试次数")
+	private List<UserExamGoodsSupplementVo> userExamGoodsSupplement;
+
+	/** 已消耗前培次数 */
+	@Excel(name = "前培商品")
+	@ApiModelProperty("前培商品自带前培次数")
+	private List<UserExamGoodsSupplementVo> userExamGoodsSupplementVos;
+}

+ 128 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserSubscribeVo.java

@@ -0,0 +1,128 @@
+package com.zhongzheng.modules.user.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zhongzheng.modules.exam.vo.ExamApplySiteVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 用户预约考试视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@ApiModel("用户预约考试视图对象")
+public class UserSubscribeVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long subscribeId;
+
+	/** 绑定的商品 */
+	@Excel(name = "绑定的商品")
+	@ApiModelProperty("绑定的商品")
+	private Long goodsId;
+
+	/** 商品名称 */
+	@Excel(name = "商品名称")
+	@ApiModelProperty("商品名称")
+	private String goodsName;
+
+	@ApiModelProperty("专业名称")
+	private String categoryName;
+
+	/** 编码 */
+	@Excel(name = "编码")
+	@ApiModelProperty("编码")
+	private String goodsCode;
+
+	/** 标准价格 */
+	@Excel(name = "标准价格")
+	@ApiModelProperty("标准价格")
+	private BigDecimal standPrice;
+
+	/** 学员ID */
+	@Excel(name = "学员ID")
+	@ApiModelProperty("学员ID")
+	private Long userId;
+
+	/** 真实姓名 */
+	@Excel(name = "真实姓名")
+	@ApiModelProperty("真实姓名")
+	private String realname;
+	/** 身份证号 */
+	@Excel(name = "身份证号")
+	@ApiModelProperty("身份证号")
+	private String idCard;
+
+	/** 1正常 2取消 */
+	@Excel(name = "1正常 2取消")
+	@ApiModelProperty("1正常 2取消")
+	private Integer subscribeStatus;
+	/** 1 已开通 */
+	@Excel(name = "1 已开通")
+	@ApiModelProperty("1 已开通")
+	private Integer beforeStatus;
+	/** 0 待登记 1正常 2缺考 3作弊 4替考 */
+	@Excel(name = "0 待登记 1正常 2缺考 3作弊 4替考")
+	@ApiModelProperty("0 待登记 1正常 2缺考 3作弊 4替考")
+	private Integer examStatus;
+	/** 成绩 */
+	@Excel(name = "成绩")
+	@ApiModelProperty("成绩")
+	private Long performance;
+	/** 1通过 0不通过 */
+	@Excel(name = "1通过 0不通过")
+	@ApiModelProperty("1通过 0不通过")
+	private Integer result;
+	/** 证书编号 */
+	@Excel(name = "证书编号")
+	@ApiModelProperty("证书编号")
+	private String certificateCode;
+	/** 登记补充 */
+	@Excel(name = "登记补充")
+	@ApiModelProperty("登记补充")
+	private String remark;
+	/** $column.columnComment */
+	@Excel(name = "登记补充")
+	@ApiModelProperty("$column.columnComment")
+	private Long applyId;
+
+	/** 考试标题 */
+	@Excel(name = "考试标题")
+	@ApiModelProperty("考试标题")
+	private String applyName;
+
+	/** 1非补考学员 2补考学员 */
+	@Excel(name = "1非补考学员 2补考学员")
+	@ApiModelProperty("1非补考学员 2补考学员")
+	private Integer studentType;
+	/** 1 消耗次数 */
+	@Excel(name = "1 消耗次数")
+	@ApiModelProperty("1 消耗次数")
+	private Integer examExpend;
+	/** 1 前培次数消耗 */
+	@Excel(name = "1 前培次数消耗")
+	@ApiModelProperty("1 前培次数消耗")
+	private Integer beforeExpend;
+
+	/** 创建时间 */
+	@ApiModelProperty("创建时间")
+	private Long createTime;
+
+	@ApiModelProperty("考试地点时间")
+	private List<ExamApplySiteVo> examApplySite;
+
+
+	@ApiModelProperty("考陪地点")
+	private List<ExamApplySiteVo> examApplySiteTrain;
+}

+ 71 - 0
zhongzheng-system/src/main/resources/mapper/modules/user/UserExamGoodsMapper.xml

@@ -0,0 +1,71 @@
+<?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.UserExamGoodsMapper">
+
+    <resultMap type="com.zhongzheng.modules.user.domain.UserExamGoods" id="UserExamGoodsResult">
+        <result property="userExamGoodsId" column="user_exam_goods_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="goodsId" column="goods_id"/>
+        <result property="examNumber" column="exam_number"/>
+        <result property="doNumber" column="do_number"/>
+    </resultMap>
+
+    <resultMap type="com.zhongzheng.modules.user.vo.UserExamGoodsVo" id="UserExamGoodsVo">
+        <result property="userExamGoodsId" column="user_exam_goods_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="goodsId" column="goods_id"/>
+        <result property="examNumber" column="exam_number"/>
+        <result property="doNumber" column="do_number"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="expendNumber" column="expend_number"/>
+        <result property="expendBefore" column="expend_before"/>
+        <result property="code" column="code"/>
+        <result property="goodsName" column="goods_name"/>
+        <result property="standPrice" column="stand_price"/>
+    </resultMap>
+
+    <resultMap type="com.zhongzheng.modules.user.vo.UserExamGoodsSupplementVo" id="UserExamGoodsSupplementVo">
+        <result property="userExamGoodsId" column="user_exam_goods_id"/>
+        <result property="goodsId" column="goods_id"/>
+        <result property="examNumber" column="exam_number"/>
+        <result property="doNumber" column="do_number"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="code" column="code"/>
+        <result property="goodsName" column="goods_name"/>
+        <result property="standPrice" column="stand_price"/>
+        <result property="status" column="status"/>
+        <result property="timeStatus" column="time_status"/>
+    </resultMap>
+
+    <select id="listUserExam" parameterType="com.zhongzheng.modules.user.bo.UserExamGoodsQueryBo" resultMap="UserExamGoodsVo">
+        SELECT
+            *,
+            (SELECT g.goods_name FROM goods g where ueg.goods_id = g.goods_id) as goods_name,
+            (SELECT g.code FROM goods g where ueg.goods_id = g.goods_id) as goods_code,
+            (SELECT g.stand_price FROM goods g where ueg.goods_id = g.goods_id) as stand_price
+        FROM
+            user_exam_goods ueg
+        WHERE
+            ueg.user_id = #{userId}
+    </select>
+
+    <select id="getUserExam" parameterType="map" resultMap="UserExamGoodsVo">
+        SELECT
+            *,
+            (SELECT g.goods_name FROM goods g where uegs.goods_id = g.goods_id) as goods_name,
+            (SELECT g.code FROM goods g where uegs.goods_id = g.goods_id) as goods_code,
+            (SELECT g.stand_price FROM goods g where uegs.goods_id = g.goods_id) as stand_price,
+            (SELECT g.make_start_time FROM goods g where uegs.goods_id = g.goods_id) as make_start_time,
+            (SELECT g.make_end_time FROM goods g where uegs.goods_id = g.goods_id) as make_end_time,
+            (case WHEN (SELECT COUNT(g.goods_id) FROM goods g where uegs.goods_id = g.goods_id and unix_timestamp(now()) BETWEEN g.make_start_time and g.make_end_time) >0 then 1 ELSE 0 end) as time_status
+        FROM
+            user_exam_goods_supplement uegs
+        WHERE
+            uegs.user_exam_goods_id = #{userExamGoodsId}
+          and uegs.`status`=#{status}
+    </select>
+</mapper>

+ 17 - 0
zhongzheng-system/src/main/resources/mapper/modules/user/UserExamGoodsSupplementMapper.xml

@@ -0,0 +1,17 @@
+<?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.UserExamGoodsSupplementMapper">
+
+    <resultMap type="com.zhongzheng.modules.user.domain.UserExamGoodsSupplement" id="UserExamGoodsSupplementResult">
+        <result property="id" column="id"/>
+        <result property="userExamGoodsId" column="user_exam_goods_id"/>
+        <result property="goodsId" column="goods_id"/>
+        <result property="status" column="status"/>
+        <result property="examNumber" column="exam_number"/>
+        <result property="doNumber" column="do_number"/>
+    </resultMap>
+
+
+</mapper>

+ 89 - 0
zhongzheng-system/src/main/resources/mapper/modules/user/UserSubscribeMapper.xml

@@ -0,0 +1,89 @@
+<?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.UserSubscribeMapper">
+
+    <resultMap type="com.zhongzheng.modules.user.domain.UserSubscribe" id="UserSubscribeResult">
+        <result property="subscribeId" column="subscribe_id"/>
+        <result property="goodsId" column="goods_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="subscribeStatus" column="subscribe_status"/>
+        <result property="beforeStatus" column="before_status"/>
+        <result property="examStatus" column="exam_status"/>
+        <result property="performance" column="performance"/>
+        <result property="result" column="result"/>
+        <result property="certificateCode" column="certificate_code"/>
+        <result property="applyId" column="apply_id"/>
+        <result property="studentType" column="student_type"/>
+        <result property="examExpend" column="exam_expend"/>
+        <result property="beforeExpend" column="before_expend"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <resultMap type="com.zhongzheng.modules.user.vo.UserSubscribeVo" id="UserSubscribeVo">
+        <result property="subscribeId" column="subscribe_id"/>
+        <result property="goodsId" column="goods_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="subscribeStatus" column="subscribe_status"/>
+        <result property="beforeStatus" column="before_status"/>
+        <result property="examStatus" column="exam_status"/>
+        <result property="performance" column="performance"/>
+        <result property="result" column="result"/>
+        <result property="certificateCode" column="certificate_code"/>
+        <result property="applyId" column="apply_id"/>
+        <result property="studentType" column="student_type"/>
+        <result property="examExpend" column="exam_expend"/>
+        <result property="beforeExpend" column="before_expend"/>
+        <result property="createTime" column="create_time"/>
+        <result property="goodsName" column="goods_name"/>
+        <result property="categoryName" column="category_name"/>
+        <result property="goodsCode" column="goods_code"/>
+        <result property="remark" column="remark"/>
+        <result property="standPrice" column="stand_price"/>
+        <result property="realname" column="realname"/>
+        <result property="idCard" column="id_card"/>
+        <result property="applyName" column="apply_name"/>
+    </resultMap>
+
+    <select id="listSubscribe" parameterType="com.zhongzheng.modules.user.bo.UserSubscribeQueryBo" resultMap="UserSubscribeVo">
+        SELECT
+            *,
+            (SELECT g.goods_name FROM goods g where us.goods_id = g.goods_id) as goods_name,
+            (SELECT g.code FROM goods g where us.goods_id = g.goods_id) as goods_code,
+            (SELECT g.stand_price FROM goods g where us.goods_id = g.goods_id) as stand_price,
+            (SELECT m.category_name FROM goods g LEFT JOIN major m on g.major_id= m.id where us.goods_id = g.goods_id) as category_name,
+            (SELECT u.realname FROM `user` u where us.user_id = u.user_id) as realname,
+            (SELECT u.id_card FROM `user` u where us.user_id = u.user_id) as id_card,
+            (SELECT ea.apply_name FROM exam_apply ea where ea.apply_id = us.apply_id) as apply_name
+        FROM
+            user_subscribe us
+        WHERE
+            1 =1
+        <if test="userId != null and userId != '' ">
+            and us.user_id = #{userId}
+        </if>
+        <if test="goodsId != null and goodsId != '' ">
+            and us.goods_id = #{goodsId}
+        </if>
+        <if test="subscribeStatus != null and subscribeStatus != '' ">
+            and us.subscribe_status = #{subscribeStatus}
+        </if>
+        <if test="applyId != null and applyId != '' ">
+            and us.apply_id = #{applyId}
+        </if>
+        <if test="studentType != null and studentType != '' ">
+            and us.student_type = #{studentType}
+        </if>
+        <if test="examStatus != null and examStatus != '' ">
+            and us.exam_status = #{examStatus}
+        </if>
+        <if test="majorId != null and majorId != '' ">
+            and (SELECT m.id FROM goods g LEFT JOIN major m on g.major_id= m.id where us.goods_id = g.goods_id) = #{majorId}
+        </if>
+        <if test="realname != null and realname != '' ">
+            and (SELECT u.realname FROM `user` u where us.user_id = u.user_id) like concat('%', #{realname}, '%')
+        </if>
+    </select>
+</mapper>