Skip to content

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

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

parent 0616399f
Expand all Show 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,19 +8,15 @@ 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
*/
......@@ -38,14 +34,6 @@ public class ApplyLogEntity extends ApplyLogVo {
*/
private String catalogName;
/**
* 证照目录模板ID
*/
private Long templateId;
/**
* 证照模板名称
*/
private String templateName;
/**
* 证件编号
*/
private String certificateCode;
......@@ -125,6 +113,22 @@ public class ApplyLogEntity extends ApplyLogVo {
* 归档状态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();
......@@ -143,8 +147,6 @@ public class ApplyLogEntity extends ApplyLogVo {
public void initAttrValue(){
this.siteId = -1L;
this.recordId = -1L;
this.catalogId = -1L;
......@@ -153,10 +155,6 @@ public class ApplyLogEntity extends ApplyLogVo {
this.catalogName = "";
this.templateId = -1L;
this.templateName = "";
this.certificateCode = "";
this.certificateName = "";
......@@ -196,5 +194,13 @@ public class ApplyLogEntity extends ApplyLogVo {
this.operType = 1;
this.recordStatus = 0;
this.siteId = -1L;
this.templateId = -1L;
this.templateName = "";
this.mobile = "";
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintLogEntity.java
View file @ 37354cdd
......@@ -8,19 +8,15 @@ 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
*/
......@@ -42,14 +38,6 @@ public class PrintLogEntity extends PrintLogVo {
*/
private String certificateCode;
/**
* 证照目录模板ID
*/
private Long templateId;
/**
* 证照模板名称
*/
private String templateName;
/**
* 企业名称
*/
private String enterpriseName;
......@@ -85,6 +73,22 @@ public class PrintLogEntity extends PrintLogVo {
* 打印设备
*/
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();
......@@ -103,8 +107,6 @@ public class PrintLogEntity extends PrintLogVo {
public void initAttrValue(){
this.siteId = -1L;
this.catalogId = -1L;
this.catalogCode = "";
......@@ -115,10 +117,6 @@ public class PrintLogEntity extends PrintLogVo {
this.certificateCode = "";
this.templateId = -1L;
this.templateName = "";
this.enterpriseName = "";
this.holderName = "";
......@@ -136,5 +134,13 @@ public class PrintLogEntity extends PrintLogVo {
this.statusRemark = "";
this.deviceId = -1L;
this.siteId = -1L;
this.templateId = -1L;
this.templateName = "";
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,19 +7,15 @@ 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
*/
......@@ -41,14 +37,6 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
*/
private String catalogName;
/**
* 证照目录模板ID
*/
private Long templateId;
/**
* 证照模板名称
*/
private String templateName;
/**
* 证照名称
*/
private String certificateName;
......@@ -92,6 +80,22 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
* 允许打印次数
*/
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();
......@@ -110,8 +114,6 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
public void initAttrValue(){
this.siteId = -1L;
this.recordId = -1L;
this.applyId = -1L;
......@@ -122,10 +124,6 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
this.catalogName = "";
this.templateId = -1L;
this.templateName = "";
this.certificateName = "";
this.certificateCode = "";
......@@ -147,5 +145,13 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
this.printStatus = 0;
this.total = 1;
this.siteId = -1L;
this.templateId = -1L;
this.templateName = "";
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,19 +7,15 @@ 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
*/
......@@ -37,14 +33,6 @@ public class RetainLogEntity extends RetainLogVo {
*/
private String catalogName;
/**
* 证照目录模板ID
*/
private Long templateId;
/**
* 证照模板名称
*/
private String templateName;
/**
* 证照名称
*/
private String certificateName;
......@@ -76,6 +64,22 @@ public class RetainLogEntity extends RetainLogVo {
* 证件预览地址
*/
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();
......@@ -94,8 +98,6 @@ public class RetainLogEntity extends RetainLogVo {
public void initAttrValue(){
this.siteId = -1L;
this.recordId = -1L;
this.catalogId = -1L;
......@@ -104,10 +106,6 @@ public class RetainLogEntity extends RetainLogVo {
this.catalogName = "";
this.templateId = -1L;
this.templateName = "";
this.certificateName = "";
this.certificateCode = "";
......@@ -123,5 +121,13 @@ public class RetainLogEntity extends RetainLogVo {
this.certificateUrl = "";
this.previewUrl = "";
this.siteId = -1L;
this.templateId = -1L;
this.templateName = "";
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