fix 证书

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

@@ -50,7 +50,7 @@ public class CertificateCommonController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo<CertificateCommonVo> list(CertificateCommonQueryBo bo) {
         startPage();
-        List<CertificateCommonVo> list = iCertificateCommonService.queryList(bo);
+        List<CertificateCommonVo> list = iCertificateCommonService.getList(bo);
         return getDataTable(list);
     }
 

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

@@ -45,4 +45,7 @@ public class CertificateTpAddBo {
     /** 证书键值 */
     @ApiModelProperty("证书键值")
     private String keyValue;
+    /** 证书ID */
+    @ApiModelProperty("证书ID")
+    private Long certificateId;
 }

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

@@ -54,4 +54,7 @@ public class CertificateTpEditBo {
     @ApiModelProperty("证书键值")
     private String keyValue;
 
+    /** 证书ID */
+    @ApiModelProperty("证书ID")
+    private Long certificateId;
 }

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

@@ -58,4 +58,8 @@ public class CertificateTpQueryBo extends BaseEntity {
 
 	@ApiModelProperty("证书模板ID数组")
 	private List<Long> tpIds;
+
+	/** 证书ID */
+	@ApiModelProperty("证书ID")
+	private Long certificateId;
 }

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

@@ -46,4 +46,6 @@ private static final long serialVersionUID=1L;
     private String remark;
     /** 证书键值 */
     private String keyValue;
+    /** 证书ID */
+    private Long certificateId;
 }

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

@@ -1,7 +1,13 @@
 package com.zhongzheng.modules.base.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.base.bo.CertificateCommonQueryBo;
+import com.zhongzheng.modules.base.bo.CertificateTpQueryBo;
 import com.zhongzheng.modules.base.domain.CertificateCommon;
+import com.zhongzheng.modules.base.vo.CertificateCommonVo;
+import com.zhongzheng.modules.base.vo.CertificateTpVo;
+
+import java.util.List;
 
 /**
  * 证书Mapper接口
@@ -10,5 +16,5 @@ import com.zhongzheng.modules.base.domain.CertificateCommon;
  * @date 2022-06-07
  */
 public interface CertificateCommonMapper extends BaseMapper<CertificateCommon> {
-
+    List<CertificateCommonVo> getList(CertificateCommonQueryBo bo);
 }

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

@@ -4,8 +4,10 @@ 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.bo.CertificateQueryBo;
 import com.zhongzheng.modules.base.domain.CertificateCommon;
 import com.zhongzheng.modules.base.vo.CertificateCommonVo;
+import com.zhongzheng.modules.base.vo.CertificateVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -28,6 +30,8 @@ public interface ICertificateCommonService extends IService<CertificateCommon> {
 	 */
 	List<CertificateCommonVo> queryList(CertificateCommonQueryBo bo);
 
+	List<CertificateCommonVo> getList(CertificateCommonQueryBo bo);
+
 	/**
 	 * 根据新增业务对象插入证书
 	 * @param bo 证书新增业务对象

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

@@ -29,6 +29,8 @@ public interface ICertificateService extends IService<Certificate> {
 	 */
 	List<CertificateVo> queryList(CertificateQueryBo bo);
 
+
+
 	/**
 	 * 根据新增业务对象插入证书
 	 * @param bo 证书新增业务对象

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

@@ -47,6 +47,11 @@ public class CertificateCommonServiceImpl extends ServiceImpl<CertificateCommonM
         return entity2Vo(this.list(lqw));
     }
 
+    @Override
+    public List<CertificateCommonVo> getList(CertificateCommonQueryBo bo) {
+        return baseMapper.getList(bo);
+    }
+
     /**
     * 实体类转化成视图对象
     *

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

@@ -51,6 +51,7 @@ public class CertificateServiceImpl extends ServiceImpl<CertificateMapper, Certi
         return entity2Vo(this.list(lqw));
     }
 
+
     /**
     * 实体类转化成视图对象
     *

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/vo/CertificateCommonVo.java

@@ -44,4 +44,8 @@ public class CertificateCommonVo {
 	@Excel(name = "证书类型ID")
 	@ApiModelProperty("证书类型ID")
 	private Long certificateTypeId;
+	/** 证书类型名称 */
+	@Excel(name = "证书类型名称")
+	@ApiModelProperty("证书类型名称")
+	private String certificateTypeName;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/vo/CertificateTpVo.java

@@ -53,5 +53,11 @@ public class CertificateTpVo {
 	@ApiModelProperty("证书键值")
 	private String keyValue;
 	@ApiModelProperty("模板类型名称")
+	private String certificateTypeName;
+	@ApiModelProperty("模板名称")
 	private String certificateName;
+	/** 证书ID */
+	@Excel(name = "证书ID")
+	@ApiModelProperty("证书ID")
+	private Long certificateId;
 }

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

@@ -2,7 +2,7 @@
 <!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">
+<mapper namespace="com.zhongzheng.modules.base.mapper.CertificateCommonMapper">
 
     <resultMap type="com.zhongzheng.modules.base.domain.CertificateCommon" id="CertificateCommonResult">
         <result property="id" column="id"/>
@@ -15,5 +15,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="certificateTypeId" column="certificate_type_id"/>
     </resultMap>
 
+    <resultMap type="com.zhongzheng.modules.base.vo.CertificateCommonVo" id="CertificateCommonVoResult">
+        <result property="id" column="id"/>
+        <result property="certificateName" column="certificate_name"/>
+        <result property="status" column="status"/>
+        <result property="code" column="code"/>
+        <result property="remark" column="remark"/>
+        <result property="certificateTypeId" column="certificate_type_id"/>
+        <result property="certificateTypeName" column="certificate_type_name"/>
+    </resultMap>
+
+    <select id="getList" parameterType="com.zhongzheng.modules.base.bo.CertificateCommonQueryBo" resultMap="CertificateCommonVoResult">
+        SELECT
+        cc.*,
+        c.certificate_name as certificate_type_name
+        FROM
+        certificate_common cc
+        LEFT JOIN certificate c ON cc.certificate_type_id = c.id
+        where 1=1
+        <if test="status != null and status.size()!=0 ">
+            AND cc.status in
+            <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+    </select>
 
 </mapper>

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

@@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
         <result property="keyValue" column="key_value"/>
+        <result property="certificateId" column="certificate_id"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.base.vo.CertificateTpVo" id="CertificateTpVoResult">
@@ -27,15 +28,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark" column="remark"/>
         <result property="key" column="key"/>
         <result property="certificateName" column="certificate_name"/>
+        <result property="certificateTypeName" column="certificate_type_name"/>
+        <result property="certificateId" column="certificate_id"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.base.bo.CertificateTpQueryBo" resultMap="CertificateTpVoResult">
         SELECT
             ct.*,
-            c.certificate_name
+            c.certificate_name as certificate_type_name,
+               cc.certificate_name
         FROM
             certificate_tp ct
                 LEFT JOIN certificate c ON ct.type_id = c.id
+                LEFT JOIN certificate_common cc ON cc.id = ct.certificate_id
         where 1=1
       <if test="status != null and status.size()!=0 ">
             AND ct.status in