证件持有增加字段

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

 package com.mortals.xhx.module.record.model;
+import java.util.Date;
 import java.util.List;
 import java.util.ArrayList;
 import java.math.BigDecimal;
@@ -10,102 +11,134 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.record.model.vo.RetainLogVo;
 import lombok.Data;
 /**
-* 证照持有实体对象
-*
-* @author zxfei
-* @date 2024-07-28
-*/
+ * 证照持有实体对象
+ *
+ * @author zxfei
+ * @date 2024-08-01
+ */
 @Data
 public class RetainLogEntity extends RetainLogVo {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 站点id
-    */
+     * 站点id
+     */
     private Long siteId;
     /**
-    * 证照档案ID
-    */
+     * 证照档案ID
+     */
     private Long recordId;
     /**
-    * 证照目录ID
-    */
+     * 证照目录ID
+     */
     private Long catalogId;
     /**
-    * 证照目录编号
-    */
+     * 证照目录编号
+     */
     private String catalogCode;
     /**
-    * 目录名称
-    */
+     * 目录名称
+     */
     private String catalogName;
     /**
-    * 证照名称
-    */
+     * 证照名称
+     */
     private String certificateName;
     /**
-    * 证照编号
-    */
+     * 证照编号
+     */
     private String certificateCode;
     /**
-    * 市场主体名称
-    */
+     * 市场主体名称
+     */
     private String enterpriseName;
     /**
-    * 法定代表人
-    */
+     * 法定代表人
+     */
     private String legalPerson;
     /**
-    * 统一社会信用代码
-    */
+     * 统一社会信用代码
+     */
     private String socialCode;
     /**
-    * 二维码
-    */
+     * 二维码
+     */
     private String qRCode;
     /**
-    * 持有者姓名
-    */
+     * 持有者姓名
+     */
     private String holderName;
     /**
-    * 持有者证件号码
-    */
+     * 持有者证件号码
+     */
     private String holderIDCardNo;
     /**
-    * 手机号码
-    */
+     * 手机号码
+     */
     private String mobile;
     /**
-    * 证照状态，1正常2注销
-    */
+     * 证照状态，1正常2注销
+     */
     private Integer certificateStatus;
     /**
-    * 证件附件地址
-    */
+     * 证件附件地址
+     */
     private String certificateUrl;
     /**
-    * 证件预览地址
-    */
+     * 证件预览地址
+     */
     private String previewUrl;
     /**
-    * 行业名称
-    */
+     * 行业名称
+     */
     private String industryName;
     /**
-    * 经营场所
-    */
+     * 经营场所
+     */
     private String businessPlace;
     /**
-    * 许可项目
-    */
+     * 许可项目
+     */
     private String licenseProject;
     /**
-    * 制证机关
-    */
+     * 制证机关
+     */
     private String authority;
+    /**
+     * 颁发时间
+     */
+    private Date issueTime;
+    /**
+     * 附件名称
+     */
+    private String annexName;
+    /**
+     * 附件地址
+     */
+    private String annexUrl;
+    /**
+     * 有效期起始
+     */
+    private Date validityStart;
+    /**
+     * 有效期截止
+     */
+    private Date validityEnd;
+    /**
+     * 持有者类型，1：自然人，2：法人，3：自然人法人
+     */
+    private Integer holderType;
+    /**
+     * 持有者证件类型，1：身份证，2：组织机构代码等
+     */
+    private Integer holderIdType;
+    /**
+     * 专网ID
+     */
+    private String privateID;
     @Override
     public int hashCode() {
-         return this.getId().hashCode();
+        return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -113,33 +146,41 @@ public class RetainLogEntity extends RetainLogVo {
         if (obj instanceof RetainLogEntity) {
             RetainLogEntity tmp = (RetainLogEntity) obj;
             if (this.getId() == tmp.getId()) {
-                 return true;
+                return true;
             }
         }
         return false;
     }
 
     public void initAttrValue(){
-            this.siteId = null;
-            this.recordId = null;
-            this.catalogId = null;
-            this.catalogCode = "";
-            this.catalogName = "";
-            this.certificateName = "";
-            this.certificateCode = "";
-            this.enterpriseName = "";
-            this.legalPerson = "";
-            this.socialCode = "";
-            this.qRCode = "";
-            this.holderName = "";
-            this.holderIDCardNo = "";
-            this.mobile = "";
-            this.certificateStatus = 1;
-            this.certificateUrl = "";
-            this.previewUrl = "";
-            this.industryName = "";
-            this.businessPlace = "";
-            this.licenseProject = "";
-            this.authority = "";
+        this.siteId = null;
+        this.recordId = null;
+        this.catalogId = null;
+        this.catalogCode = "";
+        this.catalogName = "";
+        this.certificateName = "";
+        this.certificateCode = "";
+        this.enterpriseName = "";
+        this.legalPerson = "";
+        this.socialCode = "";
+        this.qRCode = "";
+        this.holderName = "";
+        this.holderIDCardNo = "";
+        this.mobile = "";
+        this.certificateStatus = 1;
+        this.certificateUrl = "";
+        this.previewUrl = "";
+        this.industryName = "";
+        this.businessPlace = "";
+        this.licenseProject = "";
+        this.authority = "";
+        this.issueTime = null;
+        this.annexName = "";
+        this.annexUrl = "";
+        this.validityStart = null;
+        this.validityEnd = null;
+        this.holderType = 1;
+        this.holderIdType = 1;
+        this.privateID = "";
     }
 }
\ No newline at end of file

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

@@ -19,6 +19,7 @@ import com.mortals.xhx.module.record.dao.PrintLogDao;
 import com.mortals.xhx.module.record.dao.PrintWaitQueueDao;
 import com.mortals.xhx.module.record.dao.RetainLogDao;
 import com.mortals.xhx.module.record.model.*;
+import com.mortals.xhx.module.record.service.ApplyLogService;
 import com.mortals.xhx.module.record.service.PrintWaitQueueService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,6 +59,8 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
     private CertificateClassifyService certificateClassifyService;
     @Autowired
     private ParamService paramService;
+    @Autowired
+    private ApplyLogService applyLogService;
 
     @Override
     protected void findAfter(PrintWaitQueueEntity entity, Context context, List<PrintWaitQueueEntity> list) throws AppException {
@@ -154,8 +157,9 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
 
     private void doPrintSuccess(PrintWaitQueueEntity waitQueueEntity){
         RetainLogEntity retainLogEntity = new RetainLogEntity();
+        ApplyLogEntity applyLogEntity = applyLogService.get(waitQueueEntity.getApplyId());
         Date now = new Date();
-        BeanUtils.copyProperties(waitQueueEntity, retainLogEntity, BeanUtil.getNullPropertyNames(waitQueueEntity));
+        BeanUtils.copyProperties(applyLogEntity, retainLogEntity, BeanUtil.getNullPropertyNames(applyLogEntity));
         retainLogEntity.setId(null);
         retainLogEntity.setUpdateUserId(null);
         retainLogEntity.setUpdateTime(null);
@@ -183,7 +187,10 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
         query.setTotalIncrement(1);
         query.setUpdateTime(now);
         certificateClassifyService.update(query);
-
-
+        ApplyLogEntity updateApply = new ApplyLogEntity();
+        updateApply.setId(applyLogEntity.getId());
+        updateApply.setRecordStatus(YesNoEnum.YES.getValue());
+        updateApply.setUpdateTime(new Date());
+        applyLogService.update(updateApply);
     }
 }
\ No newline at end of file