修改目录表结构

certificate-manager/src/main/java/com/mortals/xhx/common/code/OperTypeEnum.java

@@ -8,8 +8,8 @@ import java.util.Map;
  */
 public enum OperTypeEnum {
 
-    SAVE(0,"添加"),
-    UPDATE(1,"更新"),
+    SAVE(0,"新增"),
+    UPDATE(1,"修改"),
     DELETE(2,"删除"),
     OTHER(-1,"其它");
 

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

@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.certificate.model.vo.CertificateCatalogVo;
 /**
- * 证照目录实体对象
- *
- * @author zxfei
- * @date 2022-10-26
- */
+* 证照目录实体对象
+*
+* @author zxfei
+* @date 2022-11-04
+*/
 
 public class CertificateCatalogEntity extends CertificateCatalogVo {
     private static final long serialVersionUID = 1L;
@@ -49,29 +49,17 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
     */
     private Integer inspect;
     /**
-     * 证照模板正本文件名称
-     */
-    private String oriFileName;
-    /**
-     * 证照模板正本文件地址
+    * 证照模板文件名称
     */
-    private String originalUrl;
+    private String templateName;
     /**
-     * 证照模板正本表单内容
+    * 证照模板文件地址
     */
-    private String oriFormContent;
+    private String templateUrl;
     /**
-     * 证照模板副本文件名称
+    * 证照模板表单内容
     */
-    private String dupFileName;
-    /**
-     * 证照模板副本文件地址
-     */
-    private String duplicateUrl;
-    /**
-     * 证照模板副本表单内容
-     */
-    private String dupFormContent;
+    private String formContent;
     /**
     * 证照示例图地址
     */
@@ -92,6 +80,10 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
     * 打印机纸盒
     */
     private String paperSource;
+    /**
+    * 打印设备Id
+    */
+    private Long deviceId;
 
 
 
@@ -209,88 +201,46 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
         this.inspect = inspect;
     }
     /**
-     * 获取 证照模板正本文件名称
+    * 获取 证照模板文件名称
     * @return String
     */
-    public String getOriFileName(){
-        return oriFileName;
+    public String getTemplateName(){
+        return templateName;
     }
     /**
-     * 设置 证照模板正本文件名称
-     * @param oriFileName
+    * 设置 证照模板文件名称
+    * @param templateName
     */
-    public void setOriFileName(String oriFileName){
-        this.oriFileName = oriFileName;
+    public void setTemplateName(String templateName){
+        this.templateName = templateName;
     }
     /**
-     * 获取 证照模板正本文件地址
+    * 获取 证照模板文件地址
     * @return String
     */
-    public String getOriginalUrl(){
-        return originalUrl;
+    public String getTemplateUrl(){
+        return templateUrl;
     }
     /**
-     * 设置 证照模板正本文件地址
-     * @param originalUrl
+    * 设置 证照模板文件地址
+    * @param templateUrl
     */
-    public void setOriginalUrl(String originalUrl){
-        this.originalUrl = originalUrl;
+    public void setTemplateUrl(String templateUrl){
+        this.templateUrl = templateUrl;
     }
     /**
-     * 获取 证照模板正本表单内容
+    * 获取 证照模板表单内容
     * @return String
     */
-    public String getOriFormContent(){
-        return oriFormContent;
+    public String getFormContent(){
+        return formContent;
     }
     /**
-     * 设置 证照模板正本表单内容
-     * @param oriFormContent
+    * 设置 证照模板表单内容
+    * @param formContent
     */
-    public void setOriFormContent(String oriFormContent){
-        this.oriFormContent = oriFormContent;
-    }
-    /**
-     * 获取 证照模板副本文件名称
-     * @return String
-     */
-    public String getDupFileName(){
-        return dupFileName;
-    }
-    /**
-     * 设置 证照模板副本文件名称
-     * @param dupFileName
-     */
-    public void setDupFileName(String dupFileName){
-        this.dupFileName = dupFileName;
-    }
-    /**
-     * 获取 证照模板副本文件地址
-     * @return String
-     */
-    public String getDuplicateUrl(){
-        return duplicateUrl;
-    }
-    /**
-     * 设置 证照模板副本文件地址
-     * @param duplicateUrl
-     */
-    public void setDuplicateUrl(String duplicateUrl){
-        this.duplicateUrl = duplicateUrl;
-    }
-    /**
-     * 获取 证照模板副本表单内容
-     * @return String
-     */
-    public String getDupFormContent(){
-        return dupFormContent;
-    }
-    /**
-     * 设置 证照模板副本表单内容
-     * @param dupFormContent
-     */
-    public void setDupFormContent(String dupFormContent){
-        this.dupFormContent = dupFormContent;
+    public void setFormContent(String formContent){
+        this.formContent = formContent;
     }
     /**
     * 获取 证照示例图地址
@@ -362,6 +312,20 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
     public void setPaperSource(String paperSource){
         this.paperSource = paperSource;
     }
+    /**
+    * 获取 打印设备Id
+    * @return Long
+    */
+    public Long getDeviceId(){
+        return deviceId;
+    }
+    /**
+    * 设置 打印设备Id
+    * @param deviceId
+    */
+    public void setDeviceId(Long deviceId){
+        this.deviceId = deviceId;
+    }
 
 
 
@@ -392,17 +356,15 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
         sb.append(",transverse:").append(getTransverse());
         sb.append(",portrait:").append(getPortrait());
         sb.append(",inspect:").append(getInspect());
-        sb.append(",oriFileName:").append(getOriFileName());
-        sb.append(",originalUrl:").append(getOriginalUrl());
-        sb.append(",oriFormContent:").append(getOriFormContent());
-        sb.append(",dupFileName:").append(getDupFileName());
-        sb.append(",duplicateUrl:").append(getDuplicateUrl());
-        sb.append(",dupFormContent:").append(getDupFormContent());
+        sb.append(",templateName:").append(getTemplateName());
+        sb.append(",templateUrl:").append(getTemplateUrl());
+        sb.append(",formContent:").append(getFormContent());
         sb.append(",exampleUrl:").append(getExampleUrl());
         sb.append(",status:").append(getStatus());
         sb.append(",printerName:").append(getPrinterName());
         sb.append(",printerIp:").append(getPrinterIp());
         sb.append(",paperSource:").append(getPaperSource());
+        sb.append(",deviceId:").append(getDeviceId());
         return sb.toString();
     }
 
@@ -424,17 +386,11 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
 
             this.inspect = 0;
 
-        this.oriFileName = "";
-
-        this.originalUrl = "";
-
-        this.oriFormContent = "";
+            this.templateName = "";
 
-        this.dupFileName = "";
+            this.templateUrl = "";
 
-        this.duplicateUrl = "";
-
-        this.dupFormContent = "";
+            this.formContent = "";
 
             this.exampleUrl = "";
 
@@ -445,5 +401,7 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
             this.printerIp = "";
 
             this.paperSource = "";
+
+            this.deviceId = null;
     }
 }
\ No newline at end of file

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-22
+* @date 2022-11-04
 */
 
 public class CertificateClassifyEntity extends CertificateClassifyVo {

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-22
+* @date 2022-11-04
 */
 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-22
+* @date 2022-11-04
 */
 
 public class CertificateIndustryEntity extends CertificateIndustryVo {

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-22
+* @date 2022-11-04
 */
 public class CertificateIndustryQuery extends CertificateIndustryEntity {
     /** 开始 序号，主键，自增长 */

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

@@ -68,12 +68,10 @@ public class CertificateCatalogServiceImpl extends AbstractCRUDServiceImpl<Certi
             throw new AppException("所属行业不能为空");
         }
         entity.setStatus(StatusEnum.ENABLE.getValue());
-        if(StringUtils.isNotEmpty(entity.getOriginalUrl())){
-            entity.setOriFormContent(parseDocxToJson(entity.getOriginalUrl()));
-        }
-        if(StringUtils.isNotEmpty(entity.getDuplicateUrl())){
-            entity.setDupFormContent(parseDocxToJson(entity.getDuplicateUrl()));
+        if(StringUtils.isNotEmpty(entity.getTemplateUrl())){
+            entity.setFormContent(parseDocxToJson(entity.getTemplateUrl()));
         }
+
     }
 
 //    @Override

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-22
+* @date 2022-11-04
 */
 
 public class DeviceEntity extends DeviceVo {

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

@@ -10,7 +10,7 @@ import com.mortals.xhx.module.device.model.vo.DeviceModuleVo;
 * 证照柜设备实体对象
 *
 * @author zxfei
-* @date 2022-10-26
+* @date 2022-11-04
 */
 
 public class DeviceModuleEntity extends DeviceModuleVo {

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

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

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-22
+* @date 2022-11-04
 */
 public class DeviceQuery extends DeviceEntity {
     /** 开始 序号，主键，自增长 */

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

+package com.mortals.xhx.module.record.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.record.model.RecordEntity;
+import java.util.List;
+/**
+* 证照申请Dao
+* 证照申请 DAO接口
+*
+* @author zxfei
+* @date 2022-11-04
+*/
+public interface  RecordDao extends ICRUDDao<RecordEntity,Long>{
+
+
+}

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

+package com.mortals.xhx.module.record.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.record.dao.RecordDao;
+import com.mortals.xhx.module.record.model.RecordEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 证照申请DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2022-11-04
+*/
+@Repository("recordDao")
+public class RecordDaoImpl extends BaseCRUDDaoMybatis<RecordEntity,Long> implements RecordDao {
+
+
+
+}

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

@@ -8,20 +8,28 @@ 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-26
- */
+* 证照打印记录实体对象
+*
+* @author zxfei
+* @date 2022-11-04
+*/
 
 public class PrintLogEntity extends PrintLogVo {
     private static final long serialVersionUID = 1L;
 
+    /**
+    * 证照目录ID
+    */
+    private Long catalogId;
     /**
     * 证照目录编号
     */
     private String catalogCode;
     /**
+    * 目录名称
+    */
+    private String catalogName;
+    /**
     * 证照名称
     */
     private String certificateName;
@@ -49,14 +57,6 @@ public class PrintLogEntity extends PrintLogVo {
     * 取件人证件号码
     */
     private String pickerIDCardNo;
-    /**
-     * 正本数
-     */
-    private Integer originalCount;
-    /**
-     * 副本数
-     */
-    private Integer duplicateCount;
     /**
     * 打印状态1打印成功2失败
     */
@@ -65,23 +65,33 @@ public class PrintLogEntity extends PrintLogVo {
     * 打印时间
     */
     private Date printDate;
-    /**
-     * 打印设备
-     */
-    private Long deviceId;
-    /**
-     * 证照目录ID
-     */
-    private Long catalogId;
     /**
     * 打印结果描述
     */
     private String statusRemark;
+    /**
+    * 打印设备
+    */
+    private Long deviceId;
 
 
 
     public PrintLogEntity(){}
     /**
+    * 获取 证照目录ID
+    * @return Long
+    */
+    public Long getCatalogId(){
+        return catalogId;
+    }
+    /**
+    * 设置 证照目录ID
+    * @param catalogId
+    */
+    public void setCatalogId(Long catalogId){
+        this.catalogId = catalogId;
+    }
+    /**
     * 获取 证照目录编号
     * @return String
     */
@@ -96,6 +106,20 @@ public class PrintLogEntity extends PrintLogVo {
         this.catalogCode = catalogCode;
     }
     /**
+    * 获取 目录名称
+    * @return String
+    */
+    public String getCatalogName(){
+        return catalogName;
+    }
+    /**
+    * 设置 目录名称
+    * @param catalogName
+    */
+    public void setCatalogName(String catalogName){
+        this.catalogName = catalogName;
+    }
+    /**
     * 获取 证照名称
     * @return String
     */
@@ -193,34 +217,6 @@ public class PrintLogEntity extends PrintLogVo {
     public void setPickerIDCardNo(String pickerIDCardNo){
         this.pickerIDCardNo = pickerIDCardNo;
     }
-    /**
-     * 获取 正本数
-     * @return Integer
-     */
-    public Integer getOriginalCount(){
-        return originalCount;
-    }
-    /**
-     * 设置 正本数
-     * @param originalCount
-     */
-    public void setOriginalCount(Integer originalCount){
-        this.originalCount = originalCount;
-    }
-    /**
-     * 获取 副本数
-     * @return Integer
-     */
-    public Integer getDuplicateCount(){
-        return duplicateCount;
-    }
-    /**
-     * 设置 副本数
-     * @param duplicateCount
-     */
-    public void setDuplicateCount(Integer duplicateCount){
-        this.duplicateCount = duplicateCount;
-    }
     /**
     * 获取 打印状态1打印成功2失败
     * @return Integer
@@ -249,34 +245,6 @@ public class PrintLogEntity extends PrintLogVo {
     public void setPrintDate(Date printDate){
         this.printDate = printDate;
     }
-    /**
-     * 获取 打印设备
-     * @return Long
-     */
-    public Long getDeviceId(){
-        return deviceId;
-    }
-    /**
-     * 设置 打印设备
-     * @param deviceId
-     */
-    public void setDeviceId(Long deviceId){
-        this.deviceId = deviceId;
-    }
-    /**
-     * 获取 证照目录ID
-     * @return Long
-     */
-    public Long getCatalogId(){
-        return catalogId;
-    }
-    /**
-     * 设置 证照目录ID
-     * @param catalogId
-     */
-    public void setCatalogId(Long catalogId){
-        this.catalogId = catalogId;
-    }
     /**
     * 获取 打印结果描述
     * @return String
@@ -291,6 +259,20 @@ public class PrintLogEntity extends PrintLogVo {
     public void setStatusRemark(String statusRemark){
         this.statusRemark = statusRemark;
     }
+    /**
+    * 获取 打印设备
+    * @return Long
+    */
+    public Long getDeviceId(){
+        return deviceId;
+    }
+    /**
+    * 设置 打印设备
+    * @param deviceId
+    */
+    public void setDeviceId(Long deviceId){
+        this.deviceId = deviceId;
+    }
 
 
 
@@ -313,7 +295,9 @@ public class PrintLogEntity extends PrintLogVo {
 
     public String toString(){
         StringBuilder sb = new StringBuilder("");
+        sb.append(",catalogId:").append(getCatalogId());
         sb.append(",catalogCode:").append(getCatalogCode());
+        sb.append(",catalogName:").append(getCatalogName());
         sb.append(",certificateName:").append(getCertificateName());
         sb.append(",certificateCode:").append(getCertificateCode());
         sb.append(",enterpriseName:").append(getEnterpriseName());
@@ -321,20 +305,21 @@ public class PrintLogEntity extends PrintLogVo {
         sb.append(",holderIDCardNo:").append(getHolderIDCardNo());
         sb.append(",pickerName:").append(getPickerName());
         sb.append(",pickerIDCardNo:").append(getPickerIDCardNo());
-        sb.append(",originalCount:").append(getOriginalCount());
-        sb.append(",duplicateCount:").append(getDuplicateCount());
         sb.append(",printStatus:").append(getPrintStatus());
         sb.append(",printDate:").append(getPrintDate());
-        sb.append(",deviceId:").append(getDeviceId());
-        sb.append(",catalogId:").append(getCatalogId());
         sb.append(",statusRemark:").append(getStatusRemark());
+        sb.append(",deviceId:").append(getDeviceId());
         return sb.toString();
     }
 
     public void initAttrValue(){
 
+            this.catalogId = null;
+
             this.catalogCode = "";
 
+            this.catalogName = "";
+
             this.certificateName = "";
 
             this.certificateCode = "";
@@ -349,18 +334,12 @@ public class PrintLogEntity extends PrintLogVo {
 
             this.pickerIDCardNo = "";
 
-        this.originalCount = 0;
-
-        this.duplicateCount = 0;
-
             this.printStatus = 1;
 
             this.printDate = null;
 
-        this.deviceId = null;
-
-        this.catalogId = null;
-
             this.statusRemark = "";
+
+            this.deviceId = null;
     }
 }
\ No newline at end of file

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

@@ -10,21 +10,33 @@ import com.mortals.xhx.module.record.model.vo.PrintWaitQueueVo;
 * 证照打印记录实体对象
 *
 * @author zxfei
-* @date 2022-10-22
+* @date 2022-11-04
 */
 
 public class PrintWaitQueueEntity extends PrintWaitQueueVo {
     private static final long serialVersionUID = 1L;
 
+    /**
+    * 证照档案ID
+    */
+    private Long recordId;
     /**
     * 申请ID
     */
     private Long applyId;
     /**
+    * 证照目录ID
+    */
+    private Long catalogId;
+    /**
     * 证照目录编号
     */
     private String catalogCode;
     /**
+    * 目录名称
+    */
+    private String catalogName;
+    /**
     * 证照名称
     */
     private String certificateName;
@@ -53,10 +65,6 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
     */
     private String pickerIDCardNo;
     /**
-    * 证件类型1正本2副本
-    */
-    private Integer certificateType;
-    /**
     * 证件预览地址
     */
     private String previewUrl;
@@ -65,18 +73,32 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
     */
     private String certificateUrl;
     /**
-    * 是否打印0否1是
+    * 是否完成打印0否1是
     */
     private Integer printStatus;
     /**
-    * 证照目录ID
+    * 允许打印次数
     */
-    private Long catalogId;
+    private Integer total;
 
 
 
     public PrintWaitQueueEntity(){}
     /**
+    * 获取 证照档案ID
+    * @return Long
+    */
+    public Long getRecordId(){
+        return recordId;
+    }
+    /**
+    * 设置 证照档案ID
+    * @param recordId
+    */
+    public void setRecordId(Long recordId){
+        this.recordId = recordId;
+    }
+    /**
     * 获取 申请ID
     * @return Long
     */
@@ -91,6 +113,20 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
         this.applyId = applyId;
     }
     /**
+    * 获取 证照目录ID
+    * @return Long
+    */
+    public Long getCatalogId(){
+        return catalogId;
+    }
+    /**
+    * 设置 证照目录ID
+    * @param catalogId
+    */
+    public void setCatalogId(Long catalogId){
+        this.catalogId = catalogId;
+    }
+    /**
     * 获取 证照目录编号
     * @return String
     */
@@ -105,6 +141,20 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
         this.catalogCode = catalogCode;
     }
     /**
+    * 获取 目录名称
+    * @return String
+    */
+    public String getCatalogName(){
+        return catalogName;
+    }
+    /**
+    * 设置 目录名称
+    * @param catalogName
+    */
+    public void setCatalogName(String catalogName){
+        this.catalogName = catalogName;
+    }
+    /**
     * 获取 证照名称
     * @return String
     */
@@ -203,20 +253,6 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
         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
     */
@@ -245,32 +281,32 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
         this.certificateUrl = certificateUrl;
     }
     /**
-    * 获取 是否打印0否1是
+    * 获取 是否完成打印0否1是
     * @return Integer
     */
     public Integer getPrintStatus(){
         return printStatus;
     }
     /**
-    * 设置 是否打印0否1是
+    * 设置 是否完成打印0否1是
     * @param printStatus
     */
     public void setPrintStatus(Integer printStatus){
         this.printStatus = printStatus;
     }
     /**
-    * 获取 证照目录ID
-    * @return Long
+    * 获取 允许打印次数
+    * @return Integer
     */
-    public Long getCatalogId(){
-        return catalogId;
+    public Integer getTotal(){
+        return total;
     }
     /**
-    * 设置 证照目录ID
-    * @param catalogId
+    * 设置 允许打印次数
+    * @param total
     */
-    public void setCatalogId(Long catalogId){
-        this.catalogId = catalogId;
+    public void setTotal(Integer total){
+        this.total = total;
     }
 
 
@@ -294,8 +330,11 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
 
     public String toString(){
         StringBuilder sb = new StringBuilder("");
+        sb.append(",recordId:").append(getRecordId());
         sb.append(",applyId:").append(getApplyId());
+        sb.append(",catalogId:").append(getCatalogId());
         sb.append(",catalogCode:").append(getCatalogCode());
+        sb.append(",catalogName:").append(getCatalogName());
         sb.append(",certificateName:").append(getCertificateName());
         sb.append(",certificateCode:").append(getCertificateCode());
         sb.append(",enterpriseName:").append(getEnterpriseName());
@@ -303,20 +342,25 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
         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());
+        sb.append(",total:").append(getTotal());
         return sb.toString();
     }
 
     public void initAttrValue(){
 
+            this.recordId = null;
+
             this.applyId = null;
 
+            this.catalogId = null;
+
             this.catalogCode = "";
 
+            this.catalogName = "";
+
             this.certificateName = "";
 
             this.certificateCode = "";
@@ -331,14 +375,12 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
 
             this.pickerIDCardNo = "";
 
-            this.certificateType = 1;
-
             this.previewUrl = "";
 
             this.certificateUrl = "";
 
             this.printStatus = 0;
 
-            this.catalogId = null;
+            this.total = 1;
     }
 }
\ No newline at end of file

certificate-manager/src/main/java/com/mortals/xhx/module/record/model/RecordEntity.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.RecordVo;
+/**
+* 证照申请实体对象
+*
+* @author zxfei
+* @date 2022-11-04
+*/
+
+public class RecordEntity extends RecordVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 证照目录ID
+    */
+    private Long catalogId;
+    /**
+    * 目录名称
+    */
+    private String catalogName;
+    /**
+    * 目录编号
+    */
+    private String catalogCode;
+    /**
+    * 档案状态
+    */
+    private Integer recordStatus;
+
+
+
+    public RecordEntity(){}
+    /**
+    * 获取 证照目录ID
+    * @return Long
+    */
+    public Long getCatalogId(){
+        return catalogId;
+    }
+    /**
+    * 设置 证照目录ID
+    * @param catalogId
+    */
+    public void setCatalogId(Long catalogId){
+        this.catalogId = catalogId;
+    }
+    /**
+    * 获取 目录名称
+    * @return String
+    */
+    public String getCatalogName(){
+        return catalogName;
+    }
+    /**
+    * 设置 目录名称
+    * @param catalogName
+    */
+    public void setCatalogName(String catalogName){
+        this.catalogName = catalogName;
+    }
+    /**
+    * 获取 目录编号
+    * @return String
+    */
+    public String getCatalogCode(){
+        return catalogCode;
+    }
+    /**
+    * 设置 目录编号
+    * @param catalogCode
+    */
+    public void setCatalogCode(String catalogCode){
+        this.catalogCode = catalogCode;
+    }
+    /**
+    * 获取 档案状态
+    * @return Integer
+    */
+    public Integer getRecordStatus(){
+        return recordStatus;
+    }
+    /**
+    * 设置 档案状态
+    * @param recordStatus
+    */
+    public void setRecordStatus(Integer recordStatus){
+        this.recordStatus = recordStatus;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof RecordEntity) {
+            RecordEntity tmp = (RecordEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",catalogId:").append(getCatalogId());
+        sb.append(",catalogName:").append(getCatalogName());
+        sb.append(",catalogCode:").append(getCatalogCode());
+        sb.append(",recordStatus:").append(getRecordStatus());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.catalogId = null;
+
+            this.catalogName = "";
+
+            this.catalogCode = "";
+
+            this.recordStatus = 1;
+    }
+}
\ No newline at end of file

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

@@ -10,17 +10,29 @@ import com.mortals.xhx.module.record.model.vo.RetainLogVo;
 * 证照持有实体对象
 *
 * @author zxfei
-* @date 2022-10-22
+* @date 2022-11-04
 */
 
 public class RetainLogEntity extends RetainLogVo {
     private static final long serialVersionUID = 1L;
 
+    /**
+    * 证照档案ID
+    */
+    private Long recordId;
+    /**
+    * 证照目录ID
+    */
+    private Long catalogId;
     /**
     * 证照目录编号
     */
     private String catalogCode;
     /**
+    * 目录名称
+    */
+    private String catalogName;
+    /**
     * 证照名称
     */
     private String certificateName;
@@ -45,29 +57,45 @@ public class RetainLogEntity extends RetainLogVo {
     */
     private Integer certificateStatus;
     /**
-    * 正本数
+    * 证件附件地址
     */
-    private Integer originalCount;
+    private String certificateUrl;
     /**
-    * 副本数
+    * 证件预览地址
     */
-    private Integer duplicateCount;
+    private String previewUrl;
+
+
+
+    public RetainLogEntity(){}
     /**
-    * 正本附件地址
+    * 获取 证照档案ID
+    * @return Long
     */
-    private String originalUrl;
+    public Long getRecordId(){
+        return recordId;
+    }
     /**
-    * 副本附件地址
+    * 设置 证照档案ID
+    * @param recordId
     */
-    private String duplicateUrl;
+    public void setRecordId(Long recordId){
+        this.recordId = recordId;
+    }
     /**
-    * 证照目录ID
+    * 获取 证照目录ID
+    * @return Long
     */
-    private Long catalogId;
-
-
-
-    public RetainLogEntity(){}
+    public Long getCatalogId(){
+        return catalogId;
+    }
+    /**
+    * 设置 证照目录ID
+    * @param catalogId
+    */
+    public void setCatalogId(Long catalogId){
+        this.catalogId = catalogId;
+    }
     /**
     * 获取 证照目录编号
     * @return String
@@ -83,6 +111,20 @@ public class RetainLogEntity extends RetainLogVo {
         this.catalogCode = catalogCode;
     }
     /**
+    * 获取 目录名称
+    * @return String
+    */
+    public String getCatalogName(){
+        return catalogName;
+    }
+    /**
+    * 设置 目录名称
+    * @param catalogName
+    */
+    public void setCatalogName(String catalogName){
+        this.catalogName = catalogName;
+    }
+    /**
     * 获取 证照名称
     * @return String
     */
@@ -167,74 +209,32 @@ public class RetainLogEntity extends RetainLogVo {
         this.certificateStatus = certificateStatus;
     }
     /**
-    * 获取 正本数
-    * @return Integer
-    */
-    public Integer getOriginalCount(){
-        return originalCount;
-    }
-    /**
-    * 设置 正本数
-    * @param originalCount
-    */
-    public void setOriginalCount(Integer originalCount){
-        this.originalCount = originalCount;
-    }
-    /**
-    * 获取 副本数
-    * @return Integer
-    */
-    public Integer getDuplicateCount(){
-        return duplicateCount;
-    }
-    /**
-    * 设置 副本数
-    * @param duplicateCount
-    */
-    public void setDuplicateCount(Integer duplicateCount){
-        this.duplicateCount = duplicateCount;
-    }
-    /**
-    * 获取 正本附件地址
+    * 获取 证件附件地址
     * @return String
     */
-    public String getOriginalUrl(){
-        return originalUrl;
+    public String getCertificateUrl(){
+        return certificateUrl;
     }
     /**
-    * 设置 正本附件地址
-    * @param originalUrl
+    * 设置 证件附件地址
+    * @param certificateUrl
     */
-    public void setOriginalUrl(String originalUrl){
-        this.originalUrl = originalUrl;
+    public void setCertificateUrl(String certificateUrl){
+        this.certificateUrl = certificateUrl;
     }
     /**
-    * 获取 副本附件地址
+    * 获取 证件预览地址
     * @return String
     */
-    public String getDuplicateUrl(){
-        return duplicateUrl;
+    public String getPreviewUrl(){
+        return previewUrl;
     }
     /**
-    * 设置 副本附件地址
-    * @param duplicateUrl
+    * 设置 证件预览地址
+    * @param previewUrl
     */
-    public void setDuplicateUrl(String duplicateUrl){
-        this.duplicateUrl = duplicateUrl;
-    }
-    /**
-    * 获取 证照目录ID
-    * @return Long
-    */
-    public Long getCatalogId(){
-        return catalogId;
-    }
-    /**
-    * 设置 证照目录ID
-    * @param catalogId
-    */
-    public void setCatalogId(Long catalogId){
-        this.catalogId = catalogId;
+    public void setPreviewUrl(String previewUrl){
+        this.previewUrl = previewUrl;
     }
 
 
@@ -258,25 +258,31 @@ public class RetainLogEntity extends RetainLogVo {
 
     public String toString(){
         StringBuilder sb = new StringBuilder("");
+        sb.append(",recordId:").append(getRecordId());
+        sb.append(",catalogId:").append(getCatalogId());
         sb.append(",catalogCode:").append(getCatalogCode());
+        sb.append(",catalogName:").append(getCatalogName());
         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(",certificateStatus:").append(getCertificateStatus());
-        sb.append(",originalCount:").append(getOriginalCount());
-        sb.append(",duplicateCount:").append(getDuplicateCount());
-        sb.append(",originalUrl:").append(getOriginalUrl());
-        sb.append(",duplicateUrl:").append(getDuplicateUrl());
-        sb.append(",catalogId:").append(getCatalogId());
+        sb.append(",certificateUrl:").append(getCertificateUrl());
+        sb.append(",previewUrl:").append(getPreviewUrl());
         return sb.toString();
     }
 
     public void initAttrValue(){
 
+            this.recordId = null;
+
+            this.catalogId = null;
+
             this.catalogCode = "";
 
+            this.catalogName = "";
+
             this.certificateName = "";
 
             this.certificateCode = "";
@@ -289,14 +295,8 @@ public class RetainLogEntity extends RetainLogVo {
 
             this.certificateStatus = 1;
 
-            this.originalCount = 0;
+            this.certificateUrl = "";
 
-            this.duplicateCount = 0;
-
-            this.originalUrl = "";
-
-            this.duplicateUrl = "";
-
-            this.catalogId = null;
+            this.previewUrl = "";
     }
 }
\ No newline at end of file

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

+package com.mortals.xhx.module.record.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.record.model.RecordEntity;
+import java.util.ArrayList;
+import java.util.List;
+/**
+* 证照申请视图对象
+*
+* @author zxfei
+* @date 2022-11-04
+*/
+public class RecordVo extends BaseEntityLong {
+
+}
\ No newline at end of file

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

@@ -16,11 +16,4 @@ import com.mortals.xhx.module.record.model.PrintLogEntity;
 */
 public interface PrintLogService extends ICRUDService<PrintLogEntity,Long>{
 
-    /**
-     * 添加打印记录
-     * @param applyLogEntity
-     * @param context
-     * @throws AppException
-     */
-    void creatPrintLog(ApplyLogEntity applyLogEntity, Context context) throws AppException;
 }
\ No newline at end of file

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

+package com.mortals.xhx.module.record.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.record.model.RecordEntity;
+/**
+* RecordService
+*
+* 证照申请 service接口
+*
+* @author zxfei
+* @date 2022-11-04
+*/
+public interface RecordService extends ICRUDService<RecordEntity,Long>{
+
+}
\ No newline at end of file