Merge remote-tracking branch 'origin/main'

ruoyi-system/src/main/java/com/ruoyi/system/controller/ContractTableController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.system.domain.dto.QueryEntity;
+import com.ruoyi.system.service.ContractDTOService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -37,6 +38,9 @@ public class ContractTableController extends BaseController
     @Autowired
     private IContractTableService contractTableService;
 
+    @Autowired
+    private ContractDTOService service;
+
 
     /**
      * 查询B类列表
@@ -80,7 +84,7 @@ public class ContractTableController extends BaseController
     @PostMapping("/getInfoByCode")
     public AjaxResult getInfoByCode(@RequestBody QueryEntity queryEntity)
     {
-        return success(contractTableService.selectContractTableByQuery(queryEntity));
+        return success(service.getInfo(queryEntity));
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/controller/GradTableController.java

@@ -2,6 +2,8 @@ package com.ruoyi.system.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.system.domain.dto.QueryEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -69,6 +71,12 @@ public class GradTableController extends BaseController
         return success(gradTableService.selectGradTableById(id));
     }
 
+    @PostMapping("/getInfoByCode")
+    public AjaxResult getInfoByCode(@RequestBody QueryEntity queryEntity)
+    {
+        return success(gradTableService.selectContractTableByQuery(queryEntity));
+    }
+
     /**
      * 新增A类证书
      */

ruoyi-system/src/main/java/com/ruoyi/system/domain/ContractTable.java

@@ -72,4 +72,6 @@ public class ContractTable extends BaseEntity
     @Excel(name = "证书文字",type = Excel.Type.ALL)
     private String certContent;
 
+    private int templateId;
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/ContractDTO.java

@@ -0,0 +1,65 @@
+package com.ruoyi.system.domain.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ContractDTO extends BaseEntity {
+    /** id */
+    private Long id;
+
+    /** 证书类型 */
+    @Excel(name = "证书类型", readConverterExp = "0=个人会员证,1=团体会员证,2=企业会员证,3=理事聘书,4=一般聘书", type = Excel.Type.ALL)
+    private Long certType;
+
+    /** 姓名或者单位 */
+    @Excel(name = "姓名或者单位",type = Excel.Type.ALL)
+    private String name;
+
+    /** 身份证或者编码 */
+    @Excel(name = "身份证或者编码",type = Excel.Type.ALL)
+    private String code;
+
+    /** 证书编码 */
+    @Excel(name = "证书编码",type = Excel.Type.ALL)
+    private String certId;
+
+    /** 专业委员会 */
+    @Excel(name = "专业委员会", readConverterExp = "0=天文教育,1=地理教育,2=中学数学教育,3=中学阅读与发展",type = Excel.Type.ALL)
+    private Integer certMajor;
+
+    /** 发证时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "发证时间", width = 30, dateFormat = "yyyy-MM-dd", type = Excel.Type.ALL)
+    private Date issueDate;
+
+    /** 证书有效期 */
+    @Excel(name = "证书有效期",type = Excel.Type.ALL)
+    private String validTerm;
+
+    /** 邮箱 */
+    @Excel(name = "邮箱",type = Excel.Type.ALL)
+    private String email;
+
+    /** 手机号 */
+    @Excel(name = "手机号",type = Excel.Type.ALL)
+    private String phone;
+
+    /** 导入系统的时间戳 */
+    private Date updateDate;
+
+    /** 证书文字 */
+    @Excel(name = "证书文字",type = Excel.Type.ALL)
+    private String certContent;
+
+    /** 证书模板地址 */
+    private int url;
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/GradDTO.java

@@ -0,0 +1,4 @@
+package com.ruoyi.system.domain.dto;
+
+public class GradDTO {
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ContractDTOMapper.java

@@ -0,0 +1,8 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.dto.ContractDTO;
+import com.ruoyi.system.domain.dto.QueryEntity;
+
+public interface ContractDTOMapper {
+    ContractDTO getInfo(QueryEntity queryEntity);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/GradTableMapper.java

@@ -1,7 +1,10 @@
 package com.ruoyi.system.mapper;
 
 import java.util.List;
+
+import com.ruoyi.system.domain.ContractTable;
 import com.ruoyi.system.domain.GradTable;
+import com.ruoyi.system.domain.dto.QueryEntity;
 
 /**
  * A类证书Mapper接口
@@ -60,4 +63,6 @@ public interface GradTableMapper
     public int deleteGradTableByIds(Integer[] ids);
 
     GradTable selectInfoByCertId(String certId);
+
+    GradTable selectInfoByQuery(QueryEntity entity);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ContractDTOService.java

@@ -0,0 +1,8 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.system.domain.dto.ContractDTO;
+import com.ruoyi.system.domain.dto.QueryEntity;
+
+public interface ContractDTOService {
+    ContractDTO getInfo(QueryEntity queryEntity);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IGradTableService.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.service;
 
 import java.util.List;
 import com.ruoyi.system.domain.GradTable;
+import com.ruoyi.system.domain.dto.QueryEntity;
 
 /**
  * A类证书Service接口
@@ -58,4 +59,6 @@ public interface IGradTableService
      * @return 结果
      */
     public int deleteGradTableById(Integer id);
+
+    GradTable selectContractTableByQuery(QueryEntity queryEntity);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ContractDTOServiceImpl.java

@@ -0,0 +1,18 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.system.domain.dto.ContractDTO;
+import com.ruoyi.system.domain.dto.QueryEntity;
+import com.ruoyi.system.mapper.ContractDTOMapper;
+import com.ruoyi.system.service.ContractDTOService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ContractDTOServiceImpl implements ContractDTOService {
+    @Autowired
+    private ContractDTOMapper mapper;
+    @Override
+    public ContractDTO getInfo(QueryEntity queryEntity) {
+        return mapper.getInfo(queryEntity);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GradTableServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.system.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.system.domain.dto.QueryEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.GradTableMapper;
@@ -90,4 +92,9 @@ public class GradTableServiceImpl implements IGradTableService
     {
         return gradTableMapper.deleteGradTableById(id);
     }
+
+    @Override
+    public GradTable selectContractTableByQuery(QueryEntity queryEntity) {
+        return gradTableMapper.selectInfoByQuery(queryEntity);
+    }
 }

ruoyi-system/src/main/resources/mapper/system/ContractDTOMapper.xml

@@ -0,0 +1,24 @@
+<?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.ruoyi.system.mapper.ContractDTOMapper">
+
+    <select id="getInfo" parameterType="QueryEntity" resultType="com.ruoyi.system.domain.dto.ContractDTO">
+        SELECT
+            con.id,
+            con.cert_type certType,
+            con.name,
+            con.code,
+            con.cert_id certId,
+            con.cert_major certMajor,
+            con.issue_date issueDate,
+            con.valid_term validTerm,
+            con.email,
+            con.phone,
+            con.update_date updateDate,
+            con.cert_content certContent,
+            temp.url
+        FROM contract_table con LEFT JOIN template_table temp ON con.template_id = temp.id
+        WHERE con.cert_id = #{certNumber} AND con.name = #{userName}
+    </select>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/ContractTableMapper.xml

@@ -17,10 +17,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="phone"    column="phone"    />
         <result property="updateDate"    column="update_date"    />
         <result property="certContent"    column="cert_content"    />
+        <result property="templateId" column="template_id"/>
     </resultMap>
 
     <sql id="selectContractTableVo">
-        select id, cert_type, name, code, cert_id, cert_major, issue_date, valid_term, email, phone, update_date, cert_content from contract_table
+        select id, cert_type, name, code, cert_id, cert_major, issue_date, valid_term, email, phone, update_date, cert_content, template_id from contract_table
     </sql>
 
     <select id="selectContractTableList" parameterType="ContractTable" resultMap="ContractTableResult">
@@ -43,12 +44,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectContractTableByCode" parameterType="String" resultMap="ContractTableResult">
         <include refid="selectContractTableVo"/>
-        where code = #{code}
+        where cert_id = #{certId}
     </select>
 
     <select id="selectInfoByQuery" parameterType="QueryEntity" resultMap="ContractTableResult">
         <include refid="selectContractTableVo"/>
-        where code = #{certNumber} AND name = #{userName}
+        where cert_id = #{certNumber} AND name = #{userName}
     </select>
         
     <insert id="insertContractTable" parameterType="ContractTable" useGeneratedKeys="true" keyProperty="id">
@@ -65,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="phone != null">phone,</if>
             <if test="updateDate != null">update_date,</if>
             <if test="certContent != null">cert_content,</if>
+            <if test="templateId != null">template_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="certType != null">#{certType},</if>
@@ -78,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="phone != null">#{phone},</if>
             <if test="updateDate != null">#{updateDate},</if>
             <if test="certContent != null">#{certContent},</if>
+            <if test="templateId != null">#{templateId},</if>
          </trim>
     </insert>
 
@@ -95,6 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="phone != null">phone = #{phone},</if>
             <if test="updateDate != null">update_date = #{updateDate},</if>
             <if test="certContent != null">cert_content = #{certContent},</if>
+            <if test="templateId != null">template_id = #{templateId},</if>
         </trim>
         where id = #{id}
     </update>

ruoyi-system/src/main/resources/mapper/system/GradTableMapper.xml

@@ -50,6 +50,11 @@
         where cert_id = #{certId}
     </select>
 
+    <select id="selectInfoByQuery" parameterType="QueryEntity" resultMap="GradTableResult">
+        <include refid="selectGradTableVo"/>
+        where cert_id = #{certNumber} AND name = #{userName}
+    </select>
+
     <insert id="insertGradTable" parameterType="GradTable" useGeneratedKeys="true" keyProperty="id">
         insert into grad_table
         <trim prefix="(" suffix=")" suffixOverrides=",">