表结构调整

certificate-manager/pom.xml

@@ -27,15 +27,15 @@
 				<profiles.active>develop</profiles.active>
 				<profiles.server.port>17216</profiles.server.port>
 				<profiles.datasource.uri>
-					<![CDATA[jdbc:mysql://192.168.0.98:3306/certificate?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri>
+					<![CDATA[jdbc:mysql://localhost:3306/certificate?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri>
 				<profiles.datasource.username>root</profiles.datasource.username>
-				<profiles.datasource.password>nacos@2020</profiles.datasource.password>
-				<profiles.redis.uri>192.168.0.252</profiles.redis.uri>
+				<profiles.datasource.password>12345678</profiles.datasource.password>
+				<profiles.redis.uri>127.0.0.1</profiles.redis.uri>
 				<profiles.redis.port>6379</profiles.redis.port>
 				<profiles.redis.username></profiles.redis.username>
-				<profiles.redis.password>hotel@2020</profiles.redis.password>
+				<profiles.redis.password></profiles.redis.password>
 				<profiles.redis.database>6</profiles.redis.database>
-				<profiles.filepath>/mortals/app/data/cpm</profiles.filepath>
+				<profiles.filepath>d:/mortals/app/data/cpm</profiles.filepath>
 				<profiles.queue.type>rabbitmq</profiles.queue.type>
 				<profiles.kafka.brokers>192.168.0.251:9092</profiles.kafka.brokers>
 				<profiles.rabbitmq.host>192.168.0.98</profiles.rabbitmq.host>

certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateCatalogEntity.java

@@ -10,7 +10,7 @@ import com.mortals.xhx.module.certificate.model.vo.CertificateCatalogVo;
 * 证照目录实体对象
 *
 * @author zxfei
-* @date 2022-10-14
+* @date 2022-10-22
 */
 
 public class CertificateCatalogEntity extends CertificateCatalogVo {
@@ -19,12 +19,10 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
     /**
     * 目录名称
     */
-    @Excel(name = "目录名称")
     private String catalogName;
     /**
     * 目录编号
     */
-    @Excel(name = "目录编号")
     private String catalogCode;
     /**
     * 持有者类型，1：自然人；2：法人；3：自然人，法人
@@ -41,12 +39,10 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
     /**
     * 横向尺寸(单位mm)
     */
-    @Excel(name = "横向尺寸", readConverterExp = "横向尺寸(单位mm)")
     private Integer transverse;
     /**
     * 纵向尺寸(单位mm)
     */
-    @Excel(name = "纵向尺寸", readConverterExp = "纵向尺寸(单位mm)")
     private Integer portrait;
     /**
     * 是否需要年检，0：否1：是

certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateCatalogQuery.java

@@ -6,7 +6,7 @@ import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
 * 证照目录查询对象
 *
 * @author zxfei
-* @date 2022-10-14
+* @date 2022-10-22
 */
 public class CertificateCatalogQuery extends CertificateCatalogEntity {
     /** 开始 序号，主键，自增长 */

certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateClassifyEntity.java

@@ -10,7 +10,7 @@ import com.mortals.xhx.module.certificate.model.vo.CertificateClassifyVo;
 * 证照分类实体对象
 *
 * @author zxfei
-* @date 2022-10-14
+* @date 2022-10-22
 */
 
 public class CertificateClassifyEntity extends CertificateClassifyVo {
@@ -19,7 +19,6 @@ public class CertificateClassifyEntity extends CertificateClassifyVo {
     /**
     * 分类名称
     */
-    @Excel(name = "分类名称")
     private String classifyName;
     /**
     * 排序号

certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateClassifyQuery.java

@@ -6,7 +6,7 @@ import com.mortals.xhx.module.certificate.model.CertificateClassifyEntity;
 * 证照分类查询对象
 *
 * @author zxfei
-* @date 2022-10-14
+* @date 2022-10-22
 */
 public class CertificateClassifyQuery extends CertificateClassifyEntity {
     /** 开始 序号，主键，自增长 */

certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateIndustryEntity.java

@@ -10,7 +10,7 @@ import com.mortals.xhx.module.certificate.model.vo.CertificateIndustryVo;
 * 行业目录实体对象
 *
 * @author zxfei
-* @date 2022-10-14
+* @date 2022-10-22
 */
 
 public class CertificateIndustryEntity extends CertificateIndustryVo {
@@ -23,7 +23,6 @@ public class CertificateIndustryEntity extends CertificateIndustryVo {
     /**
     * 行业名称
     */
-    @Excel(name = "行业名称")
     private String industryName;
 
 

certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateIndustryQuery.java

@@ -6,7 +6,7 @@ import com.mortals.xhx.module.certificate.model.CertificateIndustryEntity;
 * 行业目录查询对象
 *
 * @author zxfei
-* @date 2022-10-14
+* @date 2022-10-22
 */
 public class CertificateIndustryQuery extends CertificateIndustryEntity {
     /** 开始 序号，主键，自增长 */

certificate-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceEntity.java

@@ -10,7 +10,7 @@ import com.mortals.xhx.module.device.model.vo.DeviceVo;
 * 证照柜设备实体对象
 *
 * @author zxfei
-* @date 2022-10-14
+* @date 2022-10-22
 */
 
 public class DeviceEntity extends DeviceVo {
@@ -19,12 +19,10 @@ public class DeviceEntity extends DeviceVo {
     /**
     * 设备名称
     */
-    @Excel(name = "设备名称")
     private String deviceName;
     /**
     * 设备编码
     */
-    @Excel(name = "设备编码")
     private String deviceCode;
     /**
     * 设备类型1证照柜
@@ -37,7 +35,6 @@ public class DeviceEntity extends DeviceVo {
     /**
     * 设备厂商
     */
-    @Excel(name = "设备厂商")
     private String deviceFirmname;
     /**
     * 设备IP地址

certificate-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceQuery.java

@@ -6,7 +6,7 @@ import com.mortals.xhx.module.device.model.DeviceEntity;
 * 证照柜设备查询对象
 *
 * @author zxfei
-* @date 2022-10-14
+* @date 2022-10-22
 */
 public class DeviceQuery extends DeviceEntity {
     /** 开始 序号，主键，自增长 */

certificate-manager/src/main/java/com/mortals/xhx/module/record/dao/PrintWaitQueueDao.java

+package com.mortals.xhx.module.record.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.record.model.PrintWaitQueueEntity;
+import java.util.List;
+/**
+* 证照打印记录Dao
+* 证照打印记录 DAO接口
+*
+* @author zxfei
+* @date 2022-10-22
+*/
+public interface  PrintWaitQueueDao extends ICRUDDao<PrintWaitQueueEntity,Long>{
+
+
+}

certificate-manager/src/main/java/com/mortals/xhx/module/record/dao/ibatis/PrintWaitQueueDaoImpl.java

+package com.mortals.xhx.module.record.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.record.dao.PrintWaitQueueDao;
+import com.mortals.xhx.module.record.model.PrintWaitQueueEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 证照打印记录DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2022-10-22
+*/
+@Repository("printWaitQueueDao")
+public class PrintWaitQueueDaoImpl extends BaseCRUDDaoMybatis<PrintWaitQueueEntity,Long> implements PrintWaitQueueDao {
+
+
+
+}

certificate-manager/src/main/java/com/mortals/xhx/module/record/model/ApplyLogEntity.java

@@ -8,15 +8,19 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.record.model.vo.ApplyLogVo;
 /**
- * 证照申请实体对象
- *
- * @author zxfei
- * @date 2022-10-18
- */
+* 证照申请实体对象
+*
+* @author zxfei
+* @date 2022-10-22
+*/
 
 public class ApplyLogEntity extends ApplyLogVo {
     private static final long serialVersionUID = 1L;
 
+    /**
+    * 证照目录ID
+    */
+    private Long catalogId;
     /**
     * 证件编号
     */
@@ -48,7 +52,6 @@ public class ApplyLogEntity extends ApplyLogVo {
     /**
     * 持有者名称
     */
-    @Excel(name = "持有者名称")
     private String holderName;
     /**
     * 持有者证件号码
@@ -57,8 +60,7 @@ public class ApplyLogEntity extends ApplyLogVo {
     /**
     * 企业名称
     */
-    @Excel(name = "企业名称")
-    private String enterpriseNam;
+    private String enterpriseName;
     /**
     * 有效期起始
     */
@@ -76,6 +78,10 @@ public class ApplyLogEntity extends ApplyLogVo {
     */
     private String originalUrl;
     /**
+    * 正本预览地址
+    */
+    private String oriPreview;
+    /**
     * 证照模板正本表单内容
     */
     private String oriFormContent;
@@ -84,18 +90,36 @@ public class ApplyLogEntity extends ApplyLogVo {
     */
     private String duplicateUrl;
     /**
+    * 副本预览地址
+    */
+    private String dupPreview;
+    /**
     * 证照模板副本表单内容
     */
     private String dupFormContent;
     /**
-     * 证照目录ID
+    * 生成状态1未生成2正本3副本4正副本
     */
-    private Long catalogId;
+    private Integer generateStatus;
 
 
 
     public ApplyLogEntity(){}
     /**
+    * 获取 证照目录ID
+    * @return Long
+    */
+    public Long getCatalogId(){
+        return catalogId;
+    }
+    /**
+    * 设置 证照目录ID
+    * @param catalogId
+    */
+    public void setCatalogId(Long catalogId){
+        this.catalogId = catalogId;
+    }
+    /**
     * 获取 证件编号
     * @return String
     */
@@ -225,15 +249,15 @@ public class ApplyLogEntity extends ApplyLogVo {
     * 获取 企业名称
     * @return String
     */
-    public String getEnterpriseNam(){
-        return enterpriseNam;
+    public String getEnterpriseName(){
+        return enterpriseName;
     }
     /**
     * 设置 企业名称
-     * @param enterpriseNam
+    * @param enterpriseName
     */
-    public void setEnterpriseNam(String enterpriseNam){
-        this.enterpriseNam = enterpriseNam;
+    public void setEnterpriseName(String enterpriseName){
+        this.enterpriseName = enterpriseName;
     }
     /**
     * 获取 有效期起始
@@ -292,6 +316,20 @@ public class ApplyLogEntity extends ApplyLogVo {
         this.originalUrl = originalUrl;
     }
     /**
+    * 获取 正本预览地址
+    * @return String
+    */
+    public String getOriPreview(){
+        return oriPreview;
+    }
+    /**
+    * 设置 正本预览地址
+    * @param oriPreview
+    */
+    public void setOriPreview(String oriPreview){
+        this.oriPreview = oriPreview;
+    }
+    /**
     * 获取 证照模板正本表单内容
     * @return String
     */
@@ -320,6 +358,20 @@ public class ApplyLogEntity extends ApplyLogVo {
         this.duplicateUrl = duplicateUrl;
     }
     /**
+    * 获取 副本预览地址
+    * @return String
+    */
+    public String getDupPreview(){
+        return dupPreview;
+    }
+    /**
+    * 设置 副本预览地址
+    * @param dupPreview
+    */
+    public void setDupPreview(String dupPreview){
+        this.dupPreview = dupPreview;
+    }
+    /**
     * 获取 证照模板副本表单内容
     * @return String
     */
@@ -334,18 +386,18 @@ public class ApplyLogEntity extends ApplyLogVo {
         this.dupFormContent = dupFormContent;
     }
     /**
-     * 获取 证照目录ID
-     * @return Long
+    * 获取 生成状态1未生成2正本3副本4正副本
+    * @return Integer
     */
-    public Long getCatalogId(){
-        return catalogId;
+    public Integer getGenerateStatus(){
+        return generateStatus;
     }
     /**
-     * 设置 证照目录ID
-     * @param catalogId
+    * 设置 生成状态1未生成2正本3副本4正副本
+    * @param generateStatus
     */
-    public void setCatalogId(Long catalogId){
-        this.catalogId = catalogId;
+    public void setGenerateStatus(Integer generateStatus){
+        this.generateStatus = generateStatus;
     }
 
 
@@ -369,6 +421,7 @@ public class ApplyLogEntity extends ApplyLogVo {
 
     public String toString(){
         StringBuilder sb = new StringBuilder("");
+        sb.append(",catalogId:").append(getCatalogId());
         sb.append(",certificateCode:").append(getCertificateCode());
         sb.append(",certificateName:").append(getCertificateName());
         sb.append(",issueTime:").append(getIssueTime());
@@ -378,20 +431,24 @@ public class ApplyLogEntity extends ApplyLogVo {
         sb.append(",holderIdType:").append(getHolderIdType());
         sb.append(",holderName:").append(getHolderName());
         sb.append(",holderIDCardNo:").append(getHolderIDCardNo());
-        sb.append(",enterpriseNam:").append(getEnterpriseNam());
+        sb.append(",enterpriseName:").append(getEnterpriseName());
         sb.append(",validityStart:").append(getValidityStart());
         sb.append(",validityEnd:").append(getValidityEnd());
         sb.append(",privateID:").append(getPrivateID());
         sb.append(",originalUrl:").append(getOriginalUrl());
+        sb.append(",oriPreview:").append(getOriPreview());
         sb.append(",oriFormContent:").append(getOriFormContent());
         sb.append(",duplicateUrl:").append(getDuplicateUrl());
+        sb.append(",dupPreview:").append(getDupPreview());
         sb.append(",dupFormContent:").append(getDupFormContent());
-        sb.append(",catalogId:").append(getCatalogId());
+        sb.append(",generateStatus:").append(getGenerateStatus());
         return sb.toString();
     }
 
     public void initAttrValue(){
 
+            this.catalogId = null;
+
             this.certificateCode = "";
 
             this.certificateName = "";
@@ -410,7 +467,7 @@ public class ApplyLogEntity extends ApplyLogVo {
 
             this.holderIDCardNo = "";
 
-        this.enterpriseNam = "";
+            this.enterpriseName = "";
 
             this.validityStart = null;
 
@@ -420,12 +477,16 @@ public class ApplyLogEntity extends ApplyLogVo {
 
             this.originalUrl = "";
 
+            this.oriPreview = "";
+
             this.oriFormContent = "";
 
             this.duplicateUrl = "";
 
+            this.dupPreview = "";
+
             this.dupFormContent = "";
 
-        this.catalogId = null;
+            this.generateStatus = 1;
     }
 }
\ No newline at end of file

certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintLogEntity.java

@@ -8,11 +8,11 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.record.model.vo.PrintLogVo;
 /**
- * 证照打印记录实体对象
- *
- * @author zxfei
- * @date 2022-10-18
- */
+* 证照打印记录实体对象
+*
+* @author zxfei
+* @date 2022-10-22
+*/
 
 public class PrintLogEntity extends PrintLogVo {
     private static final long serialVersionUID = 1L;
@@ -20,27 +20,22 @@ public class PrintLogEntity extends PrintLogVo {
     /**
     * 证照目录编号
     */
-    @Excel(name = "证照目录编号")
     private String catalogCode;
     /**
     * 证照名称
     */
-    @Excel(name = "证照名称")
     private String certificateName;
     /**
     * 证照编号
     */
-    @Excel(name = "证照编号")
     private String certificateCode;
     /**
     * 企业名称
     */
-    @Excel(name = "企业名称")
-    private String enterpriseNam;
+    private String enterpriseName;
     /**
     * 持有者姓名
     */
-    @Excel(name = "持有者姓名")
     private String holderName;
     /**
     * 持有者证件号码
@@ -128,15 +123,15 @@ public class PrintLogEntity extends PrintLogVo {
     * 获取 企业名称
     * @return String
     */
-    public String getEnterpriseNam(){
-        return enterpriseNam;
+    public String getEnterpriseName(){
+        return enterpriseName;
     }
     /**
     * 设置 企业名称
-     * @param enterpriseNam
+    * @param enterpriseName
     */
-    public void setEnterpriseNam(String enterpriseNam){
-        this.enterpriseNam = enterpriseNam;
+    public void setEnterpriseName(String enterpriseName){
+        this.enterpriseName = enterpriseName;
     }
     /**
     * 获取 持有者姓名
@@ -303,7 +298,7 @@ public class PrintLogEntity extends PrintLogVo {
         sb.append(",catalogCode:").append(getCatalogCode());
         sb.append(",certificateName:").append(getCertificateName());
         sb.append(",certificateCode:").append(getCertificateCode());
-        sb.append(",enterpriseNam:").append(getEnterpriseNam());
+        sb.append(",enterpriseName:").append(getEnterpriseName());
         sb.append(",holderName:").append(getHolderName());
         sb.append(",holderIDCardNo:").append(getHolderIDCardNo());
         sb.append(",pickerName:").append(getPickerName());
@@ -325,7 +320,7 @@ public class PrintLogEntity extends PrintLogVo {
 
             this.certificateCode = "";
 
-        this.enterpriseNam = "";
+            this.enterpriseName = "";
 
             this.holderName = "";
 

certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintLogQuery.java

@@ -4,11 +4,11 @@ import java.util.Date;
 import java.util.List;
 import com.mortals.xhx.module.record.model.PrintLogEntity;
 /**
- * 证照打印记录查询对象
- *
- * @author zxfei
- * @date 2022-10-18
- */
+* 证照打印记录查询对象
+*
+* @author zxfei
+* @date 2022-10-22
+*/
 public class PrintLogQuery extends PrintLogEntity {
     /** 开始 序号，主键，自增长 */
     private Long idStart;
@@ -32,7 +32,7 @@ public class PrintLogQuery extends PrintLogEntity {
     private List<String> certificateCodeList;
 
     /** 企业名称 */
-    private List<String> enterpriseNamList;
+    private List<String> enterpriseNameList;
 
     /** 持有者姓名 */
     private List<String> holderNameList;
@@ -267,18 +267,18 @@ public class PrintLogQuery extends PrintLogEntity {
     }
     /**
     * 获取 企业名称
-     * @return enterpriseNamList
+    * @return enterpriseNameList
     */
-    public List<String> getEnterpriseNamList(){
-        return this.enterpriseNamList;
+    public List<String> getEnterpriseNameList(){
+        return this.enterpriseNameList;
     }
 
     /**
     * 设置 企业名称
-     * @param enterpriseNamList
+    * @param enterpriseNameList
     */
-    public void setEnterpriseNamList(List<String> enterpriseNamList){
-        this.enterpriseNamList = enterpriseNamList;
+    public void setEnterpriseNameList(List<String> enterpriseNameList){
+        this.enterpriseNameList = enterpriseNameList;
     }
     /**
     * 获取 持有者姓名
@@ -989,19 +989,19 @@ public class PrintLogQuery extends PrintLogEntity {
 
 	/**
     * 设置 企业名称
-     * @param enterpriseNam
+    * @param enterpriseName
     */
-    public PrintLogQuery enterpriseNam(String enterpriseNam){
-        setEnterpriseNam(enterpriseNam);
+    public PrintLogQuery enterpriseName(String enterpriseName){
+        setEnterpriseName(enterpriseName);
 		return this;
     }
 
     /**
     * 设置 企业名称
-     * @param enterpriseNamList
+    * @param enterpriseNameList
     */
-    public PrintLogQuery enterpriseNamList(List<String> enterpriseNamList){
-        this.enterpriseNamList = enterpriseNamList;
+    public PrintLogQuery enterpriseNameList(List<String> enterpriseNameList){
+        this.enterpriseNameList = enterpriseNameList;
 		return this;
     }
 

certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintWaitQueueEntity.java

+package com.mortals.xhx.module.record.model;
+
+import java.util.List;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.record.model.vo.PrintWaitQueueVo;
+/**
+* 证照打印记录实体对象
+*
+* @author zxfei
+* @date 2022-10-22
+*/
+
+public class PrintWaitQueueEntity extends PrintWaitQueueVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 申请ID
+    */
+    private Long applyId;
+    /**
+    * 证照目录编号
+    */
+    private String catalogCode;
+    /**
+    * 证照名称
+    */
+    private String certificateName;
+    /**
+    * 证照编号
+    */
+    private String certificateCode;
+    /**
+    * 企业名称
+    */
+    private String enterpriseName;
+    /**
+    * 持有者姓名
+    */
+    private String holderName;
+    /**
+    * 持有者证件号码
+    */
+    private String holderIDCardNo;
+    /**
+    * 取件人姓名
+    */
+    private String pickerName;
+    /**
+    * 取件人证件号码
+    */
+    private String pickerIDCardNo;
+    /**
+    * 证件类型1正本2副本
+    */
+    private Integer certificateType;
+    /**
+    * 证件预览地址
+    */
+    private String previewUrl;
+    /**
+    * 证件附件地址
+    */
+    private String certificateUrl;
+    /**
+    * 是否打印0否1是
+    */
+    private Integer printStatus;
+    /**
+    * 证照目录ID
+    */
+    private Long catalogId;
+
+
+
+    public PrintWaitQueueEntity(){}
+    /**
+    * 获取 申请ID
+    * @return Long
+    */
+    public Long getApplyId(){
+        return applyId;
+    }
+    /**
+    * 设置 申请ID
+    * @param applyId
+    */
+    public void setApplyId(Long applyId){
+        this.applyId = applyId;
+    }
+    /**
+    * 获取 证照目录编号
+    * @return String
+    */
+    public String getCatalogCode(){
+        return catalogCode;
+    }
+    /**
+    * 设置 证照目录编号
+    * @param catalogCode
+    */
+    public void setCatalogCode(String catalogCode){
+        this.catalogCode = catalogCode;
+    }
+    /**
+    * 获取 证照名称
+    * @return String
+    */
+    public String getCertificateName(){
+        return certificateName;
+    }
+    /**
+    * 设置 证照名称
+    * @param certificateName
+    */
+    public void setCertificateName(String certificateName){
+        this.certificateName = certificateName;
+    }
+    /**
+    * 获取 证照编号
+    * @return String
+    */
+    public String getCertificateCode(){
+        return certificateCode;
+    }
+    /**
+    * 设置 证照编号
+    * @param certificateCode
+    */
+    public void setCertificateCode(String certificateCode){
+        this.certificateCode = certificateCode;
+    }
+    /**
+    * 获取 企业名称
+    * @return String
+    */
+    public String getEnterpriseName(){
+        return enterpriseName;
+    }
+    /**
+    * 设置 企业名称
+    * @param enterpriseName
+    */
+    public void setEnterpriseName(String enterpriseName){
+        this.enterpriseName = enterpriseName;
+    }
+    /**
+    * 获取 持有者姓名
+    * @return String
+    */
+    public String getHolderName(){
+        return holderName;
+    }
+    /**
+    * 设置 持有者姓名
+    * @param holderName
+    */
+    public void setHolderName(String holderName){
+        this.holderName = holderName;
+    }
+    /**
+    * 获取 持有者证件号码
+    * @return String
+    */
+    public String getHolderIDCardNo(){
+        return holderIDCardNo;
+    }
+    /**
+    * 设置 持有者证件号码
+    * @param holderIDCardNo
+    */
+    public void setHolderIDCardNo(String holderIDCardNo){
+        this.holderIDCardNo = holderIDCardNo;
+    }
+    /**
+    * 获取 取件人姓名
+    * @return String
+    */
+    public String getPickerName(){
+        return pickerName;
+    }
+    /**
+    * 设置 取件人姓名
+    * @param pickerName
+    */
+    public void setPickerName(String pickerName){
+        this.pickerName = pickerName;
+    }
+    /**
+    * 获取 取件人证件号码
+    * @return String
+    */
+    public String getPickerIDCardNo(){
+        return pickerIDCardNo;
+    }
+    /**
+    * 设置 取件人证件号码
+    * @param pickerIDCardNo
+    */
+    public void setPickerIDCardNo(String pickerIDCardNo){
+        this.pickerIDCardNo = pickerIDCardNo;
+    }
+    /**
+    * 获取 证件类型1正本2副本
+    * @return Integer
+    */
+    public Integer getCertificateType(){
+        return certificateType;
+    }
+    /**
+    * 设置 证件类型1正本2副本
+    * @param certificateType
+    */
+    public void setCertificateType(Integer certificateType){
+        this.certificateType = certificateType;
+    }
+    /**
+    * 获取 证件预览地址
+    * @return String
+    */
+    public String getPreviewUrl(){
+        return previewUrl;
+    }
+    /**
+    * 设置 证件预览地址
+    * @param previewUrl
+    */
+    public void setPreviewUrl(String previewUrl){
+        this.previewUrl = previewUrl;
+    }
+    /**
+    * 获取 证件附件地址
+    * @return String
+    */
+    public String getCertificateUrl(){
+        return certificateUrl;
+    }
+    /**
+    * 设置 证件附件地址
+    * @param certificateUrl
+    */
+    public void setCertificateUrl(String certificateUrl){
+        this.certificateUrl = certificateUrl;
+    }
+    /**
+    * 获取 是否打印0否1是
+    * @return Integer
+    */
+    public Integer getPrintStatus(){
+        return printStatus;
+    }
+    /**
+    * 设置 是否打印0否1是
+    * @param printStatus
+    */
+    public void setPrintStatus(Integer printStatus){
+        this.printStatus = printStatus;
+    }
+    /**
+    * 获取 证照目录ID
+    * @return Long
+    */
+    public Long getCatalogId(){
+        return catalogId;
+    }
+    /**
+    * 设置 证照目录ID
+    * @param catalogId
+    */
+    public void setCatalogId(Long catalogId){
+        this.catalogId = catalogId;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof PrintWaitQueueEntity) {
+            PrintWaitQueueEntity tmp = (PrintWaitQueueEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",applyId:").append(getApplyId());
+        sb.append(",catalogCode:").append(getCatalogCode());
+        sb.append(",certificateName:").append(getCertificateName());
+        sb.append(",certificateCode:").append(getCertificateCode());
+        sb.append(",enterpriseName:").append(getEnterpriseName());
+        sb.append(",holderName:").append(getHolderName());
+        sb.append(",holderIDCardNo:").append(getHolderIDCardNo());
+        sb.append(",pickerName:").append(getPickerName());
+        sb.append(",pickerIDCardNo:").append(getPickerIDCardNo());
+        sb.append(",certificateType:").append(getCertificateType());
+        sb.append(",previewUrl:").append(getPreviewUrl());
+        sb.append(",certificateUrl:").append(getCertificateUrl());
+        sb.append(",printStatus:").append(getPrintStatus());
+        sb.append(",catalogId:").append(getCatalogId());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.applyId = null;
+
+            this.catalogCode = "";
+
+            this.certificateName = "";
+
+            this.certificateCode = "";
+
+            this.enterpriseName = "";
+
+            this.holderName = "";
+
+            this.holderIDCardNo = "";
+
+            this.pickerName = "";
+
+            this.pickerIDCardNo = "";
+
+            this.certificateType = 1;
+
+            this.previewUrl = "";
+
+            this.certificateUrl = "";
+
+            this.printStatus = 0;
+
+            this.catalogId = null;
+    }
+}
\ No newline at end of file

certificate-manager/src/main/java/com/mortals/xhx/module/record/model/RetainLogEntity.java

@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.record.model.vo.RetainLogVo;
 /**
- * 证照持有实体对象
- *
- * @author zxfei
- * @date 2022-10-18
- */
+* 证照持有实体对象
+*
+* @author zxfei
+* @date 2022-10-22
+*/
 
 public class RetainLogEntity extends RetainLogVo {
     private static final long serialVersionUID = 1L;
@@ -19,27 +19,22 @@ public class RetainLogEntity extends RetainLogVo {
     /**
     * 证照目录编号
     */
-    @Excel(name = "证照目录编号")
     private String catalogCode;
     /**
     * 证照名称
     */
-    @Excel(name = "证照名称")
     private String certificateName;
     /**
     * 证照编号
     */
-    @Excel(name = "证照编号")
     private String certificateCode;
     /**
     * 企业名称
     */
-    @Excel(name = "企业名称")
-    private String enterpriseNam;
+    private String enterpriseName;
     /**
     * 持有者姓名
     */
-    @Excel(name = "持有者姓名")
     private String holderName;
     /**
     * 持有者证件号码
@@ -119,15 +114,15 @@ public class RetainLogEntity extends RetainLogVo {
     * 获取 企业名称
     * @return String
     */
-    public String getEnterpriseNam(){
-        return enterpriseNam;
+    public String getEnterpriseName(){
+        return enterpriseName;
     }
     /**
     * 设置 企业名称
-     * @param enterpriseNam
+    * @param enterpriseName
     */
-    public void setEnterpriseNam(String enterpriseNam){
-        this.enterpriseNam = enterpriseNam;
+    public void setEnterpriseName(String enterpriseName){
+        this.enterpriseName = enterpriseName;
     }
     /**
     * 获取 持有者姓名
@@ -266,7 +261,7 @@ public class RetainLogEntity extends RetainLogVo {
         sb.append(",catalogCode:").append(getCatalogCode());
         sb.append(",certificateName:").append(getCertificateName());
         sb.append(",certificateCode:").append(getCertificateCode());
-        sb.append(",enterpriseNam:").append(getEnterpriseNam());
+        sb.append(",enterpriseName:").append(getEnterpriseName());
         sb.append(",holderName:").append(getHolderName());
         sb.append(",holderIDCardNo:").append(getHolderIDCardNo());
         sb.append(",certificateStatus:").append(getCertificateStatus());
@@ -286,7 +281,7 @@ public class RetainLogEntity extends RetainLogVo {
 
             this.certificateCode = "";
 
-        this.enterpriseNam = "";
+            this.enterpriseName = "";
 
             this.holderName = "";
 

certificate-manager/src/main/java/com/mortals/xhx/module/record/model/RetainLogQuery.java

@@ -3,11 +3,11 @@ package com.mortals.xhx.module.record.model;
 import java.util.List;
 import com.mortals.xhx.module.record.model.RetainLogEntity;
 /**
- * 证照持有查询对象
- *
- * @author zxfei
- * @date 2022-10-18
- */
+* 证照持有查询对象
+*
+* @author zxfei
+* @date 2022-10-22
+*/
 public class RetainLogQuery extends RetainLogEntity {
     /** 开始 序号，主键，自增长 */
     private Long idStart;
@@ -31,7 +31,7 @@ public class RetainLogQuery extends RetainLogEntity {
     private List<String> certificateCodeList;
 
     /** 企业名称 */
-    private List<String> enterpriseNamList;
+    private List<String> enterpriseNameList;
 
     /** 持有者姓名 */
     private List<String> holderNameList;
@@ -248,18 +248,18 @@ public class RetainLogQuery extends RetainLogEntity {
     }
     /**
     * 获取 企业名称
-     * @return enterpriseNamList
+    * @return enterpriseNameList
     */
-    public List<String> getEnterpriseNamList(){
-        return this.enterpriseNamList;
+    public List<String> getEnterpriseNameList(){
+        return this.enterpriseNameList;
     }
 
     /**
     * 设置 企业名称
-     * @param enterpriseNamList
+    * @param enterpriseNameList
     */
-    public void setEnterpriseNamList(List<String> enterpriseNamList){
-        this.enterpriseNamList = enterpriseNamList;
+    public void setEnterpriseNameList(List<String> enterpriseNameList){
+        this.enterpriseNameList = enterpriseNameList;
     }
     /**
     * 获取 持有者姓名
@@ -874,19 +874,19 @@ public class RetainLogQuery extends RetainLogEntity {
 
 	/**
     * 设置 企业名称
-     * @param enterpriseNam
+    * @param enterpriseName
     */
-    public RetainLogQuery enterpriseNam(String enterpriseNam){
-        setEnterpriseNam(enterpriseNam);
+    public RetainLogQuery enterpriseName(String enterpriseName){
+        setEnterpriseName(enterpriseName);
 		return this;
     }
 
     /**
     * 设置 企业名称
-     * @param enterpriseNamList
+    * @param enterpriseNameList
     */
-    public RetainLogQuery enterpriseNamList(List<String> enterpriseNamList){
-        this.enterpriseNamList = enterpriseNamList;
+    public RetainLogQuery enterpriseNameList(List<String> enterpriseNameList){
+        this.enterpriseNameList = enterpriseNameList;
 		return this;
     }
 

certificate-manager/src/main/java/com/mortals/xhx/module/record/model/vo/PrintWaitQueueVo.java

+package com.mortals.xhx.module.record.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.record.model.PrintWaitQueueEntity;
+import java.util.ArrayList;
+import java.util.List;
+/**
+* 证照打印记录视图对象
+*
+* @author zxfei
+* @date 2022-10-22
+*/
+public class PrintWaitQueueVo extends BaseEntityLong {
+
+}
\ No newline at end of file

certificate-manager/src/main/java/com/mortals/xhx/module/record/service/ApplyLogService.java

@@ -49,4 +49,6 @@ public interface ApplyLogService extends ICRUDService<ApplyLogEntity,Long>{
      * @return
      */
     void generateAll(ApplyLogEntity applyLogEntity, Context context) throws AppException;
+
+    void printApplyLog(Long id);
 }
\ No newline at end of file

certificate-manager/src/main/java/com/mortals/xhx/module/record/service/PrintWaitQueueService.java

+package com.mortals.xhx.module.record.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.record.model.PrintWaitQueueEntity;
+/**
+* PrintWaitQueueService
+*
+* 证照打印记录 service接口
+*
+* @author zxfei
+* @date 2022-10-22
+*/
+public interface PrintWaitQueueService extends ICRUDService<PrintWaitQueueEntity,Long>{
+
+}
\ No newline at end of file

certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/ApplyLogServiceImpl.java

@@ -123,7 +123,7 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
         if(StringUtils.isEmpty(entity.getPrivateID())){
             throw new AppException("专网ID不能为空");
         }
-        if(StringUtils.isEmpty(entity.getEnterpriseNam())){
+        if(StringUtils.isEmpty(entity.getEnterpriseName())){
             throw new AppException("企业名称不能为空");
         }
         if(StringUtils.isEmpty(entity.getHolderName())){
@@ -212,12 +212,37 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
         retainLogService.creatRetainLog(applyLogEntity,context);
     }
 
+    @Override
+    public void printApplyLog(Long id) {
+
+    }
+
     private String preview(DocTemplateVO docTemplate,Context context){
         String rootPath = this.filePath.endsWith("/") ? this.filePath : this.filePath + "/";
         //转换表单参数为map集合
         ObjectMapper mapper = new ObjectMapper();
         ConfigureBuilder builder = Configure.builder();
         builder.buildGrammerRegex(RegexUtils.createGeneral("{{", "}}"));
+        String docTemp = "{\n" +
+                "    \"i_1_卫\":\"川\",\n" +
+                "    \"i_2_字\":\"2022\",\n" +
+                "    \"i_3_号\":\"10\",\n" +
+                "    \"i_4_单位名称\":\"成都壹糖文化传播有限公司\",\n" +
+                "    \"i_5_法定代表人\":\"廖至敬\",\n" +
+                "    \"i_6_地址\":\"成都市武侯区晋吉南路98号\",\n" +
+                "    \"i_7_许可项目\":\"奶油蛋糕、生日蛋糕、水果蛋糕、奶茶、鲜切水果\",\n" +
+                "    \"i_8_年始\":\"2021\",\n" +
+                "    \"i_9_月始\":\"01\",\n" +
+                "    \"i_10_日始\":\"01\",\n" +
+                "    \"i_11_年止\":\"2023\",\n" +
+                "    \"i_12_月止\":\"12\",\n" +
+                "    \"i_13_日止\":\"31\",\n" +
+                "    \"i_14_年\":\"2020\",\n" +
+                "    \"i_15_月\":\"12\",\n" +
+                "    \"i_16_日\":\"30\",\n" +
+                "    \"@image_1_照片\":\"file/uploadfile/test.jpg\"\n" +
+                "}";
+        docTemplate.setFormContent(docTemp);
         try {
             Map<String, Object> data = mapper.readValue(docTemplate.getFormContent(), Map.class);
             //遍历查看是否有图片数据，多选框

certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/PrintLogServiceImpl.java

@@ -49,7 +49,7 @@ public class PrintLogServiceImpl extends AbstractCRUDServiceImpl<PrintLogDao, Pr
             condition.append(entity.getQuery()).append("%");
             PrintLogQuery condition1 = new PrintLogQuery();
             PrintLogQuery condition2 = new PrintLogQuery();
-            condition1.setEnterpriseNam(condition.toString());
+            condition1.setEnterpriseName(condition.toString());
             condition2.setPickerName(condition.toString());
             List<PrintLogQuery> orConditionList = new ArrayList<>();
             orConditionList.add(condition1);
@@ -76,7 +76,7 @@ public class PrintLogServiceImpl extends AbstractCRUDServiceImpl<PrintLogDao, Pr
         }
         printLogEntity.setCertificateName(applyLogEntity.getCertificateName());
         printLogEntity.setCertificateCode(applyLogEntity.getCertificateCode());
-        printLogEntity.setEnterpriseNam(applyLogEntity.getEnterpriseNam());
+        printLogEntity.setEnterpriseName(applyLogEntity.getEnterpriseName());
         printLogEntity.setHolderName(applyLogEntity.getHolderName());
         printLogEntity.setHolderIDCardNo(applyLogEntity.getHolderIDCardNo());
         printLogEntity.setPrintStatus(PrintStatus.SUCCESS.getValue());

certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/PrintWaitQueueServiceImpl.java

+package com.mortals.xhx.module.record.service.impl;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.record.dao.PrintWaitQueueDao;
+import com.mortals.xhx.module.record.model.PrintWaitQueueEntity;
+import com.mortals.xhx.module.record.service.PrintWaitQueueService;
+/**
+* PrintWaitQueueService
+* 证照打印记录 service实现
+*
+* @author zxfei
+* @date 2022-10-22
+*/
+@Service("printWaitQueueService")
+public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWaitQueueDao, PrintWaitQueueEntity, Long> implements PrintWaitQueueService {
+    
+}
\ No newline at end of file

certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/RetainLogServiceImpl.java

@@ -72,7 +72,7 @@ public class RetainLogServiceImpl extends AbstractCRUDServiceImpl<RetainLogDao,
         }
         retainLogEntity.setCertificateName(applyLogEntity.getCertificateName());
         retainLogEntity.setCertificateCode(applyLogEntity.getCertificateCode());
-        retainLogEntity.setEnterpriseNam(applyLogEntity.getEnterpriseNam());
+        retainLogEntity.setEnterpriseName(applyLogEntity.getEnterpriseName());
         retainLogEntity.setHolderName(applyLogEntity.getHolderName());
         retainLogEntity.setHolderIDCardNo(applyLogEntity.getHolderIDCardNo());
         retainLogEntity.setCertificateStatus(CertificateStatus.NORMAL.getValue());

certificate-manager/src/main/java/com/mortals/xhx/module/record/web/PrintWaitQueueController.java

+package com.mortals.xhx.module.record.web;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import com.mortals.framework.model.Context;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.record.model.PrintWaitQueueEntity;
+import com.mortals.xhx.module.record.service.PrintWaitQueueService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import java.util.Arrays;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+/**
+*
+* 证照打印记录
+*
+* @author zxfei
+* @date 2022-10-22
+*/
+@RestController
+@RequestMapping("print/wait/queue")
+public class PrintWaitQueueController extends BaseCRUDJsonBodyMappingController<PrintWaitQueueService,PrintWaitQueueEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public PrintWaitQueueController(){
+        super.setModuleDesc( "证照打印记录");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        this.addDict(model, "certificateType", paramService.getParamBySecondOrganize("PrintWaitQueue","certificateType"));
+        this.addDict(model, "printStatus", paramService.getParamBySecondOrganize("PrintWaitQueue","printStatus"));
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

certificate-manager/src/main/resources/sqlmap/module/record/PrintLogMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "mybatis-3-mapper.dtd">
+"mybatis-3-mapper.dtd">
 <mapper namespace="com.mortals.xhx.module.record.dao.ibatis.PrintLogDaoImpl">
 
     <!-- 字段和属性映射 -->
@@ -9,7 +9,7 @@
             <result property="catalogCode" column="catalogCode" />
             <result property="certificateName" column="certificateName" />
             <result property="certificateCode" column="certificateCode" />
-        <result property="enterpriseNam" column="enterpriseNam" />
+            <result property="enterpriseName" column="enterpriseName" />
             <result property="holderName" column="holderName" />
             <result property="holderIDCardNo" column="holderIDCardNo" />
             <result property="pickerName" column="pickerName" />
@@ -43,8 +43,8 @@
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('certificateCode') or colPickMode == 1 and data.containsKey('certificateCode')))">
                     a.certificateCode,
                 </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('enterpriseNam') or colPickMode == 1 and data.containsKey('enterpriseNam')))">
-                a.enterpriseNam,
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('enterpriseName') or colPickMode == 1 and data.containsKey('enterpriseName')))">
+                    a.enterpriseName,
                 </if>
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('holderName') or colPickMode == 1 and data.containsKey('holderName')))">
                     a.holderName,
@@ -93,18 +93,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="PrintLogEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_print_log
-        (catalogCode,certificateName,certificateCode,enterpriseNam,holderName,holderIDCardNo,pickerName,pickerIDCardNo,originalCount,duplicateCount,printStatus,printDate,deviceId,createUserId,createTime,updateUserId,updateTime,catalogId)
+        (catalogCode,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,originalCount,duplicateCount,printStatus,printDate,deviceId,createUserId,createTime,updateUserId,updateTime,catalogId)
         VALUES
-        (#{catalogCode},#{certificateName},#{certificateCode},#{enterpriseNam},#{holderName},#{holderIDCardNo},#{pickerName},#{pickerIDCardNo},#{originalCount},#{duplicateCount},#{printStatus},#{printDate},#{deviceId},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{catalogId})
+        (#{catalogCode},#{certificateName},#{certificateCode},#{enterpriseName},#{holderName},#{holderIDCardNo},#{pickerName},#{pickerIDCardNo},#{originalCount},#{duplicateCount},#{printStatus},#{printDate},#{deviceId},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{catalogId})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_print_log
-        (catalogCode,certificateName,certificateCode,enterpriseNam,holderName,holderIDCardNo,pickerName,pickerIDCardNo,originalCount,duplicateCount,printStatus,printDate,deviceId,createUserId,createTime,updateUserId,updateTime,catalogId)
+        (catalogCode,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,originalCount,duplicateCount,printStatus,printDate,deviceId,createUserId,createTime,updateUserId,updateTime,catalogId)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.catalogCode},#{item.certificateName},#{item.certificateCode},#{item.enterpriseNam},#{item.holderName},#{item.holderIDCardNo},#{item.pickerName},#{item.pickerIDCardNo},#{item.originalCount},#{item.duplicateCount},#{item.printStatus},#{item.printDate},#{item.deviceId},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.catalogId})
+            (#{item.catalogCode},#{item.certificateName},#{item.certificateCode},#{item.enterpriseName},#{item.holderName},#{item.holderIDCardNo},#{item.pickerName},#{item.pickerIDCardNo},#{item.originalCount},#{item.duplicateCount},#{item.printStatus},#{item.printDate},#{item.deviceId},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.catalogId})
         </foreach>
     </insert>
 
@@ -123,8 +123,8 @@
             <if test="(colPickMode==0 and data.containsKey('certificateCode')) or (colPickMode==1 and !data.containsKey('certificateCode'))">
                 a.certificateCode=#{data.certificateCode},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('enterpriseNam')) or (colPickMode==1 and !data.containsKey('enterpriseNam'))">
-                a.enterpriseNam=#{data.enterpriseNam},
+            <if test="(colPickMode==0 and data.containsKey('enterpriseName')) or (colPickMode==1 and !data.containsKey('enterpriseName'))">
+                a.enterpriseName=#{data.enterpriseName},
             </if>
             <if test="(colPickMode==0 and data.containsKey('holderName')) or (colPickMode==1 and !data.containsKey('holderName'))">
                 a.holderName=#{data.holderName},
@@ -222,10 +222,10 @@
                         </if>
                     </foreach>
                 </trim>
-            <trim prefix="enterpriseNam=(case" suffix="ELSE enterpriseNam end),">
+                <trim prefix="enterpriseName=(case" suffix="ELSE enterpriseName end),">
                     <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('enterpriseNam')) or (colPickMode==1 and !item.containsKey('enterpriseNam'))">
-                        when a.id=#{item.id} then #{item.enterpriseNam}
+                        <if test="(colPickMode==0 and item.containsKey('enterpriseName')) or (colPickMode==1 and !item.containsKey('enterpriseName'))">
+                            when a.id=#{item.id} then #{item.enterpriseName}
                         </if>
                     </foreach>
                 </trim>
@@ -530,17 +530,17 @@
                 </foreach>
             </if>
 
-        <if test="conditionParamRef.containsKey('enterpriseNam')">
-            <if test="conditionParamRef.enterpriseNam != null and conditionParamRef.enterpriseNam != ''">
-                ${_conditionType_} a.enterpriseNam like #{${_conditionParam_}.enterpriseNam}
+            <if test="conditionParamRef.containsKey('enterpriseName')">
+                <if test="conditionParamRef.enterpriseName != null and conditionParamRef.enterpriseName != ''">
+                    ${_conditionType_} a.enterpriseName like #{${_conditionParam_}.enterpriseName}
                 </if>
-            <if test="conditionParamRef.enterpriseNam == null">
-                ${_conditionType_} a.enterpriseNam is null
+                <if test="conditionParamRef.enterpriseName == null">
+                    ${_conditionType_} a.enterpriseName is null
                 </if>
             </if>
-        <if test="conditionParamRef.containsKey('enterpriseNamList')">
-            ${_conditionType_} a.enterpriseNam in
-            <foreach collection="conditionParamRef.enterpriseNamList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('enterpriseNameList')">
+                ${_conditionType_} a.enterpriseName in
+                <foreach collection="conditionParamRef.enterpriseNameList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
@@ -829,9 +829,9 @@
                         <if test='orderCol.certificateCode != null and "DESC".equalsIgnoreCase(orderCol.certificateCode)'>DESC</if>
                         ,
                     </if>
-                <if test="orderCol.containsKey('enterpriseNam')">
-                    a.enterpriseNam
-                    <if test='orderCol.enterpriseNam != null and "DESC".equalsIgnoreCase(orderCol.enterpriseNam)'>DESC</if>
+                    <if test="orderCol.containsKey('enterpriseName')">
+                        a.enterpriseName
+                        <if test='orderCol.enterpriseName != null and "DESC".equalsIgnoreCase(orderCol.enterpriseName)'>DESC</if>
                         ,
                     </if>
                     <if test="orderCol.containsKey('holderName')">

certificate-manager/src/main/resources/sqlmap/module/record/RetainLogMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "mybatis-3-mapper.dtd">
+"mybatis-3-mapper.dtd">
 <mapper namespace="com.mortals.xhx.module.record.dao.ibatis.RetainLogDaoImpl">
 
     <!-- 字段和属性映射 -->
@@ -9,7 +9,7 @@
             <result property="catalogCode" column="catalogCode" />
             <result property="certificateName" column="certificateName" />
             <result property="certificateCode" column="certificateCode" />
-        <result property="enterpriseNam" column="enterpriseNam" />
+            <result property="enterpriseName" column="enterpriseName" />
             <result property="holderName" column="holderName" />
             <result property="holderIDCardNo" column="holderIDCardNo" />
             <result property="certificateStatus" column="certificateStatus" />
@@ -41,8 +41,8 @@
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('certificateCode') or colPickMode == 1 and data.containsKey('certificateCode')))">
                     a.certificateCode,
                 </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('enterpriseNam') or colPickMode == 1 and data.containsKey('enterpriseNam')))">
-                a.enterpriseNam,
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('enterpriseName') or colPickMode == 1 and data.containsKey('enterpriseName')))">
+                    a.enterpriseName,
                 </if>
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('holderName') or colPickMode == 1 and data.containsKey('holderName')))">
                     a.holderName,
@@ -85,18 +85,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="RetainLogEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_retain_log
-        (catalogCode,certificateName,certificateCode,enterpriseNam,holderName,holderIDCardNo,certificateStatus,originalCount,duplicateCount,originalUrl,duplicateUrl,createUserId,createTime,updateUserId,updateTime,catalogId)
+        (catalogCode,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,certificateStatus,originalCount,duplicateCount,originalUrl,duplicateUrl,createUserId,createTime,updateUserId,updateTime,catalogId)
         VALUES
-        (#{catalogCode},#{certificateName},#{certificateCode},#{enterpriseNam},#{holderName},#{holderIDCardNo},#{certificateStatus},#{originalCount},#{duplicateCount},#{originalUrl},#{duplicateUrl},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{catalogId})
+        (#{catalogCode},#{certificateName},#{certificateCode},#{enterpriseName},#{holderName},#{holderIDCardNo},#{certificateStatus},#{originalCount},#{duplicateCount},#{originalUrl},#{duplicateUrl},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{catalogId})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_retain_log
-        (catalogCode,certificateName,certificateCode,enterpriseNam,holderName,holderIDCardNo,certificateStatus,originalCount,duplicateCount,originalUrl,duplicateUrl,createUserId,createTime,updateUserId,updateTime,catalogId)
+        (catalogCode,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,certificateStatus,originalCount,duplicateCount,originalUrl,duplicateUrl,createUserId,createTime,updateUserId,updateTime,catalogId)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.catalogCode},#{item.certificateName},#{item.certificateCode},#{item.enterpriseNam},#{item.holderName},#{item.holderIDCardNo},#{item.certificateStatus},#{item.originalCount},#{item.duplicateCount},#{item.originalUrl},#{item.duplicateUrl},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.catalogId})
+            (#{item.catalogCode},#{item.certificateName},#{item.certificateCode},#{item.enterpriseName},#{item.holderName},#{item.holderIDCardNo},#{item.certificateStatus},#{item.originalCount},#{item.duplicateCount},#{item.originalUrl},#{item.duplicateUrl},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.catalogId})
         </foreach>
     </insert>
 
@@ -115,8 +115,8 @@
             <if test="(colPickMode==0 and data.containsKey('certificateCode')) or (colPickMode==1 and !data.containsKey('certificateCode'))">
                 a.certificateCode=#{data.certificateCode},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('enterpriseNam')) or (colPickMode==1 and !data.containsKey('enterpriseNam'))">
-                a.enterpriseNam=#{data.enterpriseNam},
+            <if test="(colPickMode==0 and data.containsKey('enterpriseName')) or (colPickMode==1 and !data.containsKey('enterpriseName'))">
+                a.enterpriseName=#{data.enterpriseName},
             </if>
             <if test="(colPickMode==0 and data.containsKey('holderName')) or (colPickMode==1 and !data.containsKey('holderName'))">
                 a.holderName=#{data.holderName},
@@ -205,10 +205,10 @@
                         </if>
                     </foreach>
                 </trim>
-            <trim prefix="enterpriseNam=(case" suffix="ELSE enterpriseNam end),">
+                <trim prefix="enterpriseName=(case" suffix="ELSE enterpriseName end),">
                     <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('enterpriseNam')) or (colPickMode==1 and !item.containsKey('enterpriseNam'))">
-                        when a.id=#{item.id} then #{item.enterpriseNam}
+                        <if test="(colPickMode==0 and item.containsKey('enterpriseName')) or (colPickMode==1 and !item.containsKey('enterpriseName'))">
+                            when a.id=#{item.id} then #{item.enterpriseName}
                         </if>
                     </foreach>
                 </trim>
@@ -494,17 +494,17 @@
                 </foreach>
             </if>
 
-        <if test="conditionParamRef.containsKey('enterpriseNam')">
-            <if test="conditionParamRef.enterpriseNam != null and conditionParamRef.enterpriseNam != ''">
-                ${_conditionType_} a.enterpriseNam like #{${_conditionParam_}.enterpriseNam}
+            <if test="conditionParamRef.containsKey('enterpriseName')">
+                <if test="conditionParamRef.enterpriseName != null and conditionParamRef.enterpriseName != ''">
+                    ${_conditionType_} a.enterpriseName like #{${_conditionParam_}.enterpriseName}
                 </if>
-            <if test="conditionParamRef.enterpriseNam == null">
-                ${_conditionType_} a.enterpriseNam is null
+                <if test="conditionParamRef.enterpriseName == null">
+                    ${_conditionType_} a.enterpriseName is null
                 </if>
             </if>
-        <if test="conditionParamRef.containsKey('enterpriseNamList')">
-            ${_conditionType_} a.enterpriseNam in
-            <foreach collection="conditionParamRef.enterpriseNamList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('enterpriseNameList')">
+                ${_conditionType_} a.enterpriseName in
+                <foreach collection="conditionParamRef.enterpriseNameList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
@@ -757,9 +757,9 @@
                         <if test='orderCol.certificateCode != null and "DESC".equalsIgnoreCase(orderCol.certificateCode)'>DESC</if>
                         ,
                     </if>
-                <if test="orderCol.containsKey('enterpriseNam')">
-                    a.enterpriseNam
-                    <if test='orderCol.enterpriseNam != null and "DESC".equalsIgnoreCase(orderCol.enterpriseNam)'>DESC</if>
+                    <if test="orderCol.containsKey('enterpriseName')">
+                        a.enterpriseName
+                        <if test='orderCol.enterpriseName != null and "DESC".equalsIgnoreCase(orderCol.enterpriseName)'>DESC</if>
                         ,
                     </if>
                     <if test="orderCol.containsKey('holderName')">