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

one-certificate-manager/src/main/java/com/mortals/xhx/module/child/service/impl/ChildLicenseServiceImpl.java

@@ -72,6 +72,12 @@ public class ChildLicenseServiceImpl extends AbstractCRUDServiceImpl<ChildLicens
                 }
                 for (ChildLicenseEntity child : oldChildList) {
                     child.setApplyId(applyLogEntity.getId());
+                    child.setMarketEntityName(applyLogEntity.getEnterpriseName());
+                    child.setLicenseCode(applyLogEntity.getCertificateCode());
+                    child.setLegalPersonName(applyLogEntity.getLegalPerson());
+                    child.setCreditCode(applyLogEntity.getSocialCode());
+                    child.setProductLicenseTime(applyLogEntity.getIssueTime());
+                    child.setCertQRCode(applyLogEntity.getQRCode());
                     if (documentIdMap.size() > 0 && documentIdMap.containsKey(child.getDocumentId())) {
                         child.setChildStatus(StatusEnum.ENABLE.getValue());
                     } else {

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

@@ -109,6 +109,8 @@ public class RetainLogServiceImpl extends AbstractCRUDServiceImpl<RetainLogDao,
                 update.setSocialCode(applyLogEntity.getSocialCode()+"_zx");
                 update.setUpdateTime(new Date());
                 applyLogDao.update(update);
+                List<ChildLicenseEntity> childLicenseEntityList = childLicenseService.find(new ChildLicenseQuery().applyId(applyLogEntity.getId()));
+                childLicenseService.removeList(childLicenseEntityList,context);
             }
         }
     }