diff --git a/certificate-manager/src/main/java/com/mortals/xhx/module/certificate/pdu/ApplyLogPdu.java b/certificate-manager/src/main/java/com/mortals/xhx/module/certificate/pdu/ApplyLogPdu.java index 8c83e9b19d0a6946f066c7280a9254d2d6f95a59..41765ddd893a299a6699d9c84ca690186bd4f22b 100644 --- a/certificate-manager/src/main/java/com/mortals/xhx/module/certificate/pdu/ApplyLogPdu.java +++ b/certificate-manager/src/main/java/com/mortals/xhx/module/certificate/pdu/ApplyLogPdu.java @@ -58,4 +58,6 @@ public class ApplyLogPdu { * 璇佺収妯℃澘姝f湰琛ㄥ崟鍐呭 */ private String formContent; + /** 绔欑偣id */ + private Long siteId; } diff --git a/certificate-manager/src/main/java/com/mortals/xhx/module/mid/pdu/MidCertificatePdu.java b/certificate-manager/src/main/java/com/mortals/xhx/module/mid/pdu/MidCertificatePdu.java index af88615c1854608cd9cd64978947d986c75c5dd9..73e7f4190fe357dea8d3ea2284978f291feb5a63 100644 --- a/certificate-manager/src/main/java/com/mortals/xhx/module/mid/pdu/MidCertificatePdu.java +++ b/certificate-manager/src/main/java/com/mortals/xhx/module/mid/pdu/MidCertificatePdu.java @@ -20,4 +20,6 @@ public class MidCertificatePdu { private String pickerIDCardNo; /** 浜岀淮鐮佸湴鍧€ */ private String ewmdz; + /** 绔欑偣id */ + private Long siteId; } diff --git a/certificate-manager/src/main/java/com/mortals/xhx/module/mid/web/DataInterfaceController.java b/certificate-manager/src/main/java/com/mortals/xhx/module/mid/web/DataInterfaceController.java index 080dfeb384077ecb0fec040070631b2413e1048d..a5741df61e555abe54259cb5348c5e45ed2a8bac 100644 --- a/certificate-manager/src/main/java/com/mortals/xhx/module/mid/web/DataInterfaceController.java +++ b/certificate-manager/src/main/java/com/mortals/xhx/module/mid/web/DataInterfaceController.java @@ -81,6 +81,7 @@ public class DataInterfaceController extends BaseJsonBodyController { ApplyLogPdu applyLogPdu = new ApplyLogPdu(); //applyLogPdu.setCatalogId(); + applyLogPdu.setSiteId(midCertificatePdu.getSiteId()); applyLogPdu.setCertificateCode(vo.getCertificateNumber()); applyLogPdu.setCertificateName(vo.getCertificateName()); applyLogPdu.setIssueTime(DateUtils.StrToDateTime(vo.getIssueDate(),"yyyy骞碝M鏈坉d鏃�")); diff --git a/certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/ApplyLogServiceImpl.java b/certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/ApplyLogServiceImpl.java index f67540d13ddd6c03713b7865c056824f7afedc09..53c4ab1c6db1b7a60ced37528efbf25c6e1fb100 100644 --- a/certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/ApplyLogServiceImpl.java +++ b/certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/ApplyLogServiceImpl.java @@ -581,9 +581,9 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap @Override public void midSaveApplyLog(ApplyLogPdu pdu, String classifyName) throws AppException { - CertificateClassifyEntity certificateClassifyEntity = certificateClassifyService.selectOne(new CertificateClassifyQuery().classifyName(classifyName)); + CertificateClassifyEntity certificateClassifyEntity = certificateClassifyService.selectOne(new CertificateClassifyQuery().classifyName(classifyName).siteId(pdu.getSiteId())); if(certificateClassifyEntity==null){ - throw new AppException("璇佺収绫诲瀷鍚嶇О涓嶆纭�"); + throw new AppException("娌℃湁鎵惧埌姝ょ珯鐐逛笅瀵瑰簲鐨勮瘉鐓х被鍨�"); } List<CertificateCatalogEntity> catalogEntityList = this.certificateCatalogService.find(new CertificateCatalogQuery().classifyId(certificateClassifyEntity.getId())); if(CollectionUtils.isNotEmpty(catalogEntityList)){ @@ -594,6 +594,7 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap entity.setCatalogName(catalogEntity.getCatalogName()); entity.setCertificateCode(pdu.getCertificateCode()); entity.setCertificateName(pdu.getCertificateName()); + entity.setSiteId(pdu.getSiteId()); entity.setHolderName(pdu.getHolderName()); entity.setHolderType(pdu.getHolderType()); entity.setHolderIdType(pdu.getHolderIdType());