fix 证书

zhongzheng-admin/src/main/java/com/zhongzheng/controller/base/CertificateCommonController.java

@@ -0,0 +1,90 @@
+package com.zhongzheng.controller.base;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.base.bo.CertificateCommonAddBo;
+import com.zhongzheng.modules.base.bo.CertificateCommonEditBo;
+import com.zhongzheng.modules.base.bo.CertificateCommonQueryBo;
+import com.zhongzheng.modules.base.service.ICertificateCommonService;
+import com.zhongzheng.modules.base.vo.CertificateCommonVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 证书Controller
+ *
+ * @author hjl
+ * @date 2022-06-07
+ */
+@Api(value = "证书控制器", tags = {"证书管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/base/certificate/common")
+public class CertificateCommonController extends BaseController {
+
+    private final ICertificateCommonService iCertificateCommonService;
+
+    /**
+     * 查询证书列表
+     */
+    @ApiOperation("查询证书列表")
+    @PreAuthorize("@ss.hasPermi('system:common:list')")
+    @GetMapping("/list")
+    public TableDataInfo<CertificateCommonVo> list(CertificateCommonQueryBo bo) {
+        startPage();
+        List<CertificateCommonVo> list = iCertificateCommonService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取证书详细信息
+     */
+    @ApiOperation("获取证书详细信息")
+    @PreAuthorize("@ss.hasPermi('system:common:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<CertificateCommonVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iCertificateCommonService.queryById(id));
+    }
+
+    /**
+     * 新增证书
+     */
+    @ApiOperation("新增证书")
+    @PreAuthorize("@ss.hasPermi('system:common:add')")
+    @Log(title = "证书", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody CertificateCommonAddBo bo) {
+        return toAjax(iCertificateCommonService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改证书
+     */
+    @ApiOperation("修改证书")
+    @PreAuthorize("@ss.hasPermi('system:common:edit')")
+    @Log(title = "证书", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody CertificateCommonEditBo bo) {
+        return toAjax(iCertificateCommonService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+
+}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/base/CertificateController.java

@@ -34,7 +34,7 @@ import io.swagger.annotations.ApiOperation;
  * @author ruoyi
  * @date 2021-10-08
  */
-@Api(value = "证书控制器", tags = {"证书管理"})
+@Api(value = "证书类型控制器", tags = {"证书类型管理"})
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/base/certificate")
@@ -45,7 +45,7 @@ public class CertificateController extends BaseController {
     /**
      * 查询证书列表
      */
-    @ApiOperation("查询证书列表")
+    @ApiOperation("查询证书类型列表")
     @PreAuthorize("@ss.hasPermi('system:certificate:list')")
     @GetMapping("/list")
     public TableDataInfo<CertificateVo> list(CertificateQueryBo bo) {
@@ -70,7 +70,7 @@ public class CertificateController extends BaseController {
     /**
      * 获取证书详细信息
      */
-    @ApiOperation("获取证书详细信息")
+    @ApiOperation("获取证书类型详细信息")
     @PreAuthorize("@ss.hasPermi('system:certificate:query')")
     @GetMapping("/{id}")
     public AjaxResult<CertificateVo> getInfo(@PathVariable("id" ) Long id) {
@@ -80,7 +80,7 @@ public class CertificateController extends BaseController {
     /**
      * 新增证书
      */
-    @ApiOperation("新增证书")
+    @ApiOperation("新增证书类型")
     @PreAuthorize("@ss.hasPermi('system:certificate:add')")
     @Log(title = "证书", businessType = BusinessType.INSERT)
     @PostMapping()
@@ -91,7 +91,7 @@ public class CertificateController extends BaseController {
     /**
      * 修改证书
      */
-    @ApiOperation("修改证书")
+    @ApiOperation("修改证书类型")
     @PreAuthorize("@ss.hasPermi('system:certificate:edit')")
     @Log(title = "证书", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/CertificateCommonAddBo.java

@@ -0,0 +1,42 @@
+package com.zhongzheng.modules.base.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 证书添加对象 certificate_common
+ *
+ * @author hjl
+ * @date 2022-06-07
+ */
+@Data
+@ApiModel("证书添加对象")
+public class CertificateCommonAddBo {
+
+    /** 证书名称 */
+    @ApiModelProperty("证书名称")
+    private String certificateName;
+    /**  状态 1正常 0关闭 */
+    @ApiModelProperty(" 状态 1正常 0关闭")
+    private Integer status;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+    /** 编码 */
+    @ApiModelProperty("编码")
+    private String code;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+    /** 证书类型ID */
+    @ApiModelProperty("证书类型ID")
+    private Long certificateTypeId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/CertificateCommonEditBo.java

@@ -0,0 +1,49 @@
+package com.zhongzheng.modules.base.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 证书编辑对象 certificate_common
+ *
+ * @author hjl
+ * @date 2022-06-07
+ */
+@Data
+@ApiModel("证书编辑对象")
+public class CertificateCommonEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 证书名称 */
+    @ApiModelProperty("证书名称")
+    private String certificateName;
+
+    /**  状态 1正常 0关闭 */
+    @ApiModelProperty(" 状态 1正常 0关闭")
+    private Integer status;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+    /** 编码 */
+    @ApiModelProperty("编码")
+    private String code;
+
+
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+
+    /** 证书类型ID */
+    @ApiModelProperty("证书类型ID")
+    private Long certificateTypeId;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/CertificateCommonQueryBo.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.base.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 证书分页查询对象 certificate_common
+ *
+ * @author hjl
+ * @date 2022-06-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("证书分页查询对象")
+public class CertificateCommonQueryBo 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 String certificateName;
+	/**  状态 1正常 0关闭 */
+	@ApiModelProperty(" 状态 1正常 0关闭")
+	private List<Integer> status;
+	/** 编码 */
+	@ApiModelProperty("编码")
+	private String code;
+	/** 证书类型ID */
+	@ApiModelProperty("证书类型ID")
+	private Long certificateTypeId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/domain/CertificateCommon.java

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.base.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;
+
+/**
+ * 证书对象 certificate_common
+ *
+ * @author hjl
+ * @date 2022-06-07
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("certificate_common")
+public class CertificateCommon implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 证书名称 */
+    private String certificateName;
+    /**  状态 1正常 0关闭 */
+    private Integer status;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 编码 */
+    private String code;
+    /** 备注 */
+    private String remark;
+    /** 证书类型ID */
+    private Long certificateTypeId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/mapper/CertificateCommonMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.base.domain.CertificateCommon;
+
+/**
+ * 证书Mapper接口
+ *
+ * @author hjl
+ * @date 2022-06-07
+ */
+public interface CertificateCommonMapper extends BaseMapper<CertificateCommon> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/ICertificateCommonService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.base.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.base.bo.CertificateCommonAddBo;
+import com.zhongzheng.modules.base.bo.CertificateCommonEditBo;
+import com.zhongzheng.modules.base.bo.CertificateCommonQueryBo;
+import com.zhongzheng.modules.base.domain.CertificateCommon;
+import com.zhongzheng.modules.base.vo.CertificateCommonVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 证书Service接口
+ *
+ * @author hjl
+ * @date 2022-06-07
+ */
+public interface ICertificateCommonService extends IService<CertificateCommon> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	CertificateCommonVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<CertificateCommonVo> queryList(CertificateCommonQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入证书
+	 * @param bo 证书新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(CertificateCommonAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改证书
+	 * @param bo 证书编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(CertificateCommonEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/CertificateCommonServiceImpl.java

@@ -0,0 +1,102 @@
+package com.zhongzheng.modules.base.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.base.bo.CertificateCommonAddBo;
+import com.zhongzheng.modules.base.bo.CertificateCommonEditBo;
+import com.zhongzheng.modules.base.bo.CertificateCommonQueryBo;
+import com.zhongzheng.modules.base.domain.CertificateCommon;
+import com.zhongzheng.modules.base.mapper.CertificateCommonMapper;
+import com.zhongzheng.modules.base.service.ICertificateCommonService;
+import com.zhongzheng.modules.base.vo.CertificateCommonVo;
+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-06-07
+ */
+@Service
+public class CertificateCommonServiceImpl extends ServiceImpl<CertificateCommonMapper, CertificateCommon> implements ICertificateCommonService {
+
+    @Override
+    public CertificateCommonVo queryById(Long id){
+        CertificateCommon db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, CertificateCommonVo.class);
+    }
+
+    @Override
+    public List<CertificateCommonVo> queryList(CertificateCommonQueryBo bo) {
+        LambdaQueryWrapper<CertificateCommon> lqw = Wrappers.lambdaQuery();
+        lqw.like(StrUtil.isNotBlank(bo.getCertificateName()), CertificateCommon::getCertificateName, bo.getCertificateName());
+        lqw.in(bo.getStatus() != null, CertificateCommon::getStatus, bo.getStatus());
+        lqw.eq(StrUtil.isNotBlank(bo.getCode()), CertificateCommon::getCode, bo.getCode());
+        lqw.eq(bo.getCertificateTypeId() != null, CertificateCommon::getCertificateTypeId, bo.getCertificateTypeId());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<CertificateCommonVo> entity2Vo(Collection<CertificateCommon> collection) {
+        List<CertificateCommonVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, CertificateCommonVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<CertificateCommon> page = (Page<CertificateCommon>)collection;
+            Page<CertificateCommonVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(CertificateCommonAddBo bo) {
+        CertificateCommon add = BeanUtil.toBean(bo, CertificateCommon.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(CertificateCommonEditBo bo) {
+        CertificateCommon update = BeanUtil.toBean(bo, CertificateCommon.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(CertificateCommon 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/base/vo/CertificateCommonVo.java

@@ -0,0 +1,47 @@
+package com.zhongzheng.modules.base.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-06-07
+ */
+@Data
+@ApiModel("证书视图对象")
+public class CertificateCommonVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 证书名称 */
+	@Excel(name = "证书名称")
+	@ApiModelProperty("证书名称")
+	private String certificateName;
+	/**  状态 1正常 0关闭 */
+	@Excel(name = " 状态 1正常 0关闭")
+	@ApiModelProperty(" 状态 1正常 0关闭")
+	private Integer status;
+	/** 编码 */
+	@Excel(name = "编码")
+	@ApiModelProperty("编码")
+	private String code;
+	/** 备注 */
+	@Excel(name = "备注")
+	@ApiModelProperty("备注")
+	private String remark;
+	/** 证书类型ID */
+	@Excel(name = "证书类型ID")
+	@ApiModelProperty("证书类型ID")
+	private Long certificateTypeId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsAddBo.java

@@ -163,4 +163,13 @@ public class GoodsAddBo {
     /** 科目ID，拼接 */
     @ApiModelProperty("科目ID，拼接")
     private String subjectIds;
+    /** 证书类型ID */
+    @ApiModelProperty("证书类型ID")
+    private Long certificateTypeId;
+    /** 证书ID */
+    @ApiModelProperty("证书ID")
+    private Long certificateId;
+    /** 证书模板ID */
+    @ApiModelProperty("证书模板ID")
+    private Long certificateTpId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsEditBo.java

@@ -192,4 +192,13 @@ public class GoodsEditBo {
     /** 科目ID，拼接 */
     @ApiModelProperty("科目ID，拼接")
     private String subjectIds;
+    /** 证书类型ID */
+    @ApiModelProperty("证书类型ID")
+    private Long certificateTypeId;
+    /** 证书ID */
+    @ApiModelProperty("证书ID")
+    private Long certificateId;
+    /** 证书模板ID */
+    @ApiModelProperty("证书模板ID")
+    private Long certificateTpId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsQueryBo.java

@@ -175,4 +175,13 @@ GoodsQueryBo extends BaseEntity {
 	/** 科目ID，拼接 */
 	@ApiModelProperty("科目ID，拼接")
 	private String subjectIds;
+	/** 证书类型ID */
+	@ApiModelProperty("证书类型ID")
+	private Long certificateTypeId;
+	/** 证书ID */
+	@ApiModelProperty("证书ID")
+	private Long certificateId;
+	/** 证书模板ID */
+	@ApiModelProperty("证书模板ID")
+	private Long certificateTpId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/Goods.java

@@ -130,4 +130,10 @@ private static final long serialVersionUID=1L;
     private Long teacherId;
     /** 科目ID，拼接 */
     private String subjectIds;
+    /** 证书类型ID */
+    private Long certificateTypeId;
+    /** 证书ID */
+    private Long certificateId;
+    /** 证书模板ID */
+    private Long certificateTpId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsVo.java

@@ -284,4 +284,16 @@ public class GoodsVo {
 	@Excel(name = "科目ID，拼接")
 	@ApiModelProperty("科目ID，拼接")
 	private String subjectIds;
+	/** 证书类型ID */
+	@Excel(name = "证书类型ID")
+	@ApiModelProperty("证书类型ID")
+	private Long certificateTypeId;
+	/** 证书ID */
+	@Excel(name = "证书ID")
+	@ApiModelProperty("证书ID")
+	private Long certificateId;
+	/** 证书模板ID */
+	@Excel(name = "证书模板ID")
+	@ApiModelProperty("证书模板ID")
+	private Long certificateTpId;
 }

zhongzheng-system/src/main/resources/mapper/modules/base/CertificateCommonMapper.xml

@@ -0,0 +1,19 @@
+<?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.system.mapper.CertificateCommonMapper">
+
+    <resultMap type="com.zhongzheng.modules.base.domain.CertificateCommon" id="CertificateCommonResult">
+        <result property="id" column="id"/>
+        <result property="certificateName" column="certificate_name"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="code" column="code"/>
+        <result property="remark" column="remark"/>
+        <result property="certificateTypeId" column="certificate_type_id"/>
+    </resultMap>
+
+
+</mapper>

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -48,6 +48,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="doNumber" column="do_number"/>
         <result property="teacherId" column="teacher_id"/>
         <result property="subjectIds" column="subject_ids"/>
+        <result property="certificateTypeId" column="certificate_type_id"/>
+        <result property="certificateId" column="certificate_id"/>
+        <result property="certificateTpId" column="certificate_tp_id"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.goods.vo.GoodsVo" id="GoodsResultVo">
@@ -116,6 +119,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="teacherId" column="teacher_id"/>
         <result property="goodsLiveNum" column="goods_live_num"/>
         <result property="subjectIds" column="subject_ids"/>
+        <result property="certificateTypeId" column="certificate_type_id"/>
+        <result property="certificateId" column="certificate_id"/>
+        <result property="certificateTpId" column="certificate_tp_id"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.exam.vo.ExamNumberGoodsVo" id="ExamNumberGoodsVoResult">