Skip to content

C
certificate-print
Commit 37354cdd authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

增加证照打印缺件人手机号码字段

parent 0616399f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 9017 additions and 8597 deletions
certificate-manager/src/main/java/com/mortals/xhx/module/api/CertificateApi.java
View file @ 37354cdd
......@@ -243,6 +243,7 @@ public class CertificateApi extends BaseJsonBodyController {
printWaitQueueVO.setPrinterIp(printCatalogEntity.getPrinterIp());
printWaitQueueVO.setPrinterName(printCatalogEntity.getPrinterName());
printWaitQueueVO.setPaperSource(printCatalogEntity.getPaperSource());
printWaitQueueVO.setMobile(printWaitQueueEntity.getMobile());
waitQueueVOList.add(printWaitQueueVO);
}
model.put("data", waitQueueVOList);
......
certificate-manager/src/main/java/com/mortals/xhx/module/api/PrintWaitQueueVO.java
View file @ 37354cdd
......@@ -78,4 +78,9 @@ public class PrintWaitQueueVO {
* 打印机纸盒
*/
private String paperSource;
/**
* 手机号码
*/
private String mobile;
}
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/ApplyLogEntity.java
View file @ 37354cdd
......@@ -8,126 +8,130 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.record.model.vo.ApplyLogVo;
import lombok.Data;
/**
* 证照申请实体对象
*
* @author zxfei
* @date 2023-05-24
*/
* 证照申请实体对象
*
* @author zxfei
* @date 2023-07-05
*/
@Data
public class ApplyLogEntity extends ApplyLogVo {
private static final long serialVersionUID = 1L;
/**
* 站点id
*/
private Long siteId;
/**
* 证照档案ID
*/
* 证照档案ID
*/
private Long recordId;
/**
* 证照目录ID
*/
* 证照目录ID
*/
private Long catalogId;
/**
* 证照目录编号
*/
* 证照目录编号
*/
private String catalogCode;
/**
* 目录名称
*/
* 目录名称
*/
private String catalogName;
/**
* 证照目录模板ID
*/
private Long templateId;
/**
* 证照模板名称
*/
private String templateName;
/**
* 证件编号
*/
* 证件编号
*/
private String certificateCode;
/**
* 证件名称
*/
* 证件名称
*/
private String certificateName;
/**
* 颁发时间
*/
* 颁发时间
*/
private Date issueTime;
/**
* 取件人姓名
*/
* 取件人姓名
*/
private String pickerName;
/**
* 取件人证件号码
*/
* 取件人证件号码
*/
private String pickerIDCardNo;
/**
* 持有者类型，1：自然人，2：法人，3：自然人法人
*/
* 持有者类型，1：自然人，2：法人，3：自然人法人
*/
private Integer holderType;
/**
* 持有者证件类型，1：身份证，2：组织机构代码等
*/
* 持有者证件类型，1：身份证，2：组织机构代码等
*/
private Integer holderIdType;
/**
* 持有者名称
*/
* 持有者名称
*/
private String holderName;
/**
* 持有者证件号码
*/
* 持有者证件号码
*/
private String holderIDCardNo;
/**
* 企业名称
*/
* 企业名称
*/
private String enterpriseName;
/**
* 有效期起始
*/
* 有效期起始
*/
private Date validityStart;
/**
* 有效期截止
*/
* 有效期截止
*/
private Date validityEnd;
/**
* 专网ID
*/
* 专网ID
*/
private String privateID;
/**
* 证件附件地址
*/
* 证件附件地址
*/
private String certificateUrl;
/**
* 证件预览地址
*/
* 证件预览地址
*/
private String previewUrl;
/**
* 证照模板正本表单内容
*/
* 证照模板正本表单内容
*/
private String formContent;
/**
* 证照模板正本表单内容
*/
* 证照模板正本表单内容
*/
private String formTemplate;
/**
* 生成状态1未生成2已生成
*/
* 生成状态1未生成2已生成
*/
private Integer generateStatus;
/**
* 档案操作类型1新增2变更
*/
* 档案操作类型1新增2变更
*/
private Integer operType;
/**
* 归档状态0否1是
*/
* 归档状态0否1是
*/
private Integer recordStatus;
/**
* 站点id
*/
private Long siteId;
/**
* 证照目录模板ID
*/
private Long templateId;
/**
* 证照模板名称
*/
private String templateName;
/**
* 手机号码
*/
private String mobile;
@Override
public int hashCode() {
return this.getId().hashCode();
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
......@@ -135,7 +139,7 @@ public class ApplyLogEntity extends ApplyLogVo {
if (obj instanceof ApplyLogEntity) {
ApplyLogEntity tmp = (ApplyLogEntity) obj;
if (this.getId() == tmp.getId()) {
return true;
return true;
}
}
return false;
......@@ -143,58 +147,60 @@ public class ApplyLogEntity extends ApplyLogVo {
public void initAttrValue(){
this.siteId = -1L;
this.recordId = -1L;
this.catalogId = -1L;
this.recordId = -1L;
this.catalogCode = "";
this.catalogId = -1L;
this.catalogName = "";
this.catalogCode = "";
this.certificateCode = "";
this.catalogName = "";
this.certificateName = "";
this.templateId = -1L;
this.issueTime = null;
this.templateName = "";
this.pickerName = "";
this.certificateCode = "";
this.pickerIDCardNo = "";
this.certificateName = "";
this.holderType = 1;
this.issueTime = null;
this.holderIdType = 1;
this.pickerName = "";
this.holderName = "";
this.pickerIDCardNo = "";
this.holderIDCardNo = "";
this.holderType = 1;
this.enterpriseName = "";
this.holderIdType = 1;
this.validityStart = null;
this.holderName = "";
this.validityEnd = null;
this.holderIDCardNo = "";
this.privateID = "";
this.enterpriseName = "";
this.certificateUrl = "";
this.validityStart = null;
this.previewUrl = "";
this.validityEnd = null;
this.formContent = "";
this.privateID = "";
this.formTemplate = "";
this.certificateUrl = "";
this.generateStatus = 1;
this.previewUrl = "";
this.operType = 1;
this.formContent = "";
this.recordStatus = 0;
this.formTemplate = "";
this.siteId = -1L;
this.generateStatus = 1;
this.templateId = -1L;
this.operType = 1;
this.templateName = "";
this.recordStatus = 0;
this.mobile = "";
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/ApplyLogQuery.java
View file @ 37354cdd
This source diff could not be displayed because it is too large. You can view the blob instead.
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintLogEntity.java
View file @ 37354cdd
......@@ -8,86 +8,90 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.record.model.vo.PrintLogVo;
import lombok.Data;
/**
* 证照打印记录实体对象
*
* @author zxfei
* @date 2023-05-24
*/
* 证照打印记录实体对象
*
* @author zxfei
* @date 2023-07-05
*/
@Data
public class PrintLogEntity extends PrintLogVo {
private static final long serialVersionUID = 1L;
/**
* 站点id
*/
private Long siteId;
/**
* 证照目录ID
*/
* 证照目录ID
*/
private Long catalogId;
/**
* 证照目录编号
*/
* 证照目录编号
*/
private String catalogCode;
/**
* 目录名称
*/
* 目录名称
*/
private String catalogName;
/**
* 证照名称
*/
* 证照名称
*/
private String certificateName;
/**
* 证照编号
*/
* 证照编号
*/
private String certificateCode;
/**
* 证照目录模板ID
*/
private Long templateId;
/**
* 证照模板名称
*/
private String templateName;
/**
* 企业名称
*/
* 企业名称
*/
private String enterpriseName;
/**
* 持有者姓名
*/
* 持有者姓名
*/
private String holderName;
/**
* 持有者证件号码
*/
* 持有者证件号码
*/
private String holderIDCardNo;
/**
* 取件人姓名
*/
* 取件人姓名
*/
private String pickerName;
/**
* 取件人证件号码
*/
* 取件人证件号码
*/
private String pickerIDCardNo;
/**
* 打印状态1打印成功0失败
*/
* 打印状态1打印成功0失败
*/
private Integer printStatus;
/**
* 打印时间
*/
* 打印时间
*/
private Date printDate;
/**
* 打印结果描述
*/
* 打印结果描述
*/
private String statusRemark;
/**
* 打印设备
*/
* 打印设备
*/
private Long deviceId;
/**
* 站点id
*/
private Long siteId;
/**
* 证照目录模板ID
*/
private Long templateId;
/**
* 证照模板名称
*/
private String templateName;
/**
* 手机号码
*/
private String mobile;
@Override
public int hashCode() {
return this.getId().hashCode();
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
......@@ -95,7 +99,7 @@ public class PrintLogEntity extends PrintLogVo {
if (obj instanceof PrintLogEntity) {
PrintLogEntity tmp = (PrintLogEntity) obj;
if (this.getId() == tmp.getId()) {
return true;
return true;
}
}
return false;
......@@ -103,38 +107,40 @@ public class PrintLogEntity extends PrintLogVo {
public void initAttrValue(){
this.siteId = -1L;
this.catalogId = -1L;
this.catalogCode = "";
this.catalogId = -1L;
this.catalogName = "";
this.catalogCode = "";
this.certificateName = "";
this.catalogName = "";
this.certificateCode = "";
this.certificateName = "";
this.enterpriseName = "";
this.certificateCode = "";
this.holderName = "";
this.templateId = -1L;
this.holderIDCardNo = "";
this.templateName = "";
this.pickerName = "";
this.enterpriseName = "";
this.pickerIDCardNo = "";
this.holderName = "";
this.printStatus = 1;
this.holderIDCardNo = "";
this.printDate = null;
this.pickerName = "";
this.statusRemark = "";
this.pickerIDCardNo = "";
this.deviceId = -1L;
this.printStatus = 1;
this.siteId = -1L;
this.printDate = null;
this.templateId = -1L;
this.statusRemark = "";
this.templateName = "";
this.deviceId = -1L;
this.mobile = "";
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintWaitQueueEntity.java
View file @ 37354cdd
......@@ -7,94 +7,98 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.record.model.vo.PrintWaitQueueVo;
import lombok.Data;
/**
* 证照打印记录实体对象
*
* @author zxfei
* @date 2023-05-24
*/
* 证照打印记录实体对象
*
* @author zxfei
* @date 2023-07-05
*/
@Data
public class PrintWaitQueueEntity extends PrintWaitQueueVo {
private static final long serialVersionUID = 1L;
/**
* 站点id
*/
private Long siteId;
/**
* 证照档案ID
*/
* 证照档案ID
*/
private Long recordId;
/**
* 申请ID
*/
* 申请ID
*/
private Long applyId;
/**
* 证照目录ID
*/
* 证照目录ID
*/
private Long catalogId;
/**
* 证照目录编号
*/
* 证照目录编号
*/
private String catalogCode;
/**
* 目录名称
*/
* 目录名称
*/
private String catalogName;
/**
* 证照目录模板ID
*/
private Long templateId;
/**
* 证照模板名称
*/
private String templateName;
/**
* 证照名称
*/
* 证照名称
*/
private String certificateName;
/**
* 证照编号
*/
* 证照编号
*/
private String certificateCode;
/**
* 企业名称
*/
* 企业名称
*/
private String enterpriseName;
/**
* 持有者姓名
*/
* 持有者姓名
*/
private String holderName;
/**
* 持有者证件号码
*/
* 持有者证件号码
*/
private String holderIDCardNo;
/**
* 取件人姓名
*/
* 取件人姓名
*/
private String pickerName;
/**
* 取件人证件号码
*/
* 取件人证件号码
*/
private String pickerIDCardNo;
/**
* 证件预览地址
*/
* 证件预览地址
*/
private String previewUrl;
/**
* 证件附件地址
*/
* 证件附件地址
*/
private String certificateUrl;
/**
* 是否完成打印0否1是
*/
* 是否完成打印0否1是
*/
private Integer printStatus;
/**
* 允许打印次数
*/
* 允许打印次数
*/
private Integer total;
/**
* 站点id
*/
private Long siteId;
/**
* 证照目录模板ID
*/
private Long templateId;
/**
* 证照模板名称
*/
private String templateName;
/**
* 手机号码
*/
private String mobile;
@Override
public int hashCode() {
return this.getId().hashCode();
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
......@@ -102,7 +106,7 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
if (obj instanceof PrintWaitQueueEntity) {
PrintWaitQueueEntity tmp = (PrintWaitQueueEntity) obj;
if (this.getId() == tmp.getId()) {
return true;
return true;
}
}
return false;
......@@ -110,42 +114,44 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
public void initAttrValue(){
this.siteId = -1L;
this.recordId = -1L;
this.applyId = -1L;
this.recordId = -1L;
this.catalogId = -1L;
this.applyId = -1L;
this.catalogCode = "";
this.catalogId = -1L;
this.catalogName = "";
this.catalogCode = "";
this.certificateName = "";
this.catalogName = "";
this.certificateCode = "";
this.templateId = -1L;
this.enterpriseName = "";
this.templateName = "";
this.holderName = "";
this.certificateName = "";
this.holderIDCardNo = "";
this.certificateCode = "";
this.pickerName = "";
this.enterpriseName = "";
this.pickerIDCardNo = "";
this.holderName = "";
this.previewUrl = "";
this.holderIDCardNo = "";
this.certificateUrl = "";
this.pickerName = "";
this.printStatus = 0;
this.pickerIDCardNo = "";
this.total = 1;
this.previewUrl = "";
this.siteId = -1L;
this.certificateUrl = "";
this.templateId = -1L;
this.printStatus = 0;
this.templateName = "";
this.total = 1;
this.mobile = "";
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/RetainLogEntity.java
View file @ 37354cdd
......@@ -7,78 +7,82 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.record.model.vo.RetainLogVo;
import lombok.Data;
/**
* 证照持有实体对象
*
* @author zxfei
* @date 2023-05-24
*/
* 证照持有实体对象
*
* @author zxfei
* @date 2023-07-05
*/
@Data
public class RetainLogEntity extends RetainLogVo {
private static final long serialVersionUID = 1L;
/**
* 站点id
*/
private Long siteId;
/**
* 证照档案ID
*/
* 证照档案ID
*/
private Long recordId;
/**
* 证照目录ID
*/
* 证照目录ID
*/
private Long catalogId;
/**
* 证照目录编号
*/
* 证照目录编号
*/
private String catalogCode;
/**
* 目录名称
*/
* 目录名称
*/
private String catalogName;
/**
* 证照目录模板ID
*/
private Long templateId;
/**
* 证照模板名称
*/
private String templateName;
/**
* 证照名称
*/
* 证照名称
*/
private String certificateName;
/**
* 证照编号
*/
* 证照编号
*/
private String certificateCode;
/**
* 企业名称
*/
* 企业名称
*/
private String enterpriseName;
/**
* 持有者姓名
*/
* 持有者姓名
*/
private String holderName;
/**
* 持有者证件号码
*/
* 持有者证件号码
*/
private String holderIDCardNo;
/**
* 证照状态，1正常2注销
*/
* 证照状态，1正常2注销
*/
private Integer certificateStatus;
/**
* 证件附件地址
*/
* 证件附件地址
*/
private String certificateUrl;
/**
* 证件预览地址
*/
* 证件预览地址
*/
private String previewUrl;
/**
* 站点id
*/
private Long siteId;
/**
* 证照目录模板ID
*/
private Long templateId;
/**
* 证照模板名称
*/
private String templateName;
/**
* 手机号码
*/
private String mobile;
@Override
public int hashCode() {
return this.getId().hashCode();
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
......@@ -86,7 +90,7 @@ public class RetainLogEntity extends RetainLogVo {
if (obj instanceof RetainLogEntity) {
RetainLogEntity tmp = (RetainLogEntity) obj;
if (this.getId() == tmp.getId()) {
return true;
return true;
}
}
return false;
......@@ -94,34 +98,36 @@ public class RetainLogEntity extends RetainLogVo {
public void initAttrValue(){
this.siteId = -1L;
this.recordId = -1L;
this.catalogId = -1L;
this.recordId = -1L;
this.catalogCode = "";
this.catalogId = -1L;
this.catalogName = "";
this.catalogCode = "";
this.certificateName = "";
this.catalogName = "";
this.certificateCode = "";
this.templateId = -1L;
this.enterpriseName = "";
this.templateName = "";
this.holderName = "";
this.certificateName = "";
this.holderIDCardNo = "";
this.certificateCode = "";
this.certificateStatus = 1;
this.enterpriseName = "";
this.certificateUrl = "";
this.holderName = "";
this.previewUrl = "";
this.holderIDCardNo = "";
this.siteId = -1L;
this.certificateStatus = 1;
this.templateId = -1L;
this.certificateUrl = "";
this.templateName = "";
this.previewUrl = "";
this.mobile = "";
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/PrintLogServiceImpl.java
View file @ 37354cdd
......@@ -37,17 +37,20 @@ public class PrintLogServiceImpl extends AbstractCRUDServiceImpl<PrintLogDao, Pr
PrintLogQuery condition3 = new PrintLogQuery();
PrintLogQuery condition4 = new PrintLogQuery();
PrintLogQuery condition5 = new PrintLogQuery();
PrintLogQuery condition6 = new PrintLogQuery();
condition1.setEnterpriseName(condition.toString());
condition2.setPickerName(condition.toString());
condition3.setPickerIDCardNo(condition.toString());
condition4.setHolderIDCardNo(condition.toString());
condition5.setHolderName(condition.toString());
condition6.setMobile(condition.toString());
List<PrintLogQuery> orConditionList = new ArrayList<>();
orConditionList.add(condition1);
orConditionList.add(condition2);
orConditionList.add(condition3);
orConditionList.add(condition4);
orConditionList.add(condition5);
orConditionList.add(condition6);
query.setOrConditionList(orConditionList);
}
return query;
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/PrintWaitQueueServiceImpl.java
View file @ 37354cdd
......@@ -139,6 +139,7 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
waitQueueEntity.setPreviewUrl(applyLogEntity.getPreviewUrl());
waitQueueEntity.setCertificateUrl(applyLogEntity.getCertificateUrl());
waitQueueEntity.setPrintStatus(YesNoEnum.NO.getValue());
waitQueueEntity.setMobile(applyLogEntity.getMobile());
waitQueueEntity.setTotal(paramService.getParamIntValue(ParamKey.ALLOW_PRINT_MAX_COUNT));
waitQueueEntity.setCreateUserId(applyLogEntity.getCreateUserId());
waitQueueEntity.setCreateTime(new Date());
......@@ -192,6 +193,7 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
printLogEntity.setCreateTime(now);
printLogEntity.setPrintStatus(PrintStatus.FAIL.getValue());
printLogEntity.setStatusRemark(statusRemark);
printLogEntity.setMobile(waitQueueEntity.getMobile());
printLogDao.insert(printLogEntity);
}
......@@ -210,6 +212,7 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
retainLogEntity.setHolderName(waitQueueEntity.getHolderName());
retainLogEntity.setHolderIDCardNo(waitQueueEntity.getHolderIDCardNo());
retainLogEntity.setCertificateStatus(CertificateStatus.NORMAL.getValue());
retainLogEntity.setMobile(waitQueueEntity.getMobile());
retainLogEntity.setCreateUserId(waitQueueEntity.getCreateUserId());
retainLogEntity.setCreateTime(now);
......@@ -227,7 +230,7 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
printLogEntity.setHolderIDCardNo(waitQueueEntity.getHolderIDCardNo());
printLogEntity.setPickerName(waitQueueEntity.getPickerName());
printLogEntity.setPickerIDCardNo(waitQueueEntity.getPickerIDCardNo());
printLogEntity.setMobile(waitQueueEntity.getMobile());
printLogEntity.setPrintDate(now);
printLogEntity.setCreateUserId(waitQueueEntity.getCreateUserId());
printLogEntity.setCreateTime(now);
......
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