Merge remote-tracking branch 'origin/first' into first

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

@@ -40,4 +40,14 @@ public class ApplyLogVo extends BaseEntityLong {
 
     private List <Long> catalogIdList;
 
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+    /** 开始 颁发时间 */
+    private String issueTimeStart;
+
+    /** 结束 颁发时间 */
+    private String issueTimeEnd;
 }
\ No newline at end of file

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

@@ -19,4 +19,15 @@ public class RetainLogVo extends BaseEntityLong {
     private String query;
     /** 子证联报状态 已联报数/子证总数 */
     private String processStatus;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+    /** 开始 颁发时间 */
+    private String issueTimeStart;
+
+    /** 结束 颁发时间 */
+    private String issueTimeEnd;
 }
\ No newline at end of file

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

@@ -183,7 +183,9 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
             retainLogDao.update(updateRetainLog);
         }else {
             RetainLogEntity retainLogEntity = new RetainLogEntity();
+            retainLogEntity.initAttrValue();
             BeanUtils.copyProperties(applyLogEntity, retainLogEntity, BeanUtil.getNullPropertyNames(applyLogEntity));
+            retainLogEntity.setApplyId(applyLogEntity.getId());
             retainLogEntity.setId(null);
             retainLogEntity.setUpdateUserId(null);
             retainLogEntity.setUpdateTime(null);

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

@@ -4,6 +4,7 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.xhx.common.code.CertificateStatus;
 import com.mortals.xhx.common.code.ProcessStatusEnum;
 import com.mortals.xhx.common.code.StatusEnum;
 import com.mortals.xhx.common.utils.StringUtils;
@@ -12,10 +13,12 @@ import com.mortals.xhx.module.certificate.model.vo.CertificateDocumentPdu;
 import com.mortals.xhx.module.child.model.ChildLicenseEntity;
 import com.mortals.xhx.module.child.model.ChildLicenseQuery;
 import com.mortals.xhx.module.child.service.ChildLicenseService;
+import com.mortals.xhx.module.record.dao.ApplyLogDao;
 import com.mortals.xhx.module.record.dao.RetainLogDao;
 import com.mortals.xhx.module.record.model.ApplyLogEntity;
 import com.mortals.xhx.module.record.model.RetainLogEntity;
 import com.mortals.xhx.module.record.model.RetainLogQuery;
+import com.mortals.xhx.module.record.service.ApplyLogService;
 import com.mortals.xhx.module.record.service.RetainLogService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
@@ -23,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -37,6 +41,8 @@ public class RetainLogServiceImpl extends AbstractCRUDServiceImpl<RetainLogDao,
 
     @Autowired
     private ChildLicenseService childLicenseService;
+    @Autowired
+    private ApplyLogDao applyLogDao;
 
     @Override
     protected RetainLogEntity findBefore(RetainLogEntity entity, PageInfo pageInfo, Context context) throws AppException {
@@ -92,4 +98,18 @@ public class RetainLogServiceImpl extends AbstractCRUDServiceImpl<RetainLogDao,
             }
         }
     }
+
+    @Override
+    protected void updateAfter(RetainLogEntity entity, Context context) throws AppException {
+        if(entity.getCertificateStatus()== CertificateStatus.CANCEL.getValue()){
+            ApplyLogEntity applyLogEntity = applyLogDao.get(entity.getApplyId());
+            if(applyLogEntity!=null){
+                ApplyLogEntity update = new ApplyLogEntity();
+                update.setId(applyLogEntity.getId());
+                update.setSocialCode(applyLogEntity.getSocialCode()+"_zx");
+                update.setUpdateTime(new Date());
+                applyLogDao.update(update);
+            }
+        }
+    }
 }
\ No newline at end of file