Commit a25c3e74 authored by 廖旭伟's avatar 廖旭伟

所有表增加站点id属性

parent f4dd572a
...@@ -58,4 +58,6 @@ public class ApplyLogPdu { ...@@ -58,4 +58,6 @@ public class ApplyLogPdu {
* 证照模板正本表单内容 * 证照模板正本表单内容
*/ */
private String formContent; private String formContent;
/** 站点id */
private Long siteId;
} }
...@@ -20,4 +20,6 @@ public class MidCertificatePdu { ...@@ -20,4 +20,6 @@ public class MidCertificatePdu {
private String pickerIDCardNo; private String pickerIDCardNo;
/** 二维码地址 */ /** 二维码地址 */
private String ewmdz; private String ewmdz;
/** 站点id */
private Long siteId;
} }
...@@ -81,6 +81,7 @@ public class DataInterfaceController extends BaseJsonBodyController { ...@@ -81,6 +81,7 @@ public class DataInterfaceController extends BaseJsonBodyController {
ApplyLogPdu applyLogPdu = new ApplyLogPdu(); ApplyLogPdu applyLogPdu = new ApplyLogPdu();
//applyLogPdu.setCatalogId(); //applyLogPdu.setCatalogId();
applyLogPdu.setSiteId(midCertificatePdu.getSiteId());
applyLogPdu.setCertificateCode(vo.getCertificateNumber()); applyLogPdu.setCertificateCode(vo.getCertificateNumber());
applyLogPdu.setCertificateName(vo.getCertificateName()); applyLogPdu.setCertificateName(vo.getCertificateName());
applyLogPdu.setIssueTime(DateUtils.StrToDateTime(vo.getIssueDate(),"yyyy年MM月dd日")); applyLogPdu.setIssueTime(DateUtils.StrToDateTime(vo.getIssueDate(),"yyyy年MM月dd日"));
......
...@@ -581,9 +581,9 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap ...@@ -581,9 +581,9 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
@Override @Override
public void midSaveApplyLog(ApplyLogPdu pdu, String classifyName) throws AppException { 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){ if(certificateClassifyEntity==null){
throw new AppException("证照类型名称不正确"); throw new AppException("没有找到此站点下对应的证照类型");
} }
List<CertificateCatalogEntity> catalogEntityList = this.certificateCatalogService.find(new CertificateCatalogQuery().classifyId(certificateClassifyEntity.getId())); List<CertificateCatalogEntity> catalogEntityList = this.certificateCatalogService.find(new CertificateCatalogQuery().classifyId(certificateClassifyEntity.getId()));
if(CollectionUtils.isNotEmpty(catalogEntityList)){ if(CollectionUtils.isNotEmpty(catalogEntityList)){
...@@ -594,6 +594,7 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap ...@@ -594,6 +594,7 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
entity.setCatalogName(catalogEntity.getCatalogName()); entity.setCatalogName(catalogEntity.getCatalogName());
entity.setCertificateCode(pdu.getCertificateCode()); entity.setCertificateCode(pdu.getCertificateCode());
entity.setCertificateName(pdu.getCertificateName()); entity.setCertificateName(pdu.getCertificateName());
entity.setSiteId(pdu.getSiteId());
entity.setHolderName(pdu.getHolderName()); entity.setHolderName(pdu.getHolderName());
entity.setHolderType(pdu.getHolderType()); entity.setHolderType(pdu.getHolderType());
entity.setHolderIdType(pdu.getHolderIdType()); entity.setHolderIdType(pdu.getHolderIdType());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment