Skip to content

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

表结构调整

parent 0d1bca5c
Show whitespace changes
Inline Side-by-side
Showing with 7243 additions and 4131 deletions
certificate-manager/pom.xml
View file @ 8cac55a4
...@@ -27,15 +27,15 @@ ...@@ -27,15 +27,15 @@
<profiles.active>develop</profiles.active> <profiles.active>develop</profiles.active>
<profiles.server.port>17216</profiles.server.port> <profiles.server.port>17216</profiles.server.port>
<profiles.datasource.uri> <profiles.datasource.uri>
<![CDATA[jdbc:mysql://192.168.0.98:3306/certificate?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri> <![CDATA[jdbc:mysql://localhost:3306/certificate?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri>
<profiles.datasource.username>root</profiles.datasource.username> <profiles.datasource.username>root</profiles.datasource.username>
<profiles.datasource.password>nacos@2020</profiles.datasource.password> <profiles.datasource.password>12345678</profiles.datasource.password>
<profiles.redis.uri>192.168.0.252</profiles.redis.uri> <profiles.redis.uri>127.0.0.1</profiles.redis.uri>
<profiles.redis.port>6379</profiles.redis.port> <profiles.redis.port>6379</profiles.redis.port>
<profiles.redis.username></profiles.redis.username> <profiles.redis.username></profiles.redis.username>
<profiles.redis.password>hotel@2020</profiles.redis.password> <profiles.redis.password></profiles.redis.password>
<profiles.redis.database>6</profiles.redis.database> <profiles.redis.database>6</profiles.redis.database>
<profiles.filepath>/mortals/app/data/cpm</profiles.filepath> <profiles.filepath>d:/mortals/app/data/cpm</profiles.filepath>
<profiles.queue.type>rabbitmq</profiles.queue.type> <profiles.queue.type>rabbitmq</profiles.queue.type>
<profiles.kafka.brokers>192.168.0.251:9092</profiles.kafka.brokers> <profiles.kafka.brokers>192.168.0.251:9092</profiles.kafka.brokers>
<profiles.rabbitmq.host>192.168.0.98</profiles.rabbitmq.host> <profiles.rabbitmq.host>192.168.0.98</profiles.rabbitmq.host>
......
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateCatalogEntity.java
View file @ 8cac55a4
...@@ -10,7 +10,7 @@ import com.mortals.xhx.module.certificate.model.vo.CertificateCatalogVo; ...@@ -10,7 +10,7 @@ import com.mortals.xhx.module.certificate.model.vo.CertificateCatalogVo;
* 证照目录实体对象 * 证照目录实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-10-14 * @date 2022-10-22
*/ */
public class CertificateCatalogEntity extends CertificateCatalogVo { public class CertificateCatalogEntity extends CertificateCatalogVo {
...@@ -19,12 +19,10 @@ public class CertificateCatalogEntity extends CertificateCatalogVo { ...@@ -19,12 +19,10 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
/** /**
* 目录名称 * 目录名称
*/ */
@Excel(name = "目录名称")
private String catalogName; private String catalogName;
/** /**
* 目录编号 * 目录编号
*/ */
@Excel(name = "目录编号")
private String catalogCode; private String catalogCode;
/** /**
* 持有者类型，1：自然人；2：法人；3：自然人，法人 * 持有者类型，1：自然人；2：法人；3：自然人，法人
...@@ -41,12 +39,10 @@ public class CertificateCatalogEntity extends CertificateCatalogVo { ...@@ -41,12 +39,10 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
/** /**
* 横向尺寸(单位mm) * 横向尺寸(单位mm)
*/ */
@Excel(name = "横向尺寸", readConverterExp = "横向尺寸(单位mm)")
private Integer transverse; private Integer transverse;
/** /**
* 纵向尺寸(单位mm) * 纵向尺寸(单位mm)
*/ */
@Excel(name = "纵向尺寸", readConverterExp = "纵向尺寸(单位mm)")
private Integer portrait; private Integer portrait;
/** /**
* 是否需要年检，0：否1：是 * 是否需要年检，0：否1：是
......
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateCatalogQuery.java
View file @ 8cac55a4
...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity; ...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
* 证照目录查询对象 * 证照目录查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-10-14 * @date 2022-10-22
*/ */
public class CertificateCatalogQuery extends CertificateCatalogEntity { public class CertificateCatalogQuery extends CertificateCatalogEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
......
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateClassifyEntity.java
View file @ 8cac55a4
...@@ -10,7 +10,7 @@ import com.mortals.xhx.module.certificate.model.vo.CertificateClassifyVo; ...@@ -10,7 +10,7 @@ import com.mortals.xhx.module.certificate.model.vo.CertificateClassifyVo;
* 证照分类实体对象 * 证照分类实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-10-14 * @date 2022-10-22
*/ */
public class CertificateClassifyEntity extends CertificateClassifyVo { public class CertificateClassifyEntity extends CertificateClassifyVo {
...@@ -19,7 +19,6 @@ public class CertificateClassifyEntity extends CertificateClassifyVo { ...@@ -19,7 +19,6 @@ public class CertificateClassifyEntity extends CertificateClassifyVo {
/** /**
* 分类名称 * 分类名称
*/ */
@Excel(name = "分类名称")
private String classifyName; private String classifyName;
/** /**
* 排序号 * 排序号
......
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateClassifyQuery.java
View file @ 8cac55a4
...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.certificate.model.CertificateClassifyEntity; ...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.certificate.model.CertificateClassifyEntity;
* 证照分类查询对象 * 证照分类查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-10-14 * @date 2022-10-22
*/ */
public class CertificateClassifyQuery extends CertificateClassifyEntity { public class CertificateClassifyQuery extends CertificateClassifyEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
......
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateIndustryEntity.java
View file @ 8cac55a4
...@@ -10,7 +10,7 @@ import com.mortals.xhx.module.certificate.model.vo.CertificateIndustryVo; ...@@ -10,7 +10,7 @@ import com.mortals.xhx.module.certificate.model.vo.CertificateIndustryVo;
* 行业目录实体对象 * 行业目录实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-10-14 * @date 2022-10-22
*/ */
public class CertificateIndustryEntity extends CertificateIndustryVo { public class CertificateIndustryEntity extends CertificateIndustryVo {
...@@ -23,7 +23,6 @@ public class CertificateIndustryEntity extends CertificateIndustryVo { ...@@ -23,7 +23,6 @@ public class CertificateIndustryEntity extends CertificateIndustryVo {
/** /**
* 行业名称 * 行业名称
*/ */
@Excel(name = "行业名称")
private String industryName; private String industryName;
......
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateIndustryQuery.java
View file @ 8cac55a4
...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.certificate.model.CertificateIndustryEntity; ...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.certificate.model.CertificateIndustryEntity;
* 行业目录查询对象 * 行业目录查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-10-14 * @date 2022-10-22
*/ */
public class CertificateIndustryQuery extends CertificateIndustryEntity { public class CertificateIndustryQuery extends CertificateIndustryEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
......
certificate-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceEntity.java
View file @ 8cac55a4
...@@ -10,7 +10,7 @@ import com.mortals.xhx.module.device.model.vo.DeviceVo; ...@@ -10,7 +10,7 @@ import com.mortals.xhx.module.device.model.vo.DeviceVo;
* 证照柜设备实体对象 * 证照柜设备实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-10-14 * @date 2022-10-22
*/ */
public class DeviceEntity extends DeviceVo { public class DeviceEntity extends DeviceVo {
...@@ -19,12 +19,10 @@ public class DeviceEntity extends DeviceVo { ...@@ -19,12 +19,10 @@ public class DeviceEntity extends DeviceVo {
/** /**
* 设备名称 * 设备名称
*/ */
@Excel(name = "设备名称")
private String deviceName; private String deviceName;
/** /**
* 设备编码 * 设备编码
*/ */
@Excel(name = "设备编码")
private String deviceCode; private String deviceCode;
/** /**
* 设备类型1证照柜 * 设备类型1证照柜
...@@ -37,7 +35,6 @@ public class DeviceEntity extends DeviceVo { ...@@ -37,7 +35,6 @@ public class DeviceEntity extends DeviceVo {
/** /**
* 设备厂商 * 设备厂商
*/ */
@Excel(name = "设备厂商")
private String deviceFirmname; private String deviceFirmname;
/** /**
* 设备IP地址 * 设备IP地址
......
certificate-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceQuery.java
View file @ 8cac55a4
...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.device.model.DeviceEntity; ...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.device.model.DeviceEntity;
* 证照柜设备查询对象 * 证照柜设备查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-10-14 * @date 2022-10-22
*/ */
public class DeviceQuery extends DeviceEntity { public class DeviceQuery extends DeviceEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/dao/PrintWaitQueueDao.java 0 → 100644
View file @ 8cac55a4
package com.mortals.xhx.module.record.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.record.model.PrintWaitQueueEntity;
import java.util.List;
/**
* 证照打印记录Dao
* 证照打印记录 DAO接口
*
* @author zxfei
* @date 2022-10-22
*/
public interface PrintWaitQueueDao extends ICRUDDao<PrintWaitQueueEntity,Long>{
}
certificate-manager/src/main/java/com/mortals/xhx/module/record/dao/ibatis/PrintWaitQueueDaoImpl.java 0 → 100644
View file @ 8cac55a4
package com.mortals.xhx.module.record.dao.ibatis;
import org.springframework.stereotype.Repository;
import com.mortals.xhx.module.record.dao.PrintWaitQueueDao;
import com.mortals.xhx.module.record.model.PrintWaitQueueEntity;
import java.util.Date;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import java.util.List;
/**
* 证照打印记录DaoImpl DAO接口
*
* @author zxfei
* @date 2022-10-22
*/
@Repository("printWaitQueueDao")
public class PrintWaitQueueDaoImpl extends BaseCRUDDaoMybatis<PrintWaitQueueEntity,Long> implements PrintWaitQueueDao {
}
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/ApplyLogEntity.java
View file @ 8cac55a4
...@@ -8,15 +8,19 @@ import com.mortals.framework.annotation.Excel; ...@@ -8,15 +8,19 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.record.model.vo.ApplyLogVo; import com.mortals.xhx.module.record.model.vo.ApplyLogVo;
/** /**
* 证照申请实体对象 * 证照申请实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-10-18 * @date 2022-10-22
*/ */
public class ApplyLogEntity extends ApplyLogVo { public class ApplyLogEntity extends ApplyLogVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
* 证照目录ID
*/
private Long catalogId;
/** /**
* 证件编号 * 证件编号
*/ */
...@@ -48,7 +52,6 @@ public class ApplyLogEntity extends ApplyLogVo { ...@@ -48,7 +52,6 @@ public class ApplyLogEntity extends ApplyLogVo {
/** /**
* 持有者名称 * 持有者名称
*/ */
@Excel(name = "持有者名称")
private String holderName; private String holderName;
/** /**
* 持有者证件号码 * 持有者证件号码
...@@ -57,8 +60,7 @@ public class ApplyLogEntity extends ApplyLogVo { ...@@ -57,8 +60,7 @@ public class ApplyLogEntity extends ApplyLogVo {
/** /**
* 企业名称 * 企业名称
*/ */
@Excel(name = "企业名称") private String enterpriseName;
private String enterpriseNam;
/** /**
* 有效期起始 * 有效期起始
*/ */
...@@ -76,6 +78,10 @@ public class ApplyLogEntity extends ApplyLogVo { ...@@ -76,6 +78,10 @@ public class ApplyLogEntity extends ApplyLogVo {
*/ */
private String originalUrl; private String originalUrl;
/** /**
* 正本预览地址
*/
private String oriPreview;
/**
* 证照模板正本表单内容 * 证照模板正本表单内容
*/ */
private String oriFormContent; private String oriFormContent;
...@@ -84,18 +90,36 @@ public class ApplyLogEntity extends ApplyLogVo { ...@@ -84,18 +90,36 @@ public class ApplyLogEntity extends ApplyLogVo {
*/ */
private String duplicateUrl; private String duplicateUrl;
/** /**
* 副本预览地址
*/
private String dupPreview;
/**
* 证照模板副本表单内容 * 证照模板副本表单内容
*/ */
private String dupFormContent; private String dupFormContent;
/** /**
* 证照目录ID * 生成状态1未生成2正本3副本4正副本
*/ */
private Long catalogId; private Integer generateStatus;
public ApplyLogEntity(){} public ApplyLogEntity(){}
/** /**
* 获取 证照目录ID
* @return Long
*/
public Long getCatalogId(){
return catalogId;
}
/**
* 设置 证照目录ID
* @param catalogId
*/
public void setCatalogId(Long catalogId){
this.catalogId = catalogId;
}
/**
* 获取 证件编号 * 获取 证件编号
* @return String * @return String
*/ */
...@@ -225,15 +249,15 @@ public class ApplyLogEntity extends ApplyLogVo { ...@@ -225,15 +249,15 @@ public class ApplyLogEntity extends ApplyLogVo {
* 获取 企业名称 * 获取 企业名称
* @return String * @return String
*/ */
public String getEnterpriseNam(){ public String getEnterpriseName(){
return enterpriseNam; return enterpriseName;
} }
/** /**
* 设置 企业名称 * 设置 企业名称
* @param enterpriseNam * @param enterpriseName
*/ */
public void setEnterpriseNam(String enterpriseNam){ public void setEnterpriseName(String enterpriseName){
this.enterpriseNam = enterpriseNam; this.enterpriseName = enterpriseName;
} }
/** /**
* 获取 有效期起始 * 获取 有效期起始
...@@ -292,6 +316,20 @@ public class ApplyLogEntity extends ApplyLogVo { ...@@ -292,6 +316,20 @@ public class ApplyLogEntity extends ApplyLogVo {
this.originalUrl = originalUrl; this.originalUrl = originalUrl;
} }
/** /**
* 获取 正本预览地址
* @return String
*/
public String getOriPreview(){
return oriPreview;
}
/**
* 设置 正本预览地址
* @param oriPreview
*/
public void setOriPreview(String oriPreview){
this.oriPreview = oriPreview;
}
/**
* 获取 证照模板正本表单内容 * 获取 证照模板正本表单内容
* @return String * @return String
*/ */
...@@ -320,6 +358,20 @@ public class ApplyLogEntity extends ApplyLogVo { ...@@ -320,6 +358,20 @@ public class ApplyLogEntity extends ApplyLogVo {
this.duplicateUrl = duplicateUrl; this.duplicateUrl = duplicateUrl;
} }
/** /**
* 获取 副本预览地址
* @return String
*/
public String getDupPreview(){
return dupPreview;
}
/**
* 设置 副本预览地址
* @param dupPreview
*/
public void setDupPreview(String dupPreview){
this.dupPreview = dupPreview;
}
/**
* 获取 证照模板副本表单内容 * 获取 证照模板副本表单内容
* @return String * @return String
*/ */
...@@ -334,18 +386,18 @@ public class ApplyLogEntity extends ApplyLogVo { ...@@ -334,18 +386,18 @@ public class ApplyLogEntity extends ApplyLogVo {
this.dupFormContent = dupFormContent; this.dupFormContent = dupFormContent;
} }
/** /**
* 获取 证照目录ID * 获取 生成状态1未生成2正本3副本4正副本
* @return Long * @return Integer
*/ */
public Long getCatalogId(){ public Integer getGenerateStatus(){
return catalogId; return generateStatus;
} }
/** /**
* 设置 证照目录ID * 设置 生成状态1未生成2正本3副本4正副本
* @param catalogId * @param generateStatus
*/ */
public void setCatalogId(Long catalogId){ public void setGenerateStatus(Integer generateStatus){
this.catalogId = catalogId; this.generateStatus = generateStatus;
} }
...@@ -369,6 +421,7 @@ public class ApplyLogEntity extends ApplyLogVo { ...@@ -369,6 +421,7 @@ public class ApplyLogEntity extends ApplyLogVo {
public String toString(){ public String toString(){
StringBuilder sb = new StringBuilder(""); StringBuilder sb = new StringBuilder("");
sb.append(",catalogId:").append(getCatalogId());
sb.append(",certificateCode:").append(getCertificateCode()); sb.append(",certificateCode:").append(getCertificateCode());
sb.append(",certificateName:").append(getCertificateName()); sb.append(",certificateName:").append(getCertificateName());
sb.append(",issueTime:").append(getIssueTime()); sb.append(",issueTime:").append(getIssueTime());
...@@ -378,20 +431,24 @@ public class ApplyLogEntity extends ApplyLogVo { ...@@ -378,20 +431,24 @@ public class ApplyLogEntity extends ApplyLogVo {
sb.append(",holderIdType:").append(getHolderIdType()); sb.append(",holderIdType:").append(getHolderIdType());
sb.append(",holderName:").append(getHolderName()); sb.append(",holderName:").append(getHolderName());
sb.append(",holderIDCardNo:").append(getHolderIDCardNo()); sb.append(",holderIDCardNo:").append(getHolderIDCardNo());
sb.append(",enterpriseNam:").append(getEnterpriseNam()); sb.append(",enterpriseName:").append(getEnterpriseName());
sb.append(",validityStart:").append(getValidityStart()); sb.append(",validityStart:").append(getValidityStart());
sb.append(",validityEnd:").append(getValidityEnd()); sb.append(",validityEnd:").append(getValidityEnd());
sb.append(",privateID:").append(getPrivateID()); sb.append(",privateID:").append(getPrivateID());
sb.append(",originalUrl:").append(getOriginalUrl()); sb.append(",originalUrl:").append(getOriginalUrl());
sb.append(",oriPreview:").append(getOriPreview());
sb.append(",oriFormContent:").append(getOriFormContent()); sb.append(",oriFormContent:").append(getOriFormContent());
sb.append(",duplicateUrl:").append(getDuplicateUrl()); sb.append(",duplicateUrl:").append(getDuplicateUrl());
sb.append(",dupPreview:").append(getDupPreview());
sb.append(",dupFormContent:").append(getDupFormContent()); sb.append(",dupFormContent:").append(getDupFormContent());
sb.append(",catalogId:").append(getCatalogId()); sb.append(",generateStatus:").append(getGenerateStatus());
return sb.toString(); return sb.toString();
} }
public void initAttrValue(){ public void initAttrValue(){
this.catalogId = null;
this.certificateCode = ""; this.certificateCode = "";
this.certificateName = ""; this.certificateName = "";
...@@ -410,7 +467,7 @@ public class ApplyLogEntity extends ApplyLogVo { ...@@ -410,7 +467,7 @@ public class ApplyLogEntity extends ApplyLogVo {
this.holderIDCardNo = ""; this.holderIDCardNo = "";
this.enterpriseNam = ""; this.enterpriseName = "";
this.validityStart = null; this.validityStart = null;
...@@ -420,12 +477,16 @@ public class ApplyLogEntity extends ApplyLogVo { ...@@ -420,12 +477,16 @@ public class ApplyLogEntity extends ApplyLogVo {
this.originalUrl = ""; this.originalUrl = "";
this.oriPreview = "";
this.oriFormContent = ""; this.oriFormContent = "";
this.duplicateUrl = ""; this.duplicateUrl = "";
this.dupPreview = "";
this.dupFormContent = ""; this.dupFormContent = "";
this.catalogId = null; this.generateStatus = 1;
} }
} }
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/ApplyLogQuery.java
View file @ 8cac55a4
...@@ -4,11 +4,11 @@ import java.util.Date; ...@@ -4,11 +4,11 @@ import java.util.Date;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.record.model.ApplyLogEntity; import com.mortals.xhx.module.record.model.ApplyLogEntity;
/** /**
* 证照申请查询对象 * 证照申请查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-10-18 * @date 2022-10-22
*/ */
public class ApplyLogQuery extends ApplyLogEntity { public class ApplyLogQuery extends ApplyLogEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -22,6 +22,18 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -22,6 +22,18 @@ public class ApplyLogQuery extends ApplyLogEntity {
/** 序号，主键，自增长列表 */ /** 序号，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 开始 证照目录ID */
private Long catalogIdStart;
/** 结束 证照目录ID */
private Long catalogIdEnd;
/** 增加 证照目录ID */
private Long catalogIdIncrement;
/** 证照目录ID列表 */
private List <Long> catalogIdList;
/** 证件编号 */ /** 证件编号 */
private List<String> certificateCodeList; private List<String> certificateCodeList;
...@@ -71,7 +83,7 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -71,7 +83,7 @@ public class ApplyLogQuery extends ApplyLogEntity {
private List<String> holderIDCardNoList; private List<String> holderIDCardNoList;
/** 企业名称 */ /** 企业名称 */
private List<String> enterpriseNamList; private List<String> enterpriseNameList;
/** 开始 有效期起始 */ /** 开始 有效期起始 */
private String validityStartStart; private String validityStartStart;
...@@ -91,15 +103,33 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -91,15 +103,33 @@ public class ApplyLogQuery extends ApplyLogEntity {
/** 正本附件地址 */ /** 正本附件地址 */
private List<String> originalUrlList; private List<String> originalUrlList;
/** 正本预览地址 */
private List<String> oriPreviewList;
/** 证照模板正本表单内容 */ /** 证照模板正本表单内容 */
private List<String> oriFormContentList; private List<String> oriFormContentList;
/** 副本附件地址 */ /** 副本附件地址 */
private List<String> duplicateUrlList; private List<String> duplicateUrlList;
/** 副本预览地址 */
private List<String> dupPreviewList;
/** 证照模板副本表单内容 */ /** 证照模板副本表单内容 */
private List<String> dupFormContentList; private List<String> dupFormContentList;
/** 开始 生成状态1未生成2正本3副本4正副本 */
private Integer generateStatusStart;
/** 结束 生成状态1未生成2正本3副本4正副本 */
private Integer generateStatusEnd;
/** 增加 生成状态1未生成2正本3副本4正副本 */
private Integer generateStatusIncrement;
/** 生成状态1未生成2正本3副本4正副本列表 */
private List <Integer> generateStatusList;
/** 开始 创建用户 */ /** 开始 创建用户 */
private Long createUserIdStart; private Long createUserIdStart;
...@@ -136,18 +166,6 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -136,18 +166,6 @@ public class ApplyLogQuery extends ApplyLogEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 开始 证照目录ID */
private Long catalogIdStart;
/** 结束 证照目录ID */
private Long catalogIdEnd;
/** 增加 证照目录ID */
private Long catalogIdIncrement;
/** 证照目录ID列表 */
private List <Long> catalogIdList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<ApplyLogQuery> orConditionList; private List<ApplyLogQuery> orConditionList;
...@@ -220,6 +238,70 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -220,6 +238,70 @@ public class ApplyLogQuery extends ApplyLogEntity {
this.idList = idList; this.idList = idList;
} }
/**
* 获取 开始 证照目录ID
* @return catalogIdStart
*/
public Long getCatalogIdStart(){
return this.catalogIdStart;
}
/**
* 设置 开始 证照目录ID
* @param catalogIdStart
*/
public void setCatalogIdStart(Long catalogIdStart){
this.catalogIdStart = catalogIdStart;
}
/**
* 获取 结束 证照目录ID
* @return $catalogIdEnd
*/
public Long getCatalogIdEnd(){
return this.catalogIdEnd;
}
/**
* 设置 结束 证照目录ID
* @param catalogIdEnd
*/
public void setCatalogIdEnd(Long catalogIdEnd){
this.catalogIdEnd = catalogIdEnd;
}
/**
* 获取 增加 证照目录ID
* @return catalogIdIncrement
*/
public Long getCatalogIdIncrement(){
return this.catalogIdIncrement;
}
/**
* 设置 增加 证照目录ID
* @param catalogIdIncrement
*/
public void setCatalogIdIncrement(Long catalogIdIncrement){
this.catalogIdIncrement = catalogIdIncrement;
}
/**
* 获取 证照目录ID
* @return catalogIdList
*/
public List<Long> getCatalogIdList(){
return this.catalogIdList;
}
/**
* 设置 证照目录ID
* @param catalogIdList
*/
public void setCatalogIdList(List<Long> catalogIdList){
this.catalogIdList = catalogIdList;
}
/** /**
* 获取 证件编号 * 获取 证件编号
* @return certificateCodeList * @return certificateCodeList
...@@ -472,18 +554,18 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -472,18 +554,18 @@ public class ApplyLogQuery extends ApplyLogEntity {
} }
/** /**
* 获取 企业名称 * 获取 企业名称
* @return enterpriseNamList * @return enterpriseNameList
*/ */
public List<String> getEnterpriseNamList(){ public List<String> getEnterpriseNameList(){
return this.enterpriseNamList; return this.enterpriseNameList;
} }
/** /**
* 设置 企业名称 * 设置 企业名称
* @param enterpriseNamList * @param enterpriseNameList
*/ */
public void setEnterpriseNamList(List<String> enterpriseNamList){ public void setEnterpriseNameList(List<String> enterpriseNameList){
this.enterpriseNamList = enterpriseNamList; this.enterpriseNameList = enterpriseNameList;
} }
/** /**
* 获取 开始 有效期起始 * 获取 开始 有效期起始
...@@ -580,6 +662,21 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -580,6 +662,21 @@ public class ApplyLogQuery extends ApplyLogEntity {
this.originalUrlList = originalUrlList; this.originalUrlList = originalUrlList;
} }
/** /**
* 获取 正本预览地址
* @return oriPreviewList
*/
public List<String> getOriPreviewList(){
return this.oriPreviewList;
}
/**
* 设置 正本预览地址
* @param oriPreviewList
*/
public void setOriPreviewList(List<String> oriPreviewList){
this.oriPreviewList = oriPreviewList;
}
/**
* 获取 证照模板正本表单内容 * 获取 证照模板正本表单内容
* @return oriFormContentList * @return oriFormContentList
*/ */
...@@ -610,6 +707,21 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -610,6 +707,21 @@ public class ApplyLogQuery extends ApplyLogEntity {
this.duplicateUrlList = duplicateUrlList; this.duplicateUrlList = duplicateUrlList;
} }
/** /**
* 获取 副本预览地址
* @return dupPreviewList
*/
public List<String> getDupPreviewList(){
return this.dupPreviewList;
}
/**
* 设置 副本预览地址
* @param dupPreviewList
*/
public void setDupPreviewList(List<String> dupPreviewList){
this.dupPreviewList = dupPreviewList;
}
/**
* 获取 证照模板副本表单内容 * 获取 证照模板副本表单内容
* @return dupFormContentList * @return dupFormContentList
*/ */
...@@ -624,6 +736,70 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -624,6 +736,70 @@ public class ApplyLogQuery extends ApplyLogEntity {
public void setDupFormContentList(List<String> dupFormContentList){ public void setDupFormContentList(List<String> dupFormContentList){
this.dupFormContentList = dupFormContentList; this.dupFormContentList = dupFormContentList;
} }
/**
* 获取 开始 生成状态1未生成2正本3副本4正副本
* @return generateStatusStart
*/
public Integer getGenerateStatusStart(){
return this.generateStatusStart;
}
/**
* 设置 开始 生成状态1未生成2正本3副本4正副本
* @param generateStatusStart
*/
public void setGenerateStatusStart(Integer generateStatusStart){
this.generateStatusStart = generateStatusStart;
}
/**
* 获取 结束 生成状态1未生成2正本3副本4正副本
* @return $generateStatusEnd
*/
public Integer getGenerateStatusEnd(){
return this.generateStatusEnd;
}
/**
* 设置 结束 生成状态1未生成2正本3副本4正副本
* @param generateStatusEnd
*/
public void setGenerateStatusEnd(Integer generateStatusEnd){
this.generateStatusEnd = generateStatusEnd;
}
/**
* 获取 增加 生成状态1未生成2正本3副本4正副本
* @return generateStatusIncrement
*/
public Integer getGenerateStatusIncrement(){
return this.generateStatusIncrement;
}
/**
* 设置 增加 生成状态1未生成2正本3副本4正副本
* @param generateStatusIncrement
*/
public void setGenerateStatusIncrement(Integer generateStatusIncrement){
this.generateStatusIncrement = generateStatusIncrement;
}
/**
* 获取 生成状态1未生成2正本3副本4正副本
* @return generateStatusList
*/
public List<Integer> getGenerateStatusList(){
return this.generateStatusList;
}
/**
* 设置 生成状态1未生成2正本3副本4正副本
* @param generateStatusList
*/
public void setGenerateStatusList(List<Integer> generateStatusList){
this.generateStatusList = generateStatusList;
}
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @return createUserIdStart * @return createUserIdStart
...@@ -817,111 +993,92 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -817,111 +993,92 @@ public class ApplyLogQuery extends ApplyLogEntity {
} }
/** /**
* 获取 开始 证照目录ID * 设置 序号，主键，自增长
* @return catalogIdStart * @param id
*/
public Long getCatalogIdStart(){
return this.catalogIdStart;
}
/**
* 设置 开始 证照目录ID
* @param catalogIdStart
*/
public void setCatalogIdStart(Long catalogIdStart){
this.catalogIdStart = catalogIdStart;
}
/**
* 获取 结束 证照目录ID
* @return $catalogIdEnd
*/ */
public Long getCatalogIdEnd(){ public ApplyLogQuery id(Long id){
return this.catalogIdEnd; setId(id);
return this;
} }
/** /**
* 设置 结束 证照目录ID * 设置 开始 序号，主键，自增长
* @param catalogIdEnd * @param idStart
*/ */
public void setCatalogIdEnd(Long catalogIdEnd){ public ApplyLogQuery idStart(Long idStart){
this.catalogIdEnd = catalogIdEnd; this.idStart = idStart;
return this;
} }
/** /**
* 获取 增加 证照目录ID * 设置 结束 序号，主键，自增长
* @return catalogIdIncrement * @param idEnd
*/ */
public Long getCatalogIdIncrement(){ public ApplyLogQuery idEnd(Long idEnd){
return this.catalogIdIncrement; this.idEnd = idEnd;
return this;
} }
/** /**
* 设置 增加 证照目录ID * 设置 增加 序号，主键，自增长
* @param catalogIdIncrement * @param idIncrement
*/ */
public void setCatalogIdIncrement(Long catalogIdIncrement){ public ApplyLogQuery idIncrement(Long idIncrement){
this.catalogIdIncrement = catalogIdIncrement; this.idIncrement = idIncrement;
return this;
} }
/** /**
* 获取 证照目录ID * 设置 序号，主键，自增长
* @return catalogIdList * @param idList
*/ */
public List<Long> getCatalogIdList(){ public ApplyLogQuery idList(List<Long> idList){
return this.catalogIdList; this.idList = idList;
return this;
} }
/** /**
* 设置 证照目录ID * 设置 证照目录ID
* @param catalogIdList * @param catalogId
*/
public void setCatalogIdList(List<Long> catalogIdList){
this.catalogIdList = catalogIdList;
}
/**
* 设置 序号，主键，自增长
* @param id
*/ */
public ApplyLogQuery id(Long id){ public ApplyLogQuery catalogId(Long catalogId){
setId(id); setCatalogId(catalogId);
return this; return this;
} }
/** /**
* 设置 开始 序号，主键，自增长 * 设置 开始 证照目录ID
* @param idStart * @param catalogIdStart
*/ */
public ApplyLogQuery idStart(Long idStart){ public ApplyLogQuery catalogIdStart(Long catalogIdStart){
this.idStart = idStart; this.catalogIdStart = catalogIdStart;
return this; return this;
} }
/** /**
* 设置 结束 序号，主键，自增长 * 设置 结束 证照目录ID
* @param idEnd * @param catalogIdEnd
*/ */
public ApplyLogQuery idEnd(Long idEnd){ public ApplyLogQuery catalogIdEnd(Long catalogIdEnd){
this.idEnd = idEnd; this.catalogIdEnd = catalogIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 序号，主键，自增长 * 设置 增加 证照目录ID
* @param idIncrement * @param catalogIdIncrement
*/ */
public ApplyLogQuery idIncrement(Long idIncrement){ public ApplyLogQuery catalogIdIncrement(Long catalogIdIncrement){
this.idIncrement = idIncrement; this.catalogIdIncrement = catalogIdIncrement;
return this; return this;
} }
/** /**
* 设置 序号，主键，自增长 * 设置 证照目录ID
* @param idList * @param catalogIdList
*/ */
public ApplyLogQuery idList(List<Long> idList){ public ApplyLogQuery catalogIdList(List<Long> catalogIdList){
this.idList = idList; this.catalogIdList = catalogIdList;
return this; return this;
} }
...@@ -1133,19 +1290,19 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -1133,19 +1290,19 @@ public class ApplyLogQuery extends ApplyLogEntity {
/** /**
* 设置 企业名称 * 设置 企业名称
* @param enterpriseNam * @param enterpriseName
*/ */
public ApplyLogQuery enterpriseNam(String enterpriseNam){ public ApplyLogQuery enterpriseName(String enterpriseName){
setEnterpriseNam(enterpriseNam); setEnterpriseName(enterpriseName);
return this; return this;
} }
/** /**
* 设置 企业名称 * 设置 企业名称
* @param enterpriseNamList * @param enterpriseNameList
*/ */
public ApplyLogQuery enterpriseNamList(List<String> enterpriseNamList){ public ApplyLogQuery enterpriseNameList(List<String> enterpriseNameList){
this.enterpriseNamList = enterpriseNamList; this.enterpriseNameList = enterpriseNameList;
return this; return this;
} }
...@@ -1190,6 +1347,25 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -1190,6 +1347,25 @@ public class ApplyLogQuery extends ApplyLogEntity {
} }
/**
* 设置 正本预览地址
* @param oriPreview
*/
public ApplyLogQuery oriPreview(String oriPreview){
setOriPreview(oriPreview);
return this;
}
/**
* 设置 正本预览地址
* @param oriPreviewList
*/
public ApplyLogQuery oriPreviewList(List<String> oriPreviewList){
this.oriPreviewList = oriPreviewList;
return this;
}
/** /**
* 设置 证照模板正本表单内容 * 设置 证照模板正本表单内容
* @param oriFormContent * @param oriFormContent
...@@ -1228,6 +1404,25 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -1228,6 +1404,25 @@ public class ApplyLogQuery extends ApplyLogEntity {
} }
/**
* 设置 副本预览地址
* @param dupPreview
*/
public ApplyLogQuery dupPreview(String dupPreview){
setDupPreview(dupPreview);
return this;
}
/**
* 设置 副本预览地址
* @param dupPreviewList
*/
public ApplyLogQuery dupPreviewList(List<String> dupPreviewList){
this.dupPreviewList = dupPreviewList;
return this;
}
/** /**
* 设置 证照模板副本表单内容 * 设置 证照模板副本表单内容
* @param dupFormContent * @param dupFormContent
...@@ -1246,6 +1441,51 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -1246,6 +1441,51 @@ public class ApplyLogQuery extends ApplyLogEntity {
return this; return this;
} }
/**
* 设置 生成状态1未生成2正本3副本4正副本
* @param generateStatus
*/
public ApplyLogQuery generateStatus(Integer generateStatus){
setGenerateStatus(generateStatus);
return this;
}
/**
* 设置 开始 生成状态1未生成2正本3副本4正副本
* @param generateStatusStart
*/
public ApplyLogQuery generateStatusStart(Integer generateStatusStart){
this.generateStatusStart = generateStatusStart;
return this;
}
/**
* 设置 结束 生成状态1未生成2正本3副本4正副本
* @param generateStatusEnd
*/
public ApplyLogQuery generateStatusEnd(Integer generateStatusEnd){
this.generateStatusEnd = generateStatusEnd;
return this;
}
/**
* 设置 增加 生成状态1未生成2正本3副本4正副本
* @param generateStatusIncrement
*/
public ApplyLogQuery generateStatusIncrement(Integer generateStatusIncrement){
this.generateStatusIncrement = generateStatusIncrement;
return this;
}
/**
* 设置 生成状态1未生成2正本3副本4正副本
* @param generateStatusList
*/
public ApplyLogQuery generateStatusList(List<Integer> generateStatusList){
this.generateStatusList = generateStatusList;
return this;
}
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserId * @param createUserId
...@@ -1338,51 +1578,6 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -1338,51 +1578,6 @@ public class ApplyLogQuery extends ApplyLogEntity {
} }
/**
* 设置 证照目录ID
* @param catalogId
*/
public ApplyLogQuery catalogId(Long catalogId){
setCatalogId(catalogId);
return this;
}
/**
* 设置 开始 证照目录ID
* @param catalogIdStart
*/
public ApplyLogQuery catalogIdStart(Long catalogIdStart){
this.catalogIdStart = catalogIdStart;
return this;
}
/**
* 设置 结束 证照目录ID
* @param catalogIdEnd
*/
public ApplyLogQuery catalogIdEnd(Long catalogIdEnd){
this.catalogIdEnd = catalogIdEnd;
return this;
}
/**
* 设置 增加 证照目录ID
* @param catalogIdIncrement
*/
public ApplyLogQuery catalogIdIncrement(Long catalogIdIncrement){
this.catalogIdIncrement = catalogIdIncrement;
return this;
}
/**
* 设置 证照目录ID
* @param catalogIdList
*/
public ApplyLogQuery catalogIdList(List<Long> catalogIdList){
this.catalogIdList = catalogIdList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintLogEntity.java
View file @ 8cac55a4
...@@ -8,11 +8,11 @@ import com.mortals.framework.annotation.Excel; ...@@ -8,11 +8,11 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.record.model.vo.PrintLogVo; import com.mortals.xhx.module.record.model.vo.PrintLogVo;
/** /**
* 证照打印记录实体对象 * 证照打印记录实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-10-18 * @date 2022-10-22
*/ */
public class PrintLogEntity extends PrintLogVo { public class PrintLogEntity extends PrintLogVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -20,27 +20,22 @@ public class PrintLogEntity extends PrintLogVo { ...@@ -20,27 +20,22 @@ public class PrintLogEntity extends PrintLogVo {
/** /**
* 证照目录编号 * 证照目录编号
*/ */
@Excel(name = "证照目录编号")
private String catalogCode; private String catalogCode;
/** /**
* 证照名称 * 证照名称
*/ */
@Excel(name = "证照名称")
private String certificateName; private String certificateName;
/** /**
* 证照编号 * 证照编号
*/ */
@Excel(name = "证照编号")
private String certificateCode; private String certificateCode;
/** /**
* 企业名称 * 企业名称
*/ */
@Excel(name = "企业名称") private String enterpriseName;
private String enterpriseNam;
/** /**
* 持有者姓名 * 持有者姓名
*/ */
@Excel(name = "持有者姓名")
private String holderName; private String holderName;
/** /**
* 持有者证件号码 * 持有者证件号码
...@@ -128,15 +123,15 @@ public class PrintLogEntity extends PrintLogVo { ...@@ -128,15 +123,15 @@ public class PrintLogEntity extends PrintLogVo {
* 获取 企业名称 * 获取 企业名称
* @return String * @return String
*/ */
public String getEnterpriseNam(){ public String getEnterpriseName(){
return enterpriseNam; return enterpriseName;
} }
/** /**
* 设置 企业名称 * 设置 企业名称
* @param enterpriseNam * @param enterpriseName
*/ */
public void setEnterpriseNam(String enterpriseNam){ public void setEnterpriseName(String enterpriseName){
this.enterpriseNam = enterpriseNam; this.enterpriseName = enterpriseName;
} }
/** /**
* 获取 持有者姓名 * 获取 持有者姓名
...@@ -303,7 +298,7 @@ public class PrintLogEntity extends PrintLogVo { ...@@ -303,7 +298,7 @@ public class PrintLogEntity extends PrintLogVo {
sb.append(",catalogCode:").append(getCatalogCode()); sb.append(",catalogCode:").append(getCatalogCode());
sb.append(",certificateName:").append(getCertificateName()); sb.append(",certificateName:").append(getCertificateName());
sb.append(",certificateCode:").append(getCertificateCode()); sb.append(",certificateCode:").append(getCertificateCode());
sb.append(",enterpriseNam:").append(getEnterpriseNam()); sb.append(",enterpriseName:").append(getEnterpriseName());
sb.append(",holderName:").append(getHolderName()); sb.append(",holderName:").append(getHolderName());
sb.append(",holderIDCardNo:").append(getHolderIDCardNo()); sb.append(",holderIDCardNo:").append(getHolderIDCardNo());
sb.append(",pickerName:").append(getPickerName()); sb.append(",pickerName:").append(getPickerName());
...@@ -325,7 +320,7 @@ public class PrintLogEntity extends PrintLogVo { ...@@ -325,7 +320,7 @@ public class PrintLogEntity extends PrintLogVo {
this.certificateCode = ""; this.certificateCode = "";
this.enterpriseNam = ""; this.enterpriseName = "";
this.holderName = ""; this.holderName = "";
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintLogQuery.java
View file @ 8cac55a4
...@@ -4,11 +4,11 @@ import java.util.Date; ...@@ -4,11 +4,11 @@ import java.util.Date;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.record.model.PrintLogEntity; import com.mortals.xhx.module.record.model.PrintLogEntity;
/** /**
* 证照打印记录查询对象 * 证照打印记录查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-10-18 * @date 2022-10-22
*/ */
public class PrintLogQuery extends PrintLogEntity { public class PrintLogQuery extends PrintLogEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -32,7 +32,7 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -32,7 +32,7 @@ public class PrintLogQuery extends PrintLogEntity {
private List<String> certificateCodeList; private List<String> certificateCodeList;
/** 企业名称 */ /** 企业名称 */
private List<String> enterpriseNamList; private List<String> enterpriseNameList;
/** 持有者姓名 */ /** 持有者姓名 */
private List<String> holderNameList; private List<String> holderNameList;
...@@ -267,18 +267,18 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -267,18 +267,18 @@ public class PrintLogQuery extends PrintLogEntity {
} }
/** /**
* 获取 企业名称 * 获取 企业名称
* @return enterpriseNamList * @return enterpriseNameList
*/ */
public List<String> getEnterpriseNamList(){ public List<String> getEnterpriseNameList(){
return this.enterpriseNamList; return this.enterpriseNameList;
} }
/** /**
* 设置 企业名称 * 设置 企业名称
* @param enterpriseNamList * @param enterpriseNameList
*/ */
public void setEnterpriseNamList(List<String> enterpriseNamList){ public void setEnterpriseNameList(List<String> enterpriseNameList){
this.enterpriseNamList = enterpriseNamList; this.enterpriseNameList = enterpriseNameList;
} }
/** /**
* 获取 持有者姓名 * 获取 持有者姓名
...@@ -989,19 +989,19 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -989,19 +989,19 @@ public class PrintLogQuery extends PrintLogEntity {
/** /**
* 设置 企业名称 * 设置 企业名称
* @param enterpriseNam * @param enterpriseName
*/ */
public PrintLogQuery enterpriseNam(String enterpriseNam){ public PrintLogQuery enterpriseName(String enterpriseName){
setEnterpriseNam(enterpriseNam); setEnterpriseName(enterpriseName);
return this; return this;
} }
/** /**
* 设置 企业名称 * 设置 企业名称
* @param enterpriseNamList * @param enterpriseNameList
*/ */
public PrintLogQuery enterpriseNamList(List<String> enterpriseNamList){ public PrintLogQuery enterpriseNameList(List<String> enterpriseNameList){
this.enterpriseNamList = enterpriseNamList; this.enterpriseNameList = enterpriseNameList;
return this; return this;
} }
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintWaitQueueEntity.java 0 → 100644
View file @ 8cac55a4
package com.mortals.xhx.module.record.model;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.record.model.vo.PrintWaitQueueVo;
/**
* 证照打印记录实体对象
*
* @author zxfei
* @date 2022-10-22
*/
public class PrintWaitQueueEntity extends PrintWaitQueueVo {
private static final long serialVersionUID = 1L;
/**
* 申请ID
*/
private Long applyId;
/**
* 证照目录编号
*/
private String catalogCode;
/**
* 证照名称
*/
private String certificateName;
/**
* 证照编号
*/
private String certificateCode;
/**
* 企业名称
*/
private String enterpriseName;
/**
* 持有者姓名
*/
private String holderName;
/**
* 持有者证件号码
*/
private String holderIDCardNo;
/**
* 取件人姓名
*/
private String pickerName;
/**
* 取件人证件号码
*/
private String pickerIDCardNo;
/**
* 证件类型1正本2副本
*/
private Integer certificateType;
/**
* 证件预览地址
*/
private String previewUrl;
/**
* 证件附件地址
*/
private String certificateUrl;
/**
* 是否打印0否1是
*/
private Integer printStatus;
/**
* 证照目录ID
*/
private Long catalogId;
public PrintWaitQueueEntity(){}
/**
* 获取 申请ID
* @return Long
*/
public Long getApplyId(){
return applyId;
}
/**
* 设置 申请ID
* @param applyId
*/
public void setApplyId(Long applyId){
this.applyId = applyId;
}
/**
* 获取 证照目录编号
* @return String
*/
public String getCatalogCode(){
return catalogCode;
}
/**
* 设置 证照目录编号
* @param catalogCode
*/
public void setCatalogCode(String catalogCode){
this.catalogCode = catalogCode;
}
/**
* 获取 证照名称
* @return String
*/
public String getCertificateName(){
return certificateName;
}
/**
* 设置 证照名称
* @param certificateName
*/
public void setCertificateName(String certificateName){
this.certificateName = certificateName;
}
/**
* 获取 证照编号
* @return String
*/
public String getCertificateCode(){
return certificateCode;
}
/**
* 设置 证照编号
* @param certificateCode
*/
public void setCertificateCode(String certificateCode){
this.certificateCode = certificateCode;
}
/**
* 获取 企业名称
* @return String
*/
public String getEnterpriseName(){
return enterpriseName;
}
/**
* 设置 企业名称
* @param enterpriseName
*/
public void setEnterpriseName(String enterpriseName){
this.enterpriseName = enterpriseName;
}
/**
* 获取 持有者姓名
* @return String
*/
public String getHolderName(){
return holderName;
}
/**
* 设置 持有者姓名
* @param holderName
*/
public void setHolderName(String holderName){
this.holderName = holderName;
}
/**
* 获取 持有者证件号码
* @return String
*/
public String getHolderIDCardNo(){
return holderIDCardNo;
}
/**
* 设置 持有者证件号码
* @param holderIDCardNo
*/
public void setHolderIDCardNo(String holderIDCardNo){
this.holderIDCardNo = holderIDCardNo;
}
/**
* 获取 取件人姓名
* @return String
*/
public String getPickerName(){
return pickerName;
}
/**
* 设置 取件人姓名
* @param pickerName
*/
public void setPickerName(String pickerName){
this.pickerName = pickerName;
}
/**
* 获取 取件人证件号码
* @return String
*/
public String getPickerIDCardNo(){
return pickerIDCardNo;
}
/**
* 设置 取件人证件号码
* @param pickerIDCardNo
*/
public void setPickerIDCardNo(String pickerIDCardNo){
this.pickerIDCardNo = pickerIDCardNo;
}
/**
* 获取 证件类型1正本2副本
* @return Integer
*/
public Integer getCertificateType(){
return certificateType;
}
/**
* 设置 证件类型1正本2副本
* @param certificateType
*/
public void setCertificateType(Integer certificateType){
this.certificateType = certificateType;
}
/**
* 获取 证件预览地址
* @return String
*/
public String getPreviewUrl(){
return previewUrl;
}
/**
* 设置 证件预览地址
* @param previewUrl
*/
public void setPreviewUrl(String previewUrl){
this.previewUrl = previewUrl;
}
/**
* 获取 证件附件地址
* @return String
*/
public String getCertificateUrl(){
return certificateUrl;
}
/**
* 设置 证件附件地址
* @param certificateUrl
*/
public void setCertificateUrl(String certificateUrl){
this.certificateUrl = certificateUrl;
}
/**
* 获取 是否打印0否1是
* @return Integer
*/
public Integer getPrintStatus(){
return printStatus;
}
/**
* 设置 是否打印0否1是
* @param printStatus
*/
public void setPrintStatus(Integer printStatus){
this.printStatus = printStatus;
}
/**
* 获取 证照目录ID
* @return Long
*/
public Long getCatalogId(){
return catalogId;
}
/**
* 设置 证照目录ID
* @param catalogId
*/
public void setCatalogId(Long catalogId){
this.catalogId = catalogId;
}
@Override
public int hashCode() {
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
if (obj == null) return false;
if (obj instanceof PrintWaitQueueEntity) {
PrintWaitQueueEntity tmp = (PrintWaitQueueEntity) obj;
if (this.getId() == tmp.getId()) {
return true;
}
}
return false;
}
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",applyId:").append(getApplyId());
sb.append(",catalogCode:").append(getCatalogCode());
sb.append(",certificateName:").append(getCertificateName());
sb.append(",certificateCode:").append(getCertificateCode());
sb.append(",enterpriseName:").append(getEnterpriseName());
sb.append(",holderName:").append(getHolderName());
sb.append(",holderIDCardNo:").append(getHolderIDCardNo());
sb.append(",pickerName:").append(getPickerName());
sb.append(",pickerIDCardNo:").append(getPickerIDCardNo());
sb.append(",certificateType:").append(getCertificateType());
sb.append(",previewUrl:").append(getPreviewUrl());
sb.append(",certificateUrl:").append(getCertificateUrl());
sb.append(",printStatus:").append(getPrintStatus());
sb.append(",catalogId:").append(getCatalogId());
return sb.toString();
}
public void initAttrValue(){
this.applyId = null;
this.catalogCode = "";
this.certificateName = "";
this.certificateCode = "";
this.enterpriseName = "";
this.holderName = "";
this.holderIDCardNo = "";
this.pickerName = "";
this.pickerIDCardNo = "";
this.certificateType = 1;
this.previewUrl = "";
this.certificateUrl = "";
this.printStatus = 0;
this.catalogId = null;
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintWaitQueueQuery.java 0 → 100644
View file @ 8cac55a4
package com.mortals.xhx.module.record.model;
import java.util.List;
import com.mortals.xhx.module.record.model.PrintWaitQueueEntity;
/**
* 证照打印记录查询对象
*
* @author zxfei
* @date 2022-10-22
*/
public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
/** 开始 序号，主键，自增长 */
private Long idStart;
/** 结束 序号，主键，自增长 */
private Long idEnd;
/** 增加 序号，主键，自增长 */
private Long idIncrement;
/** 序号，主键，自增长列表 */
private List <Long> idList;
/** 开始 申请ID */
private Long applyIdStart;
/** 结束 申请ID */
private Long applyIdEnd;
/** 增加 申请ID */
private Long applyIdIncrement;
/** 申请ID列表 */
private List <Long> applyIdList;
/** 证照目录编号 */
private List<String> catalogCodeList;
/** 证照名称 */
private List<String> certificateNameList;
/** 证照编号 */
private List<String> certificateCodeList;
/** 企业名称 */
private List<String> enterpriseNameList;
/** 持有者姓名 */
private List<String> holderNameList;
/** 持有者证件号码 */
private List<String> holderIDCardNoList;
/** 取件人姓名 */
private List<String> pickerNameList;
/** 取件人证件号码 */
private List<String> pickerIDCardNoList;
/** 开始 证件类型1正本2副本 */
private Integer certificateTypeStart;
/** 结束 证件类型1正本2副本 */
private Integer certificateTypeEnd;
/** 增加 证件类型1正本2副本 */
private Integer certificateTypeIncrement;
/** 证件类型1正本2副本列表 */
private List <Integer> certificateTypeList;
/** 证件预览地址 */
private List<String> previewUrlList;
/** 证件附件地址 */
private List<String> certificateUrlList;
/** 开始 是否打印0否1是 */
private Integer printStatusStart;
/** 结束 是否打印0否1是 */
private Integer printStatusEnd;
/** 增加 是否打印0否1是 */
private Integer printStatusIncrement;
/** 是否打印0否1是列表 */
private List <Integer> printStatusList;
/** 开始 创建用户 */
private Long createUserIdStart;
/** 结束 创建用户 */
private Long createUserIdEnd;
/** 增加 创建用户 */
private Long createUserIdIncrement;
/** 创建用户列表 */
private List <Long> createUserIdList;
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
/** 开始 更新用户 */
private Long updateUserIdStart;
/** 结束 更新用户 */
private Long updateUserIdEnd;
/** 增加 更新用户 */
private Long updateUserIdIncrement;
/** 更新用户列表 */
private List <Long> updateUserIdList;
/** 开始 更新时间 */
private String updateTimeStart;
/** 结束 更新时间 */
private String updateTimeEnd;
/** 开始 证照目录ID */
private Long catalogIdStart;
/** 结束 证照目录ID */
private Long catalogIdEnd;
/** 增加 证照目录ID */
private Long catalogIdIncrement;
/** 证照目录ID列表 */
private List <Long> catalogIdList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<PrintWaitQueueQuery> orConditionList;
/** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
private List<PrintWaitQueueQuery> andConditionList;
public PrintWaitQueueQuery(){}
/**
* 获取 开始 序号，主键，自增长
* @return idStart
*/
public Long getIdStart(){
return this.idStart;
}
/**
* 设置 开始 序号，主键，自增长
* @param idStart
*/
public void setIdStart(Long idStart){
this.idStart = idStart;
}
/**
* 获取 结束 序号，主键，自增长
* @return $idEnd
*/
public Long getIdEnd(){
return this.idEnd;
}
/**
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
public void setIdEnd(Long idEnd){
this.idEnd = idEnd;
}
/**
* 获取 增加 序号，主键，自增长
* @return idIncrement
*/
public Long getIdIncrement(){
return this.idIncrement;
}
/**
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement;
}
/**
* 获取 序号，主键，自增长
* @return idList
*/
public List<Long> getIdList(){
return this.idList;
}
/**
* 设置 序号，主键，自增长
* @param idList
*/
public void setIdList(List<Long> idList){
this.idList = idList;
}
/**
* 获取 开始 申请ID
* @return applyIdStart
*/
public Long getApplyIdStart(){
return this.applyIdStart;
}
/**
* 设置 开始 申请ID
* @param applyIdStart
*/
public void setApplyIdStart(Long applyIdStart){
this.applyIdStart = applyIdStart;
}
/**
* 获取 结束 申请ID
* @return $applyIdEnd
*/
public Long getApplyIdEnd(){
return this.applyIdEnd;
}
/**
* 设置 结束 申请ID
* @param applyIdEnd
*/
public void setApplyIdEnd(Long applyIdEnd){
this.applyIdEnd = applyIdEnd;
}
/**
* 获取 增加 申请ID
* @return applyIdIncrement
*/
public Long getApplyIdIncrement(){
return this.applyIdIncrement;
}
/**
* 设置 增加 申请ID
* @param applyIdIncrement
*/
public void setApplyIdIncrement(Long applyIdIncrement){
this.applyIdIncrement = applyIdIncrement;
}
/**
* 获取 申请ID
* @return applyIdList
*/
public List<Long> getApplyIdList(){
return this.applyIdList;
}
/**
* 设置 申请ID
* @param applyIdList
*/
public void setApplyIdList(List<Long> applyIdList){
this.applyIdList = applyIdList;
}
/**
* 获取 证照目录编号
* @return catalogCodeList
*/
public List<String> getCatalogCodeList(){
return this.catalogCodeList;
}
/**
* 设置 证照目录编号
* @param catalogCodeList
*/
public void setCatalogCodeList(List<String> catalogCodeList){
this.catalogCodeList = catalogCodeList;
}
/**
* 获取 证照名称
* @return certificateNameList
*/
public List<String> getCertificateNameList(){
return this.certificateNameList;
}
/**
* 设置 证照名称
* @param certificateNameList
*/
public void setCertificateNameList(List<String> certificateNameList){
this.certificateNameList = certificateNameList;
}
/**
* 获取 证照编号
* @return certificateCodeList
*/
public List<String> getCertificateCodeList(){
return this.certificateCodeList;
}
/**
* 设置 证照编号
* @param certificateCodeList
*/
public void setCertificateCodeList(List<String> certificateCodeList){
this.certificateCodeList = certificateCodeList;
}
/**
* 获取 企业名称
* @return enterpriseNameList
*/
public List<String> getEnterpriseNameList(){
return this.enterpriseNameList;
}
/**
* 设置 企业名称
* @param enterpriseNameList
*/
public void setEnterpriseNameList(List<String> enterpriseNameList){
this.enterpriseNameList = enterpriseNameList;
}
/**
* 获取 持有者姓名
* @return holderNameList
*/
public List<String> getHolderNameList(){
return this.holderNameList;
}
/**
* 设置 持有者姓名
* @param holderNameList
*/
public void setHolderNameList(List<String> holderNameList){
this.holderNameList = holderNameList;
}
/**
* 获取 持有者证件号码
* @return holderIDCardNoList
*/
public List<String> getHolderIDCardNoList(){
return this.holderIDCardNoList;
}
/**
* 设置 持有者证件号码
* @param holderIDCardNoList
*/
public void setHolderIDCardNoList(List<String> holderIDCardNoList){
this.holderIDCardNoList = holderIDCardNoList;
}
/**
* 获取 取件人姓名
* @return pickerNameList
*/
public List<String> getPickerNameList(){
return this.pickerNameList;
}
/**
* 设置 取件人姓名
* @param pickerNameList
*/
public void setPickerNameList(List<String> pickerNameList){
this.pickerNameList = pickerNameList;
}
/**
* 获取 取件人证件号码
* @return pickerIDCardNoList
*/
public List<String> getPickerIDCardNoList(){
return this.pickerIDCardNoList;
}
/**
* 设置 取件人证件号码
* @param pickerIDCardNoList
*/
public void setPickerIDCardNoList(List<String> pickerIDCardNoList){
this.pickerIDCardNoList = pickerIDCardNoList;
}
/**
* 获取 开始 证件类型1正本2副本
* @return certificateTypeStart
*/
public Integer getCertificateTypeStart(){
return this.certificateTypeStart;
}
/**
* 设置 开始 证件类型1正本2副本
* @param certificateTypeStart
*/
public void setCertificateTypeStart(Integer certificateTypeStart){
this.certificateTypeStart = certificateTypeStart;
}
/**
* 获取 结束 证件类型1正本2副本
* @return $certificateTypeEnd
*/
public Integer getCertificateTypeEnd(){
return this.certificateTypeEnd;
}
/**
* 设置 结束 证件类型1正本2副本
* @param certificateTypeEnd
*/
public void setCertificateTypeEnd(Integer certificateTypeEnd){
this.certificateTypeEnd = certificateTypeEnd;
}
/**
* 获取 增加 证件类型1正本2副本
* @return certificateTypeIncrement
*/
public Integer getCertificateTypeIncrement(){
return this.certificateTypeIncrement;
}
/**
* 设置 增加 证件类型1正本2副本
* @param certificateTypeIncrement
*/
public void setCertificateTypeIncrement(Integer certificateTypeIncrement){
this.certificateTypeIncrement = certificateTypeIncrement;
}
/**
* 获取 证件类型1正本2副本
* @return certificateTypeList
*/
public List<Integer> getCertificateTypeList(){
return this.certificateTypeList;
}
/**
* 设置 证件类型1正本2副本
* @param certificateTypeList
*/
public void setCertificateTypeList(List<Integer> certificateTypeList){
this.certificateTypeList = certificateTypeList;
}
/**
* 获取 证件预览地址
* @return previewUrlList
*/
public List<String> getPreviewUrlList(){
return this.previewUrlList;
}
/**
* 设置 证件预览地址
* @param previewUrlList
*/
public void setPreviewUrlList(List<String> previewUrlList){
this.previewUrlList = previewUrlList;
}
/**
* 获取 证件附件地址
* @return certificateUrlList
*/
public List<String> getCertificateUrlList(){
return this.certificateUrlList;
}
/**
* 设置 证件附件地址
* @param certificateUrlList
*/
public void setCertificateUrlList(List<String> certificateUrlList){
this.certificateUrlList = certificateUrlList;
}
/**
* 获取 开始 是否打印0否1是
* @return printStatusStart
*/
public Integer getPrintStatusStart(){
return this.printStatusStart;
}
/**
* 设置 开始 是否打印0否1是
* @param printStatusStart
*/
public void setPrintStatusStart(Integer printStatusStart){
this.printStatusStart = printStatusStart;
}
/**
* 获取 结束 是否打印0否1是
* @return $printStatusEnd
*/
public Integer getPrintStatusEnd(){
return this.printStatusEnd;
}
/**
* 设置 结束 是否打印0否1是
* @param printStatusEnd
*/
public void setPrintStatusEnd(Integer printStatusEnd){
this.printStatusEnd = printStatusEnd;
}
/**
* 获取 增加 是否打印0否1是
* @return printStatusIncrement
*/
public Integer getPrintStatusIncrement(){
return this.printStatusIncrement;
}
/**
* 设置 增加 是否打印0否1是
* @param printStatusIncrement
*/
public void setPrintStatusIncrement(Integer printStatusIncrement){
this.printStatusIncrement = printStatusIncrement;
}
/**
* 获取 是否打印0否1是
* @return printStatusList
*/
public List<Integer> getPrintStatusList(){
return this.printStatusList;
}
/**
* 设置 是否打印0否1是
* @param printStatusList
*/
public void setPrintStatusList(List<Integer> printStatusList){
this.printStatusList = printStatusList;
}
/**
* 获取 开始 创建用户
* @return createUserIdStart
*/
public Long getCreateUserIdStart(){
return this.createUserIdStart;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
public void setCreateUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
}
/**
* 获取 结束 创建用户
* @return $createUserIdEnd
*/
public Long getCreateUserIdEnd(){
return this.createUserIdEnd;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public void setCreateUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
}
/**
* 获取 增加 创建用户
* @return createUserIdIncrement
*/
public Long getCreateUserIdIncrement(){
return this.createUserIdIncrement;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public void setCreateUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
}
/**
* 获取 创建用户
* @return createUserIdList
*/
public List<Long> getCreateUserIdList(){
return this.createUserIdList;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
public void setCreateUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
}
/**
* 获取 开始 创建时间
* @return createTimeStart
*/
public String getCreateTimeStart(){
return this.createTimeStart;
}
/**
* 设置 开始 创建时间
* @param createTimeStart
*/
public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart;
}
/**
* 获取 结束 创建时间
* @return createTimeEnd
*/
public String getCreateTimeEnd(){
return this.createTimeEnd;
}
/**
* 设置 结束 创建时间
* @param createTimeEnd
*/
public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd;
}
/**
* 获取 开始 更新用户
* @return updateUserIdStart
*/
public Long getUpdateUserIdStart(){
return this.updateUserIdStart;
}
/**
* 设置 开始 更新用户
* @param updateUserIdStart
*/
public void setUpdateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart;
}
/**
* 获取 结束 更新用户
* @return $updateUserIdEnd
*/
public Long getUpdateUserIdEnd(){
return this.updateUserIdEnd;
}
/**
* 设置 结束 更新用户
* @param updateUserIdEnd
*/
public void setUpdateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd;
}
/**
* 获取 增加 更新用户
* @return updateUserIdIncrement
*/
public Long getUpdateUserIdIncrement(){
return this.updateUserIdIncrement;
}
/**
* 设置 增加 更新用户
* @param updateUserIdIncrement
*/
public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement;
}
/**
* 获取 更新用户
* @return updateUserIdList
*/
public List<Long> getUpdateUserIdList(){
return this.updateUserIdList;
}
/**
* 设置 更新用户
* @param updateUserIdList
*/
public void setUpdateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList;
}
/**
* 获取 开始 更新时间
* @return updateTimeStart
*/
public String getUpdateTimeStart(){
return this.updateTimeStart;
}
/**
* 设置 开始 更新时间
* @param updateTimeStart
*/
public void setUpdateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart;
}
/**
* 获取 结束 更新时间
* @return updateTimeEnd
*/
public String getUpdateTimeEnd(){
return this.updateTimeEnd;
}
/**
* 设置 结束 更新时间
* @param updateTimeEnd
*/
public void setUpdateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd;
}
/**
* 获取 开始 证照目录ID
* @return catalogIdStart
*/
public Long getCatalogIdStart(){
return this.catalogIdStart;
}
/**
* 设置 开始 证照目录ID
* @param catalogIdStart
*/
public void setCatalogIdStart(Long catalogIdStart){
this.catalogIdStart = catalogIdStart;
}
/**
* 获取 结束 证照目录ID
* @return $catalogIdEnd
*/
public Long getCatalogIdEnd(){
return this.catalogIdEnd;
}
/**
* 设置 结束 证照目录ID
* @param catalogIdEnd
*/
public void setCatalogIdEnd(Long catalogIdEnd){
this.catalogIdEnd = catalogIdEnd;
}
/**
* 获取 增加 证照目录ID
* @return catalogIdIncrement
*/
public Long getCatalogIdIncrement(){
return this.catalogIdIncrement;
}
/**
* 设置 增加 证照目录ID
* @param catalogIdIncrement
*/
public void setCatalogIdIncrement(Long catalogIdIncrement){
this.catalogIdIncrement = catalogIdIncrement;
}
/**
* 获取 证照目录ID
* @return catalogIdList
*/
public List<Long> getCatalogIdList(){
return this.catalogIdList;
}
/**
* 设置 证照目录ID
* @param catalogIdList
*/
public void setCatalogIdList(List<Long> catalogIdList){
this.catalogIdList = catalogIdList;
}
/**
* 设置 序号，主键，自增长
* @param id
*/
public PrintWaitQueueQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 开始 序号，主键，自增长
* @param idStart
*/
public PrintWaitQueueQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
public PrintWaitQueueQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
public PrintWaitQueueQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idList
*/
public PrintWaitQueueQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 设置 申请ID
* @param applyId
*/
public PrintWaitQueueQuery applyId(Long applyId){
setApplyId(applyId);
return this;
}
/**
* 设置 开始 申请ID
* @param applyIdStart
*/
public PrintWaitQueueQuery applyIdStart(Long applyIdStart){
this.applyIdStart = applyIdStart;
return this;
}
/**
* 设置 结束 申请ID
* @param applyIdEnd
*/
public PrintWaitQueueQuery applyIdEnd(Long applyIdEnd){
this.applyIdEnd = applyIdEnd;
return this;
}
/**
* 设置 增加 申请ID
* @param applyIdIncrement
*/
public PrintWaitQueueQuery applyIdIncrement(Long applyIdIncrement){
this.applyIdIncrement = applyIdIncrement;
return this;
}
/**
* 设置 申请ID
* @param applyIdList
*/
public PrintWaitQueueQuery applyIdList(List<Long> applyIdList){
this.applyIdList = applyIdList;
return this;
}
/**
* 设置 证照目录编号
* @param catalogCode
*/
public PrintWaitQueueQuery catalogCode(String catalogCode){
setCatalogCode(catalogCode);
return this;
}
/**
* 设置 证照目录编号
* @param catalogCodeList
*/
public PrintWaitQueueQuery catalogCodeList(List<String> catalogCodeList){
this.catalogCodeList = catalogCodeList;
return this;
}
/**
* 设置 证照名称
* @param certificateName
*/
public PrintWaitQueueQuery certificateName(String certificateName){
setCertificateName(certificateName);
return this;
}
/**
* 设置 证照名称
* @param certificateNameList
*/
public PrintWaitQueueQuery certificateNameList(List<String> certificateNameList){
this.certificateNameList = certificateNameList;
return this;
}
/**
* 设置 证照编号
* @param certificateCode
*/
public PrintWaitQueueQuery certificateCode(String certificateCode){
setCertificateCode(certificateCode);
return this;
}
/**
* 设置 证照编号
* @param certificateCodeList
*/
public PrintWaitQueueQuery certificateCodeList(List<String> certificateCodeList){
this.certificateCodeList = certificateCodeList;
return this;
}
/**
* 设置 企业名称
* @param enterpriseName
*/
public PrintWaitQueueQuery enterpriseName(String enterpriseName){
setEnterpriseName(enterpriseName);
return this;
}
/**
* 设置 企业名称
* @param enterpriseNameList
*/
public PrintWaitQueueQuery enterpriseNameList(List<String> enterpriseNameList){
this.enterpriseNameList = enterpriseNameList;
return this;
}
/**
* 设置 持有者姓名
* @param holderName
*/
public PrintWaitQueueQuery holderName(String holderName){
setHolderName(holderName);
return this;
}
/**
* 设置 持有者姓名
* @param holderNameList
*/
public PrintWaitQueueQuery holderNameList(List<String> holderNameList){
this.holderNameList = holderNameList;
return this;
}
/**
* 设置 持有者证件号码
* @param holderIDCardNo
*/
public PrintWaitQueueQuery holderIDCardNo(String holderIDCardNo){
setHolderIDCardNo(holderIDCardNo);
return this;
}
/**
* 设置 持有者证件号码
* @param holderIDCardNoList
*/
public PrintWaitQueueQuery holderIDCardNoList(List<String> holderIDCardNoList){
this.holderIDCardNoList = holderIDCardNoList;
return this;
}
/**
* 设置 取件人姓名
* @param pickerName
*/
public PrintWaitQueueQuery pickerName(String pickerName){
setPickerName(pickerName);
return this;
}
/**
* 设置 取件人姓名
* @param pickerNameList
*/
public PrintWaitQueueQuery pickerNameList(List<String> pickerNameList){
this.pickerNameList = pickerNameList;
return this;
}
/**
* 设置 取件人证件号码
* @param pickerIDCardNo
*/
public PrintWaitQueueQuery pickerIDCardNo(String pickerIDCardNo){
setPickerIDCardNo(pickerIDCardNo);
return this;
}
/**
* 设置 取件人证件号码
* @param pickerIDCardNoList
*/
public PrintWaitQueueQuery pickerIDCardNoList(List<String> pickerIDCardNoList){
this.pickerIDCardNoList = pickerIDCardNoList;
return this;
}
/**
* 设置 证件类型1正本2副本
* @param certificateType
*/
public PrintWaitQueueQuery certificateType(Integer certificateType){
setCertificateType(certificateType);
return this;
}
/**
* 设置 开始 证件类型1正本2副本
* @param certificateTypeStart
*/
public PrintWaitQueueQuery certificateTypeStart(Integer certificateTypeStart){
this.certificateTypeStart = certificateTypeStart;
return this;
}
/**
* 设置 结束 证件类型1正本2副本
* @param certificateTypeEnd
*/
public PrintWaitQueueQuery certificateTypeEnd(Integer certificateTypeEnd){
this.certificateTypeEnd = certificateTypeEnd;
return this;
}
/**
* 设置 增加 证件类型1正本2副本
* @param certificateTypeIncrement
*/
public PrintWaitQueueQuery certificateTypeIncrement(Integer certificateTypeIncrement){
this.certificateTypeIncrement = certificateTypeIncrement;
return this;
}
/**
* 设置 证件类型1正本2副本
* @param certificateTypeList
*/
public PrintWaitQueueQuery certificateTypeList(List<Integer> certificateTypeList){
this.certificateTypeList = certificateTypeList;
return this;
}
/**
* 设置 证件预览地址
* @param previewUrl
*/
public PrintWaitQueueQuery previewUrl(String previewUrl){
setPreviewUrl(previewUrl);
return this;
}
/**
* 设置 证件预览地址
* @param previewUrlList
*/
public PrintWaitQueueQuery previewUrlList(List<String> previewUrlList){
this.previewUrlList = previewUrlList;
return this;
}
/**
* 设置 证件附件地址
* @param certificateUrl
*/
public PrintWaitQueueQuery certificateUrl(String certificateUrl){
setCertificateUrl(certificateUrl);
return this;
}
/**
* 设置 证件附件地址
* @param certificateUrlList
*/
public PrintWaitQueueQuery certificateUrlList(List<String> certificateUrlList){
this.certificateUrlList = certificateUrlList;
return this;
}
/**
* 设置 是否打印0否1是
* @param printStatus
*/
public PrintWaitQueueQuery printStatus(Integer printStatus){
setPrintStatus(printStatus);
return this;
}
/**
* 设置 开始 是否打印0否1是
* @param printStatusStart
*/
public PrintWaitQueueQuery printStatusStart(Integer printStatusStart){
this.printStatusStart = printStatusStart;
return this;
}
/**
* 设置 结束 是否打印0否1是
* @param printStatusEnd
*/
public PrintWaitQueueQuery printStatusEnd(Integer printStatusEnd){
this.printStatusEnd = printStatusEnd;
return this;
}
/**
* 设置 增加 是否打印0否1是
* @param printStatusIncrement
*/
public PrintWaitQueueQuery printStatusIncrement(Integer printStatusIncrement){
this.printStatusIncrement = printStatusIncrement;
return this;
}
/**
* 设置 是否打印0否1是
* @param printStatusList
*/
public PrintWaitQueueQuery printStatusList(List<Integer> printStatusList){
this.printStatusList = printStatusList;
return this;
}
/**
* 设置 创建用户
* @param createUserId
*/
public PrintWaitQueueQuery createUserId(Long createUserId){
setCreateUserId(createUserId);
return this;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
public PrintWaitQueueQuery createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
return this;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public PrintWaitQueueQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
return this;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public PrintWaitQueueQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
return this;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
public PrintWaitQueueQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
return this;
}
/**
* 设置 更新用户
* @param updateUserId
*/
public PrintWaitQueueQuery updateUserId(Long updateUserId){
setUpdateUserId(updateUserId);
return this;
}
/**
* 设置 开始 更新用户
* @param updateUserIdStart
*/
public PrintWaitQueueQuery updateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart;
return this;
}
/**
* 设置 结束 更新用户
* @param updateUserIdEnd
*/
public PrintWaitQueueQuery updateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd;
return this;
}
/**
* 设置 增加 更新用户
* @param updateUserIdIncrement
*/
public PrintWaitQueueQuery updateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement;
return this;
}
/**
* 设置 更新用户
* @param updateUserIdList
*/
public PrintWaitQueueQuery updateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList;
return this;
}
/**
* 设置 证照目录ID
* @param catalogId
*/
public PrintWaitQueueQuery catalogId(Long catalogId){
setCatalogId(catalogId);
return this;
}
/**
* 设置 开始 证照目录ID
* @param catalogIdStart
*/
public PrintWaitQueueQuery catalogIdStart(Long catalogIdStart){
this.catalogIdStart = catalogIdStart;
return this;
}
/**
* 设置 结束 证照目录ID
* @param catalogIdEnd
*/
public PrintWaitQueueQuery catalogIdEnd(Long catalogIdEnd){
this.catalogIdEnd = catalogIdEnd;
return this;
}
/**
* 设置 增加 证照目录ID
* @param catalogIdIncrement
*/
public PrintWaitQueueQuery catalogIdIncrement(Long catalogIdIncrement){
this.catalogIdIncrement = catalogIdIncrement;
return this;
}
/**
* 设置 证照目录ID
* @param catalogIdList
*/
public PrintWaitQueueQuery catalogIdList(List<Long> catalogIdList){
this.catalogIdList = catalogIdList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
*/
public List<PrintWaitQueueQuery> getOrConditionList(){
return this.orConditionList;
}
/**
* 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @param orConditionList
*/
public void setOrConditionList(List<PrintWaitQueueQuery> orConditionList){
this.orConditionList = orConditionList;
}
/**
* 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList
*/
public List<PrintWaitQueueQuery> getAndConditionList(){
return this.andConditionList;
}
/**
* 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList
*/
public void setAndConditionList(List<PrintWaitQueueQuery> andConditionList){
this.andConditionList = andConditionList;
}
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/RetainLogEntity.java
View file @ 8cac55a4
...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel; ...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.record.model.vo.RetainLogVo; import com.mortals.xhx.module.record.model.vo.RetainLogVo;
/** /**
* 证照持有实体对象 * 证照持有实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-10-18 * @date 2022-10-22
*/ */
public class RetainLogEntity extends RetainLogVo { public class RetainLogEntity extends RetainLogVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -19,27 +19,22 @@ public class RetainLogEntity extends RetainLogVo { ...@@ -19,27 +19,22 @@ public class RetainLogEntity extends RetainLogVo {
/** /**
* 证照目录编号 * 证照目录编号
*/ */
@Excel(name = "证照目录编号")
private String catalogCode; private String catalogCode;
/** /**
* 证照名称 * 证照名称
*/ */
@Excel(name = "证照名称")
private String certificateName; private String certificateName;
/** /**
* 证照编号 * 证照编号
*/ */
@Excel(name = "证照编号")
private String certificateCode; private String certificateCode;
/** /**
* 企业名称 * 企业名称
*/ */
@Excel(name = "企业名称") private String enterpriseName;
private String enterpriseNam;
/** /**
* 持有者姓名 * 持有者姓名
*/ */
@Excel(name = "持有者姓名")
private String holderName; private String holderName;
/** /**
* 持有者证件号码 * 持有者证件号码
...@@ -119,15 +114,15 @@ public class RetainLogEntity extends RetainLogVo { ...@@ -119,15 +114,15 @@ public class RetainLogEntity extends RetainLogVo {
* 获取 企业名称 * 获取 企业名称
* @return String * @return String
*/ */
public String getEnterpriseNam(){ public String getEnterpriseName(){
return enterpriseNam; return enterpriseName;
} }
/** /**
* 设置 企业名称 * 设置 企业名称
* @param enterpriseNam * @param enterpriseName
*/ */
public void setEnterpriseNam(String enterpriseNam){ public void setEnterpriseName(String enterpriseName){
this.enterpriseNam = enterpriseNam; this.enterpriseName = enterpriseName;
} }
/** /**
* 获取 持有者姓名 * 获取 持有者姓名
...@@ -266,7 +261,7 @@ public class RetainLogEntity extends RetainLogVo { ...@@ -266,7 +261,7 @@ public class RetainLogEntity extends RetainLogVo {
sb.append(",catalogCode:").append(getCatalogCode()); sb.append(",catalogCode:").append(getCatalogCode());
sb.append(",certificateName:").append(getCertificateName()); sb.append(",certificateName:").append(getCertificateName());
sb.append(",certificateCode:").append(getCertificateCode()); sb.append(",certificateCode:").append(getCertificateCode());
sb.append(",enterpriseNam:").append(getEnterpriseNam()); sb.append(",enterpriseName:").append(getEnterpriseName());
sb.append(",holderName:").append(getHolderName()); sb.append(",holderName:").append(getHolderName());
sb.append(",holderIDCardNo:").append(getHolderIDCardNo()); sb.append(",holderIDCardNo:").append(getHolderIDCardNo());
sb.append(",certificateStatus:").append(getCertificateStatus()); sb.append(",certificateStatus:").append(getCertificateStatus());
...@@ -286,7 +281,7 @@ public class RetainLogEntity extends RetainLogVo { ...@@ -286,7 +281,7 @@ public class RetainLogEntity extends RetainLogVo {
this.certificateCode = ""; this.certificateCode = "";
this.enterpriseNam = ""; this.enterpriseName = "";
this.holderName = ""; this.holderName = "";
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/RetainLogQuery.java
View file @ 8cac55a4
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.record.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.record.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.record.model.RetainLogEntity; import com.mortals.xhx.module.record.model.RetainLogEntity;
/** /**
* 证照持有查询对象 * 证照持有查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-10-18 * @date 2022-10-22
*/ */
public class RetainLogQuery extends RetainLogEntity { public class RetainLogQuery extends RetainLogEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -31,7 +31,7 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -31,7 +31,7 @@ public class RetainLogQuery extends RetainLogEntity {
private List<String> certificateCodeList; private List<String> certificateCodeList;
/** 企业名称 */ /** 企业名称 */
private List<String> enterpriseNamList; private List<String> enterpriseNameList;
/** 持有者姓名 */ /** 持有者姓名 */
private List<String> holderNameList; private List<String> holderNameList;
...@@ -248,18 +248,18 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -248,18 +248,18 @@ public class RetainLogQuery extends RetainLogEntity {
} }
/** /**
* 获取 企业名称 * 获取 企业名称
* @return enterpriseNamList * @return enterpriseNameList
*/ */
public List<String> getEnterpriseNamList(){ public List<String> getEnterpriseNameList(){
return this.enterpriseNamList; return this.enterpriseNameList;
} }
/** /**
* 设置 企业名称 * 设置 企业名称
* @param enterpriseNamList * @param enterpriseNameList
*/ */
public void setEnterpriseNamList(List<String> enterpriseNamList){ public void setEnterpriseNameList(List<String> enterpriseNameList){
this.enterpriseNamList = enterpriseNamList; this.enterpriseNameList = enterpriseNameList;
} }
/** /**
* 获取 持有者姓名 * 获取 持有者姓名
...@@ -874,19 +874,19 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -874,19 +874,19 @@ public class RetainLogQuery extends RetainLogEntity {
/** /**
* 设置 企业名称 * 设置 企业名称
* @param enterpriseNam * @param enterpriseName
*/ */
public RetainLogQuery enterpriseNam(String enterpriseNam){ public RetainLogQuery enterpriseName(String enterpriseName){
setEnterpriseNam(enterpriseNam); setEnterpriseName(enterpriseName);
return this; return this;
} }
/** /**
* 设置 企业名称 * 设置 企业名称
* @param enterpriseNamList * @param enterpriseNameList
*/ */
public RetainLogQuery enterpriseNamList(List<String> enterpriseNamList){ public RetainLogQuery enterpriseNameList(List<String> enterpriseNameList){
this.enterpriseNamList = enterpriseNamList; this.enterpriseNameList = enterpriseNameList;
return this; return this;
} }
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/vo/PrintWaitQueueVo.java 0 → 100644
View file @ 8cac55a4
package com.mortals.xhx.module.record.model.vo;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.record.model.PrintWaitQueueEntity;
import java.util.ArrayList;
import java.util.List;
/**
* 证照打印记录视图对象
*
* @author zxfei
* @date 2022-10-22
*/
public class PrintWaitQueueVo extends BaseEntityLong {
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/service/ApplyLogService.java
View file @ 8cac55a4
...@@ -49,4 +49,6 @@ public interface ApplyLogService extends ICRUDService<ApplyLogEntity,Long>{ ...@@ -49,4 +49,6 @@ public interface ApplyLogService extends ICRUDService<ApplyLogEntity,Long>{
* @return * @return
*/ */
void generateAll(ApplyLogEntity applyLogEntity, Context context) throws AppException; void generateAll(ApplyLogEntity applyLogEntity, Context context) throws AppException;
void printApplyLog(Long id);
} }
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/service/PrintWaitQueueService.java 0 → 100644
View file @ 8cac55a4
package com.mortals.xhx.module.record.service;
import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.record.model.PrintWaitQueueEntity;
/**
* PrintWaitQueueService
*
* 证照打印记录 service接口
*
* @author zxfei
* @date 2022-10-22
*/
public interface PrintWaitQueueService extends ICRUDService<PrintWaitQueueEntity,Long>{
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/ApplyLogServiceImpl.java
View file @ 8cac55a4
...@@ -123,7 +123,7 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap ...@@ -123,7 +123,7 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
if(StringUtils.isEmpty(entity.getPrivateID())){ if(StringUtils.isEmpty(entity.getPrivateID())){
throw new AppException("专网ID不能为空"); throw new AppException("专网ID不能为空");
} }
if(StringUtils.isEmpty(entity.getEnterpriseNam())){ if(StringUtils.isEmpty(entity.getEnterpriseName())){
throw new AppException("企业名称不能为空"); throw new AppException("企业名称不能为空");
} }
if(StringUtils.isEmpty(entity.getHolderName())){ if(StringUtils.isEmpty(entity.getHolderName())){
...@@ -212,12 +212,37 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap ...@@ -212,12 +212,37 @@ public class ApplyLogServiceImpl extends AbstractCRUDServiceImpl<ApplyLogDao, Ap
retainLogService.creatRetainLog(applyLogEntity,context); retainLogService.creatRetainLog(applyLogEntity,context);
} }
@Override
public void printApplyLog(Long id) {
}
private String preview(DocTemplateVO docTemplate,Context context){ private String preview(DocTemplateVO docTemplate,Context context){
String rootPath = this.filePath.endsWith("/") ? this.filePath : this.filePath + "/"; String rootPath = this.filePath.endsWith("/") ? this.filePath : this.filePath + "/";
//转换表单参数为map集合 //转换表单参数为map集合
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
ConfigureBuilder builder = Configure.builder(); ConfigureBuilder builder = Configure.builder();
builder.buildGrammerRegex(RegexUtils.createGeneral("{{", "}}")); builder.buildGrammerRegex(RegexUtils.createGeneral("{{", "}}"));
String docTemp = "{\n" +
" \"i_1_卫\":\"川\",\n" +
" \"i_2_字\":\"2022\",\n" +
" \"i_3_号\":\"10\",\n" +
" \"i_4_单位名称\":\"成都壹糖文化传播有限公司\",\n" +
" \"i_5_法定代表人\":\"廖至敬\",\n" +
" \"i_6_地址\":\"成都市武侯区晋吉南路98号\",\n" +
" \"i_7_许可项目\":\"奶油蛋糕、生日蛋糕、水果蛋糕、奶茶、鲜切水果\",\n" +
" \"i_8_年始\":\"2021\",\n" +
" \"i_9_月始\":\"01\",\n" +
" \"i_10_日始\":\"01\",\n" +
" \"i_11_年止\":\"2023\",\n" +
" \"i_12_月止\":\"12\",\n" +
" \"i_13_日止\":\"31\",\n" +
" \"i_14_年\":\"2020\",\n" +
" \"i_15_月\":\"12\",\n" +
" \"i_16_日\":\"30\",\n" +
" \"@image_1_照片\":\"file/uploadfile/test.jpg\"\n" +
"}";
docTemplate.setFormContent(docTemp);
try { try {
Map<String, Object> data = mapper.readValue(docTemplate.getFormContent(), Map.class); Map<String, Object> data = mapper.readValue(docTemplate.getFormContent(), Map.class);
//遍历查看是否有图片数据，多选框 //遍历查看是否有图片数据，多选框
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/PrintLogServiceImpl.java
View file @ 8cac55a4
...@@ -49,7 +49,7 @@ public class PrintLogServiceImpl extends AbstractCRUDServiceImpl<PrintLogDao, Pr ...@@ -49,7 +49,7 @@ public class PrintLogServiceImpl extends AbstractCRUDServiceImpl<PrintLogDao, Pr
condition.append(entity.getQuery()).append("%"); condition.append(entity.getQuery()).append("%");
PrintLogQuery condition1 = new PrintLogQuery(); PrintLogQuery condition1 = new PrintLogQuery();
PrintLogQuery condition2 = new PrintLogQuery(); PrintLogQuery condition2 = new PrintLogQuery();
condition1.setEnterpriseNam(condition.toString()); condition1.setEnterpriseName(condition.toString());
condition2.setPickerName(condition.toString()); condition2.setPickerName(condition.toString());
List<PrintLogQuery> orConditionList = new ArrayList<>(); List<PrintLogQuery> orConditionList = new ArrayList<>();
orConditionList.add(condition1); orConditionList.add(condition1);
...@@ -76,7 +76,7 @@ public class PrintLogServiceImpl extends AbstractCRUDServiceImpl<PrintLogDao, Pr ...@@ -76,7 +76,7 @@ public class PrintLogServiceImpl extends AbstractCRUDServiceImpl<PrintLogDao, Pr
} }
printLogEntity.setCertificateName(applyLogEntity.getCertificateName()); printLogEntity.setCertificateName(applyLogEntity.getCertificateName());
printLogEntity.setCertificateCode(applyLogEntity.getCertificateCode()); printLogEntity.setCertificateCode(applyLogEntity.getCertificateCode());
printLogEntity.setEnterpriseNam(applyLogEntity.getEnterpriseNam()); printLogEntity.setEnterpriseName(applyLogEntity.getEnterpriseName());
printLogEntity.setHolderName(applyLogEntity.getHolderName()); printLogEntity.setHolderName(applyLogEntity.getHolderName());
printLogEntity.setHolderIDCardNo(applyLogEntity.getHolderIDCardNo()); printLogEntity.setHolderIDCardNo(applyLogEntity.getHolderIDCardNo());
printLogEntity.setPrintStatus(PrintStatus.SUCCESS.getValue()); printLogEntity.setPrintStatus(PrintStatus.SUCCESS.getValue());
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/PrintWaitQueueServiceImpl.java 0 → 100644
View file @ 8cac55a4
package com.mortals.xhx.module.record.service.impl;
import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.xhx.module.record.dao.PrintWaitQueueDao;
import com.mortals.xhx.module.record.model.PrintWaitQueueEntity;
import com.mortals.xhx.module.record.service.PrintWaitQueueService;
/**
* PrintWaitQueueService
* 证照打印记录 service实现
*
* @author zxfei
* @date 2022-10-22
*/
@Service("printWaitQueueService")
public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWaitQueueDao, PrintWaitQueueEntity, Long> implements PrintWaitQueueService {
}
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/RetainLogServiceImpl.java
View file @ 8cac55a4
...@@ -72,7 +72,7 @@ public class RetainLogServiceImpl extends AbstractCRUDServiceImpl<RetainLogDao, ...@@ -72,7 +72,7 @@ public class RetainLogServiceImpl extends AbstractCRUDServiceImpl<RetainLogDao,
} }
retainLogEntity.setCertificateName(applyLogEntity.getCertificateName()); retainLogEntity.setCertificateName(applyLogEntity.getCertificateName());
retainLogEntity.setCertificateCode(applyLogEntity.getCertificateCode()); retainLogEntity.setCertificateCode(applyLogEntity.getCertificateCode());
retainLogEntity.setEnterpriseNam(applyLogEntity.getEnterpriseNam()); retainLogEntity.setEnterpriseName(applyLogEntity.getEnterpriseName());
retainLogEntity.setHolderName(applyLogEntity.getHolderName()); retainLogEntity.setHolderName(applyLogEntity.getHolderName());
retainLogEntity.setHolderIDCardNo(applyLogEntity.getHolderIDCardNo()); retainLogEntity.setHolderIDCardNo(applyLogEntity.getHolderIDCardNo());
retainLogEntity.setCertificateStatus(CertificateStatus.NORMAL.getValue()); retainLogEntity.setCertificateStatus(CertificateStatus.NORMAL.getValue());
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/web/PrintWaitQueueController.java 0 → 100644
View file @ 8cac55a4
package com.mortals.xhx.module.record.web;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.mortals.framework.model.Context;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.module.record.model.PrintWaitQueueEntity;
import com.mortals.xhx.module.record.service.PrintWaitQueueService;
import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject;
import java.util.Arrays;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*;
/**
*
* 证照打印记录
*
* @author zxfei
* @date 2022-10-22
*/
@RestController
@RequestMapping("print/wait/queue")
public class PrintWaitQueueController extends BaseCRUDJsonBodyMappingController<PrintWaitQueueService,PrintWaitQueueEntity,Long> {
@Autowired
private ParamService paramService;
public PrintWaitQueueController(){
super.setModuleDesc( "证照打印记录");
}
@Override
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "certificateType", paramService.getParamBySecondOrganize("PrintWaitQueue","certificateType"));
this.addDict(model, "printStatus", paramService.getParamBySecondOrganize("PrintWaitQueue","printStatus"));
super.init(model, context);
}
}
\ No newline at end of file
certificate-manager/src/main/resources/sqlmap/module/record/ApplyLogMapper.xml
View file @ 8cac55a4
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd"> "mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.record.dao.ibatis.ApplyLogDaoImpl"> <mapper namespace="com.mortals.xhx.module.record.dao.ibatis.ApplyLogDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
<resultMap type="ApplyLogEntity" id="ApplyLogEntity-Map"> <resultMap type="ApplyLogEntity" id="ApplyLogEntity-Map">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="catalogId" column="catalogId" />
<result property="certificateCode" column="certificateCode" /> <result property="certificateCode" column="certificateCode" />
<result property="certificateName" column="certificateName" /> <result property="certificateName" column="certificateName" />
<result property="issueTime" column="issueTime" /> <result property="issueTime" column="issueTime" />
...@@ -15,19 +16,21 @@ ...@@ -15,19 +16,21 @@
<result property="holderIdType" column="holderIdType" /> <result property="holderIdType" column="holderIdType" />
<result property="holderName" column="holderName" /> <result property="holderName" column="holderName" />
<result property="holderIDCardNo" column="holderIDCardNo" /> <result property="holderIDCardNo" column="holderIDCardNo" />
<result property="enterpriseNam" column="enterpriseNam" /> <result property="enterpriseName" column="enterpriseName" />
<result property="validityStart" column="validityStart" /> <result property="validityStart" column="validityStart" />
<result property="validityEnd" column="validityEnd" /> <result property="validityEnd" column="validityEnd" />
<result property="privateID" column="privateID" /> <result property="privateID" column="privateID" />
<result property="originalUrl" column="originalUrl" /> <result property="originalUrl" column="originalUrl" />
<result property="oriPreview" column="oriPreview" />
<result property="oriFormContent" column="oriFormContent" /> <result property="oriFormContent" column="oriFormContent" />
<result property="duplicateUrl" column="duplicateUrl" /> <result property="duplicateUrl" column="duplicateUrl" />
<result property="dupPreview" column="dupPreview" />
<result property="dupFormContent" column="dupFormContent" /> <result property="dupFormContent" column="dupFormContent" />
<result property="generateStatus" column="generateStatus" />
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="catalogId" column="catalogId" />
</resultMap> </resultMap>
...@@ -38,6 +41,9 @@ ...@@ -38,6 +41,9 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id, a.id,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('catalogId') or colPickMode == 1 and data.containsKey('catalogId')))">
a.catalogId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('certificateCode') or colPickMode == 1 and data.containsKey('certificateCode')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('certificateCode') or colPickMode == 1 and data.containsKey('certificateCode')))">
a.certificateCode, a.certificateCode,
</if> </if>
...@@ -65,8 +71,8 @@ ...@@ -65,8 +71,8 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('holderIDCardNo') or colPickMode == 1 and data.containsKey('holderIDCardNo')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('holderIDCardNo') or colPickMode == 1 and data.containsKey('holderIDCardNo')))">
a.holderIDCardNo, a.holderIDCardNo,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('enterpriseNam') or colPickMode == 1 and data.containsKey('enterpriseNam')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('enterpriseName') or colPickMode == 1 and data.containsKey('enterpriseName')))">
a.enterpriseNam, a.enterpriseName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('validityStart') or colPickMode == 1 and data.containsKey('validityStart')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('validityStart') or colPickMode == 1 and data.containsKey('validityStart')))">
a.validityStart, a.validityStart,
...@@ -80,15 +86,24 @@ ...@@ -80,15 +86,24 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('originalUrl') or colPickMode == 1 and data.containsKey('originalUrl')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('originalUrl') or colPickMode == 1 and data.containsKey('originalUrl')))">
a.originalUrl, a.originalUrl,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('oriPreview') or colPickMode == 1 and data.containsKey('oriPreview')))">
a.oriPreview,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('oriFormContent') or colPickMode == 1 and data.containsKey('oriFormContent')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('oriFormContent') or colPickMode == 1 and data.containsKey('oriFormContent')))">
a.oriFormContent, a.oriFormContent,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('duplicateUrl') or colPickMode == 1 and data.containsKey('duplicateUrl')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('duplicateUrl') or colPickMode == 1 and data.containsKey('duplicateUrl')))">
a.duplicateUrl, a.duplicateUrl,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('dupPreview') or colPickMode == 1 and data.containsKey('dupPreview')))">
a.dupPreview,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('dupFormContent') or colPickMode == 1 and data.containsKey('dupFormContent')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('dupFormContent') or colPickMode == 1 and data.containsKey('dupFormContent')))">
a.dupFormContent, a.dupFormContent,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('generateStatus') or colPickMode == 1 and data.containsKey('generateStatus')))">
a.generateStatus,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId, a.createUserId,
</if> </if>
...@@ -101,26 +116,23 @@ ...@@ -101,26 +116,23 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('catalogId') or colPickMode == 1 and data.containsKey('catalogId')))">
a.catalogId,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="ApplyLogEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="ApplyLogEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_apply_log insert into mortals_xhx_apply_log
(certificateCode,certificateName,issueTime,pickerName,pickerIDCardNo,holderType,holderIdType,holderName,holderIDCardNo,enterpriseNam,validityStart,validityEnd,privateID,originalUrl,oriFormContent,duplicateUrl,dupFormContent,createUserId,createTime,updateUserId,updateTime,catalogId) (catalogId,certificateCode,certificateName,issueTime,pickerName,pickerIDCardNo,holderType,holderIdType,holderName,holderIDCardNo,enterpriseName,validityStart,validityEnd,privateID,originalUrl,oriPreview,oriFormContent,duplicateUrl,dupPreview,dupFormContent,generateStatus,createUserId,createTime,updateUserId,updateTime)
VALUES VALUES
(#{certificateCode},#{certificateName},#{issueTime},#{pickerName},#{pickerIDCardNo},#{holderType},#{holderIdType},#{holderName},#{holderIDCardNo},#{enterpriseNam},#{validityStart},#{validityEnd},#{privateID},#{originalUrl},#{oriFormContent},#{duplicateUrl},#{dupFormContent},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{catalogId}) (#{catalogId},#{certificateCode},#{certificateName},#{issueTime},#{pickerName},#{pickerIDCardNo},#{holderType},#{holderIdType},#{holderName},#{holderIDCardNo},#{enterpriseName},#{validityStart},#{validityEnd},#{privateID},#{originalUrl},#{oriPreview},#{oriFormContent},#{duplicateUrl},#{dupPreview},#{dupFormContent},#{generateStatus},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_apply_log insert into mortals_xhx_apply_log
(certificateCode,certificateName,issueTime,pickerName,pickerIDCardNo,holderType,holderIdType,holderName,holderIDCardNo,enterpriseNam,validityStart,validityEnd,privateID,originalUrl,oriFormContent,duplicateUrl,dupFormContent,createUserId,createTime,updateUserId,updateTime,catalogId) (catalogId,certificateCode,certificateName,issueTime,pickerName,pickerIDCardNo,holderType,holderIdType,holderName,holderIDCardNo,enterpriseName,validityStart,validityEnd,privateID,originalUrl,oriPreview,oriFormContent,duplicateUrl,dupPreview,dupFormContent,generateStatus,createUserId,createTime,updateUserId,updateTime)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.certificateCode},#{item.certificateName},#{item.issueTime},#{item.pickerName},#{item.pickerIDCardNo},#{item.holderType},#{item.holderIdType},#{item.holderName},#{item.holderIDCardNo},#{item.enterpriseNam},#{item.validityStart},#{item.validityEnd},#{item.privateID},#{item.originalUrl},#{item.oriFormContent},#{item.duplicateUrl},#{item.dupFormContent},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.catalogId}) (#{item.catalogId},#{item.certificateCode},#{item.certificateName},#{item.issueTime},#{item.pickerName},#{item.pickerIDCardNo},#{item.holderType},#{item.holderIdType},#{item.holderName},#{item.holderIDCardNo},#{item.enterpriseName},#{item.validityStart},#{item.validityEnd},#{item.privateID},#{item.originalUrl},#{item.oriPreview},#{item.oriFormContent},#{item.duplicateUrl},#{item.dupPreview},#{item.dupFormContent},#{item.generateStatus},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach> </foreach>
</insert> </insert>
...@@ -130,6 +142,12 @@ ...@@ -130,6 +142,12 @@
update mortals_xhx_apply_log as a update mortals_xhx_apply_log as a
set set
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('catalogId')) or (colPickMode==1 and !data.containsKey('catalogId'))">
a.catalogId=#{data.catalogId},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogIdIncrement')) or (colPickMode==1 and !data.containsKey('catalogIdIncrement'))">
a.catalogId=ifnull(a.catalogId,0) + #{data.catalogIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('certificateCode')) or (colPickMode==1 and !data.containsKey('certificateCode'))"> <if test="(colPickMode==0 and data.containsKey('certificateCode')) or (colPickMode==1 and !data.containsKey('certificateCode'))">
a.certificateCode=#{data.certificateCode}, a.certificateCode=#{data.certificateCode},
</if> </if>
...@@ -163,8 +181,8 @@ ...@@ -163,8 +181,8 @@
<if test="(colPickMode==0 and data.containsKey('holderIDCardNo')) or (colPickMode==1 and !data.containsKey('holderIDCardNo'))"> <if test="(colPickMode==0 and data.containsKey('holderIDCardNo')) or (colPickMode==1 and !data.containsKey('holderIDCardNo'))">
a.holderIDCardNo=#{data.holderIDCardNo}, a.holderIDCardNo=#{data.holderIDCardNo},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('enterpriseNam')) or (colPickMode==1 and !data.containsKey('enterpriseNam'))"> <if test="(colPickMode==0 and data.containsKey('enterpriseName')) or (colPickMode==1 and !data.containsKey('enterpriseName'))">
a.enterpriseNam=#{data.enterpriseNam}, a.enterpriseName=#{data.enterpriseName},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('validityStart')) or (colPickMode==1 and !data.containsKey('validityStart'))"> <if test="(colPickMode==0 and data.containsKey('validityStart')) or (colPickMode==1 and !data.containsKey('validityStart'))">
a.validityStart=#{data.validityStart}, a.validityStart=#{data.validityStart},
...@@ -178,15 +196,27 @@ ...@@ -178,15 +196,27 @@
<if test="(colPickMode==0 and data.containsKey('originalUrl')) or (colPickMode==1 and !data.containsKey('originalUrl'))"> <if test="(colPickMode==0 and data.containsKey('originalUrl')) or (colPickMode==1 and !data.containsKey('originalUrl'))">
a.originalUrl=#{data.originalUrl}, a.originalUrl=#{data.originalUrl},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('oriPreview')) or (colPickMode==1 and !data.containsKey('oriPreview'))">
a.oriPreview=#{data.oriPreview},
</if>
<if test="(colPickMode==0 and data.containsKey('oriFormContent')) or (colPickMode==1 and !data.containsKey('oriFormContent'))"> <if test="(colPickMode==0 and data.containsKey('oriFormContent')) or (colPickMode==1 and !data.containsKey('oriFormContent'))">
a.oriFormContent=#{data.oriFormContent}, a.oriFormContent=#{data.oriFormContent},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('duplicateUrl')) or (colPickMode==1 and !data.containsKey('duplicateUrl'))"> <if test="(colPickMode==0 and data.containsKey('duplicateUrl')) or (colPickMode==1 and !data.containsKey('duplicateUrl'))">
a.duplicateUrl=#{data.duplicateUrl}, a.duplicateUrl=#{data.duplicateUrl},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('dupPreview')) or (colPickMode==1 and !data.containsKey('dupPreview'))">
a.dupPreview=#{data.dupPreview},
</if>
<if test="(colPickMode==0 and data.containsKey('dupFormContent')) or (colPickMode==1 and !data.containsKey('dupFormContent'))"> <if test="(colPickMode==0 and data.containsKey('dupFormContent')) or (colPickMode==1 and !data.containsKey('dupFormContent'))">
a.dupFormContent=#{data.dupFormContent}, a.dupFormContent=#{data.dupFormContent},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('generateStatus')) or (colPickMode==1 and !data.containsKey('generateStatus'))">
a.generateStatus=#{data.generateStatus},
</if>
<if test="(colPickMode==0 and data.containsKey('generateStatusIncrement')) or (colPickMode==1 and !data.containsKey('generateStatusIncrement'))">
a.generateStatus=ifnull(a.generateStatus,0) + #{data.generateStatusIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))"> <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
a.createUserId=#{data.createUserId}, a.createUserId=#{data.createUserId},
</if> </if>
...@@ -205,12 +235,6 @@ ...@@ -205,12 +235,6 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('catalogId')) or (colPickMode==1 and !data.containsKey('catalogId'))">
a.catalogId=#{data.catalogId},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogIdIncrement')) or (colPickMode==1 and !data.containsKey('catalogIdIncrement'))">
a.catalogId=ifnull(a.catalogId,0) + #{data.catalogIdIncrement},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -223,6 +247,18 @@ ...@@ -223,6 +247,18 @@
<update id="updateBatch" parameterType="paramDto"> <update id="updateBatch" parameterType="paramDto">
update mortals_xhx_apply_log as a update mortals_xhx_apply_log as a
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<trim prefix="catalogId=(case" suffix="ELSE catalogId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('catalogId')) or (colPickMode==1 and !item.containsKey('catalogId'))">
when a.id=#{item.id} then #{item.catalogId}
</when>
<when test="(colPickMode==0 and item.containsKey('catalogIdIncrement')) or (colPickMode==1 and !item.containsKey('catalogIdIncrement'))">
when a.id=#{item.id} then ifnull(a.catalogId,0) + #{item.catalogIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="certificateCode=(case" suffix="ELSE certificateCode end),"> <trim prefix="certificateCode=(case" suffix="ELSE certificateCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('certificateCode')) or (colPickMode==1 and !item.containsKey('certificateCode'))"> <if test="(colPickMode==0 and item.containsKey('certificateCode')) or (colPickMode==1 and !item.containsKey('certificateCode'))">
...@@ -296,10 +332,10 @@ ...@@ -296,10 +332,10 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="enterpriseNam=(case" suffix="ELSE enterpriseNam end),"> <trim prefix="enterpriseName=(case" suffix="ELSE enterpriseName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('enterpriseNam')) or (colPickMode==1 and !item.containsKey('enterpriseNam'))"> <if test="(colPickMode==0 and item.containsKey('enterpriseName')) or (colPickMode==1 and !item.containsKey('enterpriseName'))">
when a.id=#{item.id} then #{item.enterpriseNam} when a.id=#{item.id} then #{item.enterpriseName}
</if> </if>
</foreach> </foreach>
</trim> </trim>
...@@ -331,6 +367,13 @@ ...@@ -331,6 +367,13 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="oriPreview=(case" suffix="ELSE oriPreview end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('oriPreview')) or (colPickMode==1 and !item.containsKey('oriPreview'))">
when a.id=#{item.id} then #{item.oriPreview}
</if>
</foreach>
</trim>
<trim prefix="oriFormContent=(case" suffix="ELSE oriFormContent end),"> <trim prefix="oriFormContent=(case" suffix="ELSE oriFormContent end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('oriFormContent')) or (colPickMode==1 and !item.containsKey('oriFormContent'))"> <if test="(colPickMode==0 and item.containsKey('oriFormContent')) or (colPickMode==1 and !item.containsKey('oriFormContent'))">
...@@ -345,12 +388,31 @@ ...@@ -345,12 +388,31 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="dupPreview=(case" suffix="ELSE dupPreview end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('dupPreview')) or (colPickMode==1 and !item.containsKey('dupPreview'))">
when a.id=#{item.id} then #{item.dupPreview}
</if>
</foreach>
</trim>
<trim prefix="dupFormContent=(case" suffix="ELSE dupFormContent end),"> <trim prefix="dupFormContent=(case" suffix="ELSE dupFormContent end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('dupFormContent')) or (colPickMode==1 and !item.containsKey('dupFormContent'))"> <if test="(colPickMode==0 and item.containsKey('dupFormContent')) or (colPickMode==1 and !item.containsKey('dupFormContent'))">
when a.id=#{item.id} then #{item.dupFormContent} when a.id=#{item.id} then #{item.dupFormContent}
</if> </if>
</foreach> </foreach>
</trim>
<trim prefix="generateStatus=(case" suffix="ELSE generateStatus end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('generateStatus')) or (colPickMode==1 and !item.containsKey('generateStatus'))">
when a.id=#{item.id} then #{item.generateStatus}
</when>
<when test="(colPickMode==0 and item.containsKey('generateStatusIncrement')) or (colPickMode==1 and !item.containsKey('generateStatusIncrement'))">
when a.id=#{item.id} then ifnull(a.generateStatus,0) + #{item.generateStatusIncrement}
</when>
</choose>
</foreach>
</trim> </trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),"> <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
...@@ -390,18 +452,6 @@ ...@@ -390,18 +452,6 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="catalogId=(case" suffix="ELSE catalogId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('catalogId')) or (colPickMode==1 and !item.containsKey('catalogId'))">
when a.id=#{item.id} then #{item.catalogId}
</when>
<when test="(colPickMode==0 and item.containsKey('catalogIdIncrement')) or (colPickMode==1 and !item.containsKey('catalogIdIncrement'))">
when a.id=#{item.id} then ifnull(a.catalogId,0) + #{item.catalogIdIncrement}
</when>
</choose>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -524,6 +574,27 @@ ...@@ -524,6 +574,27 @@
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd} ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if> </if>
<if test="conditionParamRef.containsKey('catalogId')">
<if test="conditionParamRef.catalogId != null ">
${_conditionType_} a.catalogId = #{${_conditionParam_}.catalogId}
</if>
<if test="conditionParamRef.catalogId == null">
${_conditionType_} a.catalogId is null
</if>
</if>
<if test="conditionParamRef.containsKey('catalogIdList')">
${_conditionType_} a.catalogId in
<foreach collection="conditionParamRef.catalogIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('catalogIdStart') and conditionParamRef.catalogIdStart != null">
${_conditionType_} a.catalogId <![CDATA[ >= ]]> #{${_conditionParam_}.catalogIdStart}
</if>
<if test="conditionParamRef.containsKey('catalogIdEnd') and conditionParamRef.catalogIdEnd != null">
${_conditionType_} a.catalogId <![CDATA[ <= ]]> #{${_conditionParam_}.catalogIdEnd}
</if>
<if test="conditionParamRef.containsKey('certificateCode')"> <if test="conditionParamRef.containsKey('certificateCode')">
<if test="conditionParamRef.certificateCode != null and conditionParamRef.certificateCode != ''"> <if test="conditionParamRef.certificateCode != null and conditionParamRef.certificateCode != ''">
...@@ -672,17 +743,17 @@ ...@@ -672,17 +743,17 @@
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('enterpriseNam')"> <if test="conditionParamRef.containsKey('enterpriseName')">
<if test="conditionParamRef.enterpriseNam != null and conditionParamRef.enterpriseNam != ''"> <if test="conditionParamRef.enterpriseName != null and conditionParamRef.enterpriseName != ''">
${_conditionType_} a.enterpriseNam like #{${_conditionParam_}.enterpriseNam} ${_conditionType_} a.enterpriseName like #{${_conditionParam_}.enterpriseName}
</if> </if>
<if test="conditionParamRef.enterpriseNam == null"> <if test="conditionParamRef.enterpriseName == null">
${_conditionType_} a.enterpriseNam is null ${_conditionType_} a.enterpriseName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('enterpriseNamList')"> <if test="conditionParamRef.containsKey('enterpriseNameList')">
${_conditionType_} a.enterpriseNam in ${_conditionType_} a.enterpriseName in
<foreach collection="conditionParamRef.enterpriseNamList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.enterpriseNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
...@@ -747,6 +818,21 @@ ...@@ -747,6 +818,21 @@
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('oriPreview')">
<if test="conditionParamRef.oriPreview != null and conditionParamRef.oriPreview != ''">
${_conditionType_} a.oriPreview like #{${_conditionParam_}.oriPreview}
</if>
<if test="conditionParamRef.oriPreview == null">
${_conditionType_} a.oriPreview is null
</if>
</if>
<if test="conditionParamRef.containsKey('oriPreviewList')">
${_conditionType_} a.oriPreview in
<foreach collection="conditionParamRef.oriPreviewList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('oriFormContent')"> <if test="conditionParamRef.containsKey('oriFormContent')">
<if test="conditionParamRef.oriFormContent != null and conditionParamRef.oriFormContent != ''"> <if test="conditionParamRef.oriFormContent != null and conditionParamRef.oriFormContent != ''">
${_conditionType_} a.oriFormContent like #{${_conditionParam_}.oriFormContent} ${_conditionType_} a.oriFormContent like #{${_conditionParam_}.oriFormContent}
...@@ -777,6 +863,21 @@ ...@@ -777,6 +863,21 @@
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('dupPreview')">
<if test="conditionParamRef.dupPreview != null and conditionParamRef.dupPreview != ''">
${_conditionType_} a.dupPreview like #{${_conditionParam_}.dupPreview}
</if>
<if test="conditionParamRef.dupPreview == null">
${_conditionType_} a.dupPreview is null
</if>
</if>
<if test="conditionParamRef.containsKey('dupPreviewList')">
${_conditionType_} a.dupPreview in
<foreach collection="conditionParamRef.dupPreviewList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dupFormContent')"> <if test="conditionParamRef.containsKey('dupFormContent')">
<if test="conditionParamRef.dupFormContent != null and conditionParamRef.dupFormContent != ''"> <if test="conditionParamRef.dupFormContent != null and conditionParamRef.dupFormContent != ''">
${_conditionType_} a.dupFormContent like #{${_conditionParam_}.dupFormContent} ${_conditionType_} a.dupFormContent like #{${_conditionParam_}.dupFormContent}
...@@ -791,6 +892,27 @@ ...@@ -791,6 +892,27 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('generateStatus')">
<if test="conditionParamRef.generateStatus != null ">
${_conditionType_} a.generateStatus = #{${_conditionParam_}.generateStatus}
</if>
<if test="conditionParamRef.generateStatus == null">
${_conditionType_} a.generateStatus is null
</if>
</if>
<if test="conditionParamRef.containsKey('generateStatusList')">
${_conditionType_} a.generateStatus in
<foreach collection="conditionParamRef.generateStatusList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('generateStatusStart') and conditionParamRef.generateStatusStart != null">
${_conditionType_} a.generateStatus <![CDATA[ >= ]]> #{${_conditionParam_}.generateStatusStart}
</if>
<if test="conditionParamRef.containsKey('generateStatusEnd') and conditionParamRef.generateStatusEnd != null">
${_conditionType_} a.generateStatus <![CDATA[ <= ]]> #{${_conditionParam_}.generateStatusEnd}
</if>
<if test="conditionParamRef.containsKey('createUserId')"> <if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null "> <if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId} ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
...@@ -863,27 +985,6 @@ ...@@ -863,27 +985,6 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('catalogId')">
<if test="conditionParamRef.catalogId != null ">
${_conditionType_} a.catalogId = #{${_conditionParam_}.catalogId}
</if>
<if test="conditionParamRef.catalogId == null">
${_conditionType_} a.catalogId is null
</if>
</if>
<if test="conditionParamRef.containsKey('catalogIdList')">
${_conditionType_} a.catalogId in
<foreach collection="conditionParamRef.catalogIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('catalogIdStart') and conditionParamRef.catalogIdStart != null">
${_conditionType_} a.catalogId <![CDATA[ >= ]]> #{${_conditionParam_}.catalogIdStart}
</if>
<if test="conditionParamRef.containsKey('catalogIdEnd') and conditionParamRef.catalogIdEnd != null">
${_conditionType_} a.catalogId <![CDATA[ <= ]]> #{${_conditionParam_}.catalogIdEnd}
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -902,6 +1003,11 @@ ...@@ -902,6 +1003,11 @@
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if> <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('catalogId')">
a.catalogId
<if test='orderCol.catalogId != null and "DESC".equalsIgnoreCase(orderCol.catalogId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('certificateCode')"> <if test="orderCol.containsKey('certificateCode')">
a.certificateCode a.certificateCode
<if test='orderCol.certificateCode != null and "DESC".equalsIgnoreCase(orderCol.certificateCode)'>DESC</if> <if test='orderCol.certificateCode != null and "DESC".equalsIgnoreCase(orderCol.certificateCode)'>DESC</if>
...@@ -947,9 +1053,9 @@ ...@@ -947,9 +1053,9 @@
<if test='orderCol.holderIDCardNo != null and "DESC".equalsIgnoreCase(orderCol.holderIDCardNo)'>DESC</if> <if test='orderCol.holderIDCardNo != null and "DESC".equalsIgnoreCase(orderCol.holderIDCardNo)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('enterpriseNam')"> <if test="orderCol.containsKey('enterpriseName')">
a.enterpriseNam a.enterpriseName
<if test='orderCol.enterpriseNam != null and "DESC".equalsIgnoreCase(orderCol.enterpriseNam)'>DESC</if> <if test='orderCol.enterpriseName != null and "DESC".equalsIgnoreCase(orderCol.enterpriseName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('validityStart')"> <if test="orderCol.containsKey('validityStart')">
...@@ -972,6 +1078,11 @@ ...@@ -972,6 +1078,11 @@
<if test='orderCol.originalUrl != null and "DESC".equalsIgnoreCase(orderCol.originalUrl)'>DESC</if> <if test='orderCol.originalUrl != null and "DESC".equalsIgnoreCase(orderCol.originalUrl)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('oriPreview')">
a.oriPreview
<if test='orderCol.oriPreview != null and "DESC".equalsIgnoreCase(orderCol.oriPreview)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('oriFormContent')"> <if test="orderCol.containsKey('oriFormContent')">
a.oriFormContent a.oriFormContent
<if test='orderCol.oriFormContent != null and "DESC".equalsIgnoreCase(orderCol.oriFormContent)'>DESC</if> <if test='orderCol.oriFormContent != null and "DESC".equalsIgnoreCase(orderCol.oriFormContent)'>DESC</if>
...@@ -982,11 +1093,21 @@ ...@@ -982,11 +1093,21 @@
<if test='orderCol.duplicateUrl != null and "DESC".equalsIgnoreCase(orderCol.duplicateUrl)'>DESC</if> <if test='orderCol.duplicateUrl != null and "DESC".equalsIgnoreCase(orderCol.duplicateUrl)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('dupPreview')">
a.dupPreview
<if test='orderCol.dupPreview != null and "DESC".equalsIgnoreCase(orderCol.dupPreview)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('dupFormContent')"> <if test="orderCol.containsKey('dupFormContent')">
a.dupFormContent a.dupFormContent
<if test='orderCol.dupFormContent != null and "DESC".equalsIgnoreCase(orderCol.dupFormContent)'>DESC</if> <if test='orderCol.dupFormContent != null and "DESC".equalsIgnoreCase(orderCol.dupFormContent)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('generateStatus')">
a.generateStatus
<if test='orderCol.generateStatus != null and "DESC".equalsIgnoreCase(orderCol.generateStatus)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createUserId')"> <if test="orderCol.containsKey('createUserId')">
a.createUserId a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if> <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
...@@ -1007,11 +1128,6 @@ ...@@ -1007,11 +1128,6 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('catalogId')">
a.catalogId
<if test='orderCol.catalogId != null and "DESC".equalsIgnoreCase(orderCol.catalogId)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
certificate-manager/src/main/resources/sqlmap/module/record/PrintLogMapper.xml
View file @ 8cac55a4
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd"> "mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.record.dao.ibatis.PrintLogDaoImpl"> <mapper namespace="com.mortals.xhx.module.record.dao.ibatis.PrintLogDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<result property="catalogCode" column="catalogCode" /> <result property="catalogCode" column="catalogCode" />
<result property="certificateName" column="certificateName" /> <result property="certificateName" column="certificateName" />
<result property="certificateCode" column="certificateCode" /> <result property="certificateCode" column="certificateCode" />
<result property="enterpriseNam" column="enterpriseNam" /> <result property="enterpriseName" column="enterpriseName" />
<result property="holderName" column="holderName" /> <result property="holderName" column="holderName" />
<result property="holderIDCardNo" column="holderIDCardNo" /> <result property="holderIDCardNo" column="holderIDCardNo" />
<result property="pickerName" column="pickerName" /> <result property="pickerName" column="pickerName" />
...@@ -43,8 +43,8 @@ ...@@ -43,8 +43,8 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('certificateCode') or colPickMode == 1 and data.containsKey('certificateCode')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('certificateCode') or colPickMode == 1 and data.containsKey('certificateCode')))">
a.certificateCode, a.certificateCode,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('enterpriseNam') or colPickMode == 1 and data.containsKey('enterpriseNam')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('enterpriseName') or colPickMode == 1 and data.containsKey('enterpriseName')))">
a.enterpriseNam, a.enterpriseName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('holderName') or colPickMode == 1 and data.containsKey('holderName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('holderName') or colPickMode == 1 and data.containsKey('holderName')))">
a.holderName, a.holderName,
...@@ -93,18 +93,18 @@ ...@@ -93,18 +93,18 @@
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="PrintLogEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="PrintLogEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_print_log insert into mortals_xhx_print_log
(catalogCode,certificateName,certificateCode,enterpriseNam,holderName,holderIDCardNo,pickerName,pickerIDCardNo,originalCount,duplicateCount,printStatus,printDate,deviceId,createUserId,createTime,updateUserId,updateTime,catalogId) (catalogCode,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,originalCount,duplicateCount,printStatus,printDate,deviceId,createUserId,createTime,updateUserId,updateTime,catalogId)
VALUES VALUES
(#{catalogCode},#{certificateName},#{certificateCode},#{enterpriseNam},#{holderName},#{holderIDCardNo},#{pickerName},#{pickerIDCardNo},#{originalCount},#{duplicateCount},#{printStatus},#{printDate},#{deviceId},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{catalogId}) (#{catalogCode},#{certificateName},#{certificateCode},#{enterpriseName},#{holderName},#{holderIDCardNo},#{pickerName},#{pickerIDCardNo},#{originalCount},#{duplicateCount},#{printStatus},#{printDate},#{deviceId},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{catalogId})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_print_log insert into mortals_xhx_print_log
(catalogCode,certificateName,certificateCode,enterpriseNam,holderName,holderIDCardNo,pickerName,pickerIDCardNo,originalCount,duplicateCount,printStatus,printDate,deviceId,createUserId,createTime,updateUserId,updateTime,catalogId) (catalogCode,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,originalCount,duplicateCount,printStatus,printDate,deviceId,createUserId,createTime,updateUserId,updateTime,catalogId)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.catalogCode},#{item.certificateName},#{item.certificateCode},#{item.enterpriseNam},#{item.holderName},#{item.holderIDCardNo},#{item.pickerName},#{item.pickerIDCardNo},#{item.originalCount},#{item.duplicateCount},#{item.printStatus},#{item.printDate},#{item.deviceId},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.catalogId}) (#{item.catalogCode},#{item.certificateName},#{item.certificateCode},#{item.enterpriseName},#{item.holderName},#{item.holderIDCardNo},#{item.pickerName},#{item.pickerIDCardNo},#{item.originalCount},#{item.duplicateCount},#{item.printStatus},#{item.printDate},#{item.deviceId},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.catalogId})
</foreach> </foreach>
</insert> </insert>
...@@ -123,8 +123,8 @@ ...@@ -123,8 +123,8 @@
<if test="(colPickMode==0 and data.containsKey('certificateCode')) or (colPickMode==1 and !data.containsKey('certificateCode'))"> <if test="(colPickMode==0 and data.containsKey('certificateCode')) or (colPickMode==1 and !data.containsKey('certificateCode'))">
a.certificateCode=#{data.certificateCode}, a.certificateCode=#{data.certificateCode},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('enterpriseNam')) or (colPickMode==1 and !data.containsKey('enterpriseNam'))"> <if test="(colPickMode==0 and data.containsKey('enterpriseName')) or (colPickMode==1 and !data.containsKey('enterpriseName'))">
a.enterpriseNam=#{data.enterpriseNam}, a.enterpriseName=#{data.enterpriseName},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('holderName')) or (colPickMode==1 and !data.containsKey('holderName'))"> <if test="(colPickMode==0 and data.containsKey('holderName')) or (colPickMode==1 and !data.containsKey('holderName'))">
a.holderName=#{data.holderName}, a.holderName=#{data.holderName},
...@@ -222,10 +222,10 @@ ...@@ -222,10 +222,10 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="enterpriseNam=(case" suffix="ELSE enterpriseNam end),"> <trim prefix="enterpriseName=(case" suffix="ELSE enterpriseName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('enterpriseNam')) or (colPickMode==1 and !item.containsKey('enterpriseNam'))"> <if test="(colPickMode==0 and item.containsKey('enterpriseName')) or (colPickMode==1 and !item.containsKey('enterpriseName'))">
when a.id=#{item.id} then #{item.enterpriseNam} when a.id=#{item.id} then #{item.enterpriseName}
</if> </if>
</foreach> </foreach>
</trim> </trim>
...@@ -530,17 +530,17 @@ ...@@ -530,17 +530,17 @@
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('enterpriseNam')"> <if test="conditionParamRef.containsKey('enterpriseName')">
<if test="conditionParamRef.enterpriseNam != null and conditionParamRef.enterpriseNam != ''"> <if test="conditionParamRef.enterpriseName != null and conditionParamRef.enterpriseName != ''">
${_conditionType_} a.enterpriseNam like #{${_conditionParam_}.enterpriseNam} ${_conditionType_} a.enterpriseName like #{${_conditionParam_}.enterpriseName}
</if> </if>
<if test="conditionParamRef.enterpriseNam == null"> <if test="conditionParamRef.enterpriseName == null">
${_conditionType_} a.enterpriseNam is null ${_conditionType_} a.enterpriseName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('enterpriseNamList')"> <if test="conditionParamRef.containsKey('enterpriseNameList')">
${_conditionType_} a.enterpriseNam in ${_conditionType_} a.enterpriseName in
<foreach collection="conditionParamRef.enterpriseNamList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.enterpriseNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
...@@ -829,9 +829,9 @@ ...@@ -829,9 +829,9 @@
<if test='orderCol.certificateCode != null and "DESC".equalsIgnoreCase(orderCol.certificateCode)'>DESC</if> <if test='orderCol.certificateCode != null and "DESC".equalsIgnoreCase(orderCol.certificateCode)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('enterpriseNam')"> <if test="orderCol.containsKey('enterpriseName')">
a.enterpriseNam a.enterpriseName
<if test='orderCol.enterpriseNam != null and "DESC".equalsIgnoreCase(orderCol.enterpriseNam)'>DESC</if> <if test='orderCol.enterpriseName != null and "DESC".equalsIgnoreCase(orderCol.enterpriseName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('holderName')"> <if test="orderCol.containsKey('holderName')">
......
certificate-manager/src/main/resources/sqlmap/module/record/PrintWaitQueueMapper.xml 0 → 100644
View file @ 8cac55a4
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.record.dao.ibatis.PrintWaitQueueDaoImpl">
<!-- 字段和属性映射 -->
<resultMap type="PrintWaitQueueEntity" id="PrintWaitQueueEntity-Map">
<id property="id" column="id" />
<result property="applyId" column="applyId" />
<result property="catalogCode" column="catalogCode" />
<result property="certificateName" column="certificateName" />
<result property="certificateCode" column="certificateCode" />
<result property="enterpriseName" column="enterpriseName" />
<result property="holderName" column="holderName" />
<result property="holderIDCardNo" column="holderIDCardNo" />
<result property="pickerName" column="pickerName" />
<result property="pickerIDCardNo" column="pickerIDCardNo" />
<result property="certificateType" column="certificateType" />
<result property="previewUrl" column="previewUrl" />
<result property="certificateUrl" column="certificateUrl" />
<result property="printStatus" column="printStatus" />
<result property="createUserId" column="createUserId" />
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
<result property="catalogId" column="catalogId" />
</resultMap>
<!-- 表所有列 -->
<sql id="_columns">
<trim suffixOverrides="," suffix="">
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('applyId') or colPickMode == 1 and data.containsKey('applyId')))">
a.applyId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('catalogCode') or colPickMode == 1 and data.containsKey('catalogCode')))">
a.catalogCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('certificateName') or colPickMode == 1 and data.containsKey('certificateName')))">
a.certificateName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('certificateCode') or colPickMode == 1 and data.containsKey('certificateCode')))">
a.certificateCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('enterpriseName') or colPickMode == 1 and data.containsKey('enterpriseName')))">
a.enterpriseName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('holderName') or colPickMode == 1 and data.containsKey('holderName')))">
a.holderName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('holderIDCardNo') or colPickMode == 1 and data.containsKey('holderIDCardNo')))">
a.holderIDCardNo,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('pickerName') or colPickMode == 1 and data.containsKey('pickerName')))">
a.pickerName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('pickerIDCardNo') or colPickMode == 1 and data.containsKey('pickerIDCardNo')))">
a.pickerIDCardNo,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('certificateType') or colPickMode == 1 and data.containsKey('certificateType')))">
a.certificateType,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('previewUrl') or colPickMode == 1 and data.containsKey('previewUrl')))">
a.previewUrl,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('certificateUrl') or colPickMode == 1 and data.containsKey('certificateUrl')))">
a.certificateUrl,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('printStatus') or colPickMode == 1 and data.containsKey('printStatus')))">
a.printStatus,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
a.updateUserId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('catalogId') or colPickMode == 1 and data.containsKey('catalogId')))">
a.catalogId,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="PrintWaitQueueEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_print_wait_queue
(applyId,catalogCode,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,certificateType,previewUrl,certificateUrl,printStatus,createUserId,createTime,updateUserId,updateTime,catalogId)
VALUES
(#{applyId},#{catalogCode},#{certificateName},#{certificateCode},#{enterpriseName},#{holderName},#{holderIDCardNo},#{pickerName},#{pickerIDCardNo},#{certificateType},#{previewUrl},#{certificateUrl},#{printStatus},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{catalogId})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_print_wait_queue
(applyId,catalogCode,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,certificateType,previewUrl,certificateUrl,printStatus,createUserId,createTime,updateUserId,updateTime,catalogId)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.applyId},#{item.catalogCode},#{item.certificateName},#{item.certificateCode},#{item.enterpriseName},#{item.holderName},#{item.holderIDCardNo},#{item.pickerName},#{item.pickerIDCardNo},#{item.certificateType},#{item.previewUrl},#{item.certificateUrl},#{item.printStatus},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.catalogId})
</foreach>
</insert>
<!-- 根据ParamDto更新 -->
<update id="update" parameterType="paramDto">
update mortals_xhx_print_wait_queue as a
set
<trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('applyId')) or (colPickMode==1 and !data.containsKey('applyId'))">
a.applyId=#{data.applyId},
</if>
<if test="(colPickMode==0 and data.containsKey('applyIdIncrement')) or (colPickMode==1 and !data.containsKey('applyIdIncrement'))">
a.applyId=ifnull(a.applyId,0) + #{data.applyIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogCode')) or (colPickMode==1 and !data.containsKey('catalogCode'))">
a.catalogCode=#{data.catalogCode},
</if>
<if test="(colPickMode==0 and data.containsKey('certificateName')) or (colPickMode==1 and !data.containsKey('certificateName'))">
a.certificateName=#{data.certificateName},
</if>
<if test="(colPickMode==0 and data.containsKey('certificateCode')) or (colPickMode==1 and !data.containsKey('certificateCode'))">
a.certificateCode=#{data.certificateCode},
</if>
<if test="(colPickMode==0 and data.containsKey('enterpriseName')) or (colPickMode==1 and !data.containsKey('enterpriseName'))">
a.enterpriseName=#{data.enterpriseName},
</if>
<if test="(colPickMode==0 and data.containsKey('holderName')) or (colPickMode==1 and !data.containsKey('holderName'))">
a.holderName=#{data.holderName},
</if>
<if test="(colPickMode==0 and data.containsKey('holderIDCardNo')) or (colPickMode==1 and !data.containsKey('holderIDCardNo'))">
a.holderIDCardNo=#{data.holderIDCardNo},
</if>
<if test="(colPickMode==0 and data.containsKey('pickerName')) or (colPickMode==1 and !data.containsKey('pickerName'))">
a.pickerName=#{data.pickerName},
</if>
<if test="(colPickMode==0 and data.containsKey('pickerIDCardNo')) or (colPickMode==1 and !data.containsKey('pickerIDCardNo'))">
a.pickerIDCardNo=#{data.pickerIDCardNo},
</if>
<if test="(colPickMode==0 and data.containsKey('certificateType')) or (colPickMode==1 and !data.containsKey('certificateType'))">
a.certificateType=#{data.certificateType},
</if>
<if test="(colPickMode==0 and data.containsKey('certificateTypeIncrement')) or (colPickMode==1 and !data.containsKey('certificateTypeIncrement'))">
a.certificateType=ifnull(a.certificateType,0) + #{data.certificateTypeIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('previewUrl')) or (colPickMode==1 and !data.containsKey('previewUrl'))">
a.previewUrl=#{data.previewUrl},
</if>
<if test="(colPickMode==0 and data.containsKey('certificateUrl')) or (colPickMode==1 and !data.containsKey('certificateUrl'))">
a.certificateUrl=#{data.certificateUrl},
</if>
<if test="(colPickMode==0 and data.containsKey('printStatus')) or (colPickMode==1 and !data.containsKey('printStatus'))">
a.printStatus=#{data.printStatus},
</if>
<if test="(colPickMode==0 and data.containsKey('printStatusIncrement')) or (colPickMode==1 and !data.containsKey('printStatusIncrement'))">
a.printStatus=ifnull(a.printStatus,0) + #{data.printStatusIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
a.createUserId=#{data.createUserId},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime},
</if>
<if test="(colPickMode==0 and data.containsKey('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))">
a.updateUserId=#{data.updateUserId},
</if>
<if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogId')) or (colPickMode==1 and !data.containsKey('catalogId'))">
a.catalogId=#{data.catalogId},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogIdIncrement')) or (colPickMode==1 and !data.containsKey('catalogIdIncrement'))">
a.catalogId=ifnull(a.catalogId,0) + #{data.catalogIdIncrement},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</update>
<!-- 批量更新 -->
<update id="updateBatch" parameterType="paramDto">
update mortals_xhx_print_wait_queue as a
<trim prefix="set" suffixOverrides=",">
<trim prefix="applyId=(case" suffix="ELSE applyId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('applyId')) or (colPickMode==1 and !item.containsKey('applyId'))">
when a.id=#{item.id} then #{item.applyId}
</when>
<when test="(colPickMode==0 and item.containsKey('applyIdIncrement')) or (colPickMode==1 and !item.containsKey('applyIdIncrement'))">
when a.id=#{item.id} then ifnull(a.applyId,0) + #{item.applyIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="catalogCode=(case" suffix="ELSE catalogCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('catalogCode')) or (colPickMode==1 and !item.containsKey('catalogCode'))">
when a.id=#{item.id} then #{item.catalogCode}
</if>
</foreach>
</trim>
<trim prefix="certificateName=(case" suffix="ELSE certificateName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('certificateName')) or (colPickMode==1 and !item.containsKey('certificateName'))">
when a.id=#{item.id} then #{item.certificateName}
</if>
</foreach>
</trim>
<trim prefix="certificateCode=(case" suffix="ELSE certificateCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('certificateCode')) or (colPickMode==1 and !item.containsKey('certificateCode'))">
when a.id=#{item.id} then #{item.certificateCode}
</if>
</foreach>
</trim>
<trim prefix="enterpriseName=(case" suffix="ELSE enterpriseName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('enterpriseName')) or (colPickMode==1 and !item.containsKey('enterpriseName'))">
when a.id=#{item.id} then #{item.enterpriseName}
</if>
</foreach>
</trim>
<trim prefix="holderName=(case" suffix="ELSE holderName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('holderName')) or (colPickMode==1 and !item.containsKey('holderName'))">
when a.id=#{item.id} then #{item.holderName}
</if>
</foreach>
</trim>
<trim prefix="holderIDCardNo=(case" suffix="ELSE holderIDCardNo end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('holderIDCardNo')) or (colPickMode==1 and !item.containsKey('holderIDCardNo'))">
when a.id=#{item.id} then #{item.holderIDCardNo}
</if>
</foreach>
</trim>
<trim prefix="pickerName=(case" suffix="ELSE pickerName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('pickerName')) or (colPickMode==1 and !item.containsKey('pickerName'))">
when a.id=#{item.id} then #{item.pickerName}
</if>
</foreach>
</trim>
<trim prefix="pickerIDCardNo=(case" suffix="ELSE pickerIDCardNo end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('pickerIDCardNo')) or (colPickMode==1 and !item.containsKey('pickerIDCardNo'))">
when a.id=#{item.id} then #{item.pickerIDCardNo}
</if>
</foreach>
</trim>
<trim prefix="certificateType=(case" suffix="ELSE certificateType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('certificateType')) or (colPickMode==1 and !item.containsKey('certificateType'))">
when a.id=#{item.id} then #{item.certificateType}
</when>
<when test="(colPickMode==0 and item.containsKey('certificateTypeIncrement')) or (colPickMode==1 and !item.containsKey('certificateTypeIncrement'))">
when a.id=#{item.id} then ifnull(a.certificateType,0) + #{item.certificateTypeIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="previewUrl=(case" suffix="ELSE previewUrl end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('previewUrl')) or (colPickMode==1 and !item.containsKey('previewUrl'))">
when a.id=#{item.id} then #{item.previewUrl}
</if>
</foreach>
</trim>
<trim prefix="certificateUrl=(case" suffix="ELSE certificateUrl end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('certificateUrl')) or (colPickMode==1 and !item.containsKey('certificateUrl'))">
when a.id=#{item.id} then #{item.certificateUrl}
</if>
</foreach>
</trim>
<trim prefix="printStatus=(case" suffix="ELSE printStatus end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('printStatus')) or (colPickMode==1 and !item.containsKey('printStatus'))">
when a.id=#{item.id} then #{item.printStatus}
</when>
<when test="(colPickMode==0 and item.containsKey('printStatusIncrement')) or (colPickMode==1 and !item.containsKey('printStatusIncrement'))">
when a.id=#{item.id} then ifnull(a.printStatus,0) + #{item.printStatusIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
when a.id=#{item.id} then #{item.createUserId}
</when>
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
when a.id=#{item.id} then #{item.createTime}
</if>
</foreach>
</trim>
<trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
when a.id=#{item.id} then #{item.updateUserId}
</when>
<when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
when a.id=#{item.id} then #{item.updateTime}
</if>
</foreach>
</trim>
<trim prefix="catalogId=(case" suffix="ELSE catalogId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('catalogId')) or (colPickMode==1 and !item.containsKey('catalogId'))">
when a.id=#{item.id} then #{item.catalogId}
</when>
<when test="(colPickMode==0 and item.containsKey('catalogIdIncrement')) or (colPickMode==1 and !item.containsKey('catalogIdIncrement'))">
when a.id=#{item.id} then ifnull(a.catalogId,0) + #{item.catalogIdIncrement}
</when>
</choose>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</update>
<!-- 根据主健查询 -->
<select id="getByKey" parameterType="paramDto" resultMap="PrintWaitQueueEntity-Map">
select <include refid="_columns"/>
from mortals_xhx_print_wait_queue as a
where a.id=#{condition.id}
</select>
<!-- 根据主健删除 -->
<delete id="deleteByKey" parameterType="paramDto">
delete a.* from mortals_xhx_print_wait_queue as a where a.id=#{condition.id}
</delete>
<!-- 根据主健删除一批，针对单一主健有效 -->
<delete id="deleteByKeys">
delete from mortals_xhx_print_wait_queue where id in
<foreach collection="array" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_print_wait_queue as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</delete>
<!-- 获取列表 -->
<select id="getList" parameterType="paramDto" resultMap="PrintWaitQueueEntity-Map">
select <include refid="_columns"/>
from mortals_xhx_print_wait_queue as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
<include refid="_orderCols_"/>
</select>
<!-- 获取 -->
<select id="getListCount" parameterType="paramDto" resultType="int">
select count(1)
from mortals_xhx_print_wait_queue as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</select>
<!-- 条件映射 -->
<sql id="_condition_">
<if test="condition != null and !condition.isEmpty()">
<!-- 条件映射-普通条件 -->
<include refid="_condition_param_">
<property name="_conditionParam_" value="condition"/>
<property name="_conditionType_" value="and"/>
</include>
<!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
<if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
and
<foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
<trim prefixOverrides="or" prefix="(" suffix=")">
<include refid="_condition_param_">
<property name="_conditionParam_" value="andCondition"/>
<property name="_conditionType_" value="or"/>
</include>
</trim>
</foreach>
</if>
<!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
<if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
and
<foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
<trim prefixOverrides="and" prefix="(" suffix=")">
<include refid="_condition_param_">
<property name="_conditionParam_" value="orCondition"/>
<property name="_conditionType_" value="and"/>
</include>
</trim>
</foreach>
</if>
</if>
</sql>
<!-- 条件映射-代参数 -->
<sql id="_condition_param_">
<bind name="conditionParamRef" value="${_conditionParam_}"/>
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null">
${_conditionType_} a.id=#{${_conditionParam_}.id}
</if>
</if>
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null ">
${_conditionType_} a.id = #{${_conditionParam_}.id}
</if>
<if test="conditionParamRef.id == null">
${_conditionType_} a.id is null
</if>
</if>
<if test="conditionParamRef.containsKey('idList')">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('applyId')">
<if test="conditionParamRef.applyId != null ">
${_conditionType_} a.applyId = #{${_conditionParam_}.applyId}
</if>
<if test="conditionParamRef.applyId == null">
${_conditionType_} a.applyId is null
</if>
</if>
<if test="conditionParamRef.containsKey('applyIdList')">
${_conditionType_} a.applyId in
<foreach collection="conditionParamRef.applyIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('applyIdStart') and conditionParamRef.applyIdStart != null">
${_conditionType_} a.applyId <![CDATA[ >= ]]> #{${_conditionParam_}.applyIdStart}
</if>
<if test="conditionParamRef.containsKey('applyIdEnd') and conditionParamRef.applyIdEnd != null">
${_conditionType_} a.applyId <![CDATA[ <= ]]> #{${_conditionParam_}.applyIdEnd}
</if>
<if test="conditionParamRef.containsKey('catalogCode')">
<if test="conditionParamRef.catalogCode != null and conditionParamRef.catalogCode != ''">
${_conditionType_} a.catalogCode like #{${_conditionParam_}.catalogCode}
</if>
<if test="conditionParamRef.catalogCode == null">
${_conditionType_} a.catalogCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('catalogCodeList')">
${_conditionType_} a.catalogCode in
<foreach collection="conditionParamRef.catalogCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('certificateName')">
<if test="conditionParamRef.certificateName != null and conditionParamRef.certificateName != ''">
${_conditionType_} a.certificateName like #{${_conditionParam_}.certificateName}
</if>
<if test="conditionParamRef.certificateName == null">
${_conditionType_} a.certificateName is null
</if>
</if>
<if test="conditionParamRef.containsKey('certificateNameList')">
${_conditionType_} a.certificateName in
<foreach collection="conditionParamRef.certificateNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('certificateCode')">
<if test="conditionParamRef.certificateCode != null and conditionParamRef.certificateCode != ''">
${_conditionType_} a.certificateCode like #{${_conditionParam_}.certificateCode}
</if>
<if test="conditionParamRef.certificateCode == null">
${_conditionType_} a.certificateCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('certificateCodeList')">
${_conditionType_} a.certificateCode in
<foreach collection="conditionParamRef.certificateCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('enterpriseName')">
<if test="conditionParamRef.enterpriseName != null and conditionParamRef.enterpriseName != ''">
${_conditionType_} a.enterpriseName like #{${_conditionParam_}.enterpriseName}
</if>
<if test="conditionParamRef.enterpriseName == null">
${_conditionType_} a.enterpriseName is null
</if>
</if>
<if test="conditionParamRef.containsKey('enterpriseNameList')">
${_conditionType_} a.enterpriseName in
<foreach collection="conditionParamRef.enterpriseNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('holderName')">
<if test="conditionParamRef.holderName != null and conditionParamRef.holderName != ''">
${_conditionType_} a.holderName like #{${_conditionParam_}.holderName}
</if>
<if test="conditionParamRef.holderName == null">
${_conditionType_} a.holderName is null
</if>
</if>
<if test="conditionParamRef.containsKey('holderNameList')">
${_conditionType_} a.holderName in
<foreach collection="conditionParamRef.holderNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('holderIDCardNo')">
<if test="conditionParamRef.holderIDCardNo != null and conditionParamRef.holderIDCardNo != ''">
${_conditionType_} a.holderIDCardNo like #{${_conditionParam_}.holderIDCardNo}
</if>
<if test="conditionParamRef.holderIDCardNo == null">
${_conditionType_} a.holderIDCardNo is null
</if>
</if>
<if test="conditionParamRef.containsKey('holderIDCardNoList')">
${_conditionType_} a.holderIDCardNo in
<foreach collection="conditionParamRef.holderIDCardNoList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('pickerName')">
<if test="conditionParamRef.pickerName != null and conditionParamRef.pickerName != ''">
${_conditionType_} a.pickerName like #{${_conditionParam_}.pickerName}
</if>
<if test="conditionParamRef.pickerName == null">
${_conditionType_} a.pickerName is null
</if>
</if>
<if test="conditionParamRef.containsKey('pickerNameList')">
${_conditionType_} a.pickerName in
<foreach collection="conditionParamRef.pickerNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('pickerIDCardNo')">
<if test="conditionParamRef.pickerIDCardNo != null and conditionParamRef.pickerIDCardNo != ''">
${_conditionType_} a.pickerIDCardNo like #{${_conditionParam_}.pickerIDCardNo}
</if>
<if test="conditionParamRef.pickerIDCardNo == null">
${_conditionType_} a.pickerIDCardNo is null
</if>
</if>
<if test="conditionParamRef.containsKey('pickerIDCardNoList')">
${_conditionType_} a.pickerIDCardNo in
<foreach collection="conditionParamRef.pickerIDCardNoList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('certificateType')">
<if test="conditionParamRef.certificateType != null ">
${_conditionType_} a.certificateType = #{${_conditionParam_}.certificateType}
</if>
<if test="conditionParamRef.certificateType == null">
${_conditionType_} a.certificateType is null
</if>
</if>
<if test="conditionParamRef.containsKey('certificateTypeList')">
${_conditionType_} a.certificateType in
<foreach collection="conditionParamRef.certificateTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('certificateTypeStart') and conditionParamRef.certificateTypeStart != null">
${_conditionType_} a.certificateType <![CDATA[ >= ]]> #{${_conditionParam_}.certificateTypeStart}
</if>
<if test="conditionParamRef.containsKey('certificateTypeEnd') and conditionParamRef.certificateTypeEnd != null">
${_conditionType_} a.certificateType <![CDATA[ <= ]]> #{${_conditionParam_}.certificateTypeEnd}
</if>
<if test="conditionParamRef.containsKey('previewUrl')">
<if test="conditionParamRef.previewUrl != null and conditionParamRef.previewUrl != ''">
${_conditionType_} a.previewUrl like #{${_conditionParam_}.previewUrl}
</if>
<if test="conditionParamRef.previewUrl == null">
${_conditionType_} a.previewUrl is null
</if>
</if>
<if test="conditionParamRef.containsKey('previewUrlList')">
${_conditionType_} a.previewUrl in
<foreach collection="conditionParamRef.previewUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('certificateUrl')">
<if test="conditionParamRef.certificateUrl != null and conditionParamRef.certificateUrl != ''">
${_conditionType_} a.certificateUrl like #{${_conditionParam_}.certificateUrl}
</if>
<if test="conditionParamRef.certificateUrl == null">
${_conditionType_} a.certificateUrl is null
</if>
</if>
<if test="conditionParamRef.containsKey('certificateUrlList')">
${_conditionType_} a.certificateUrl in
<foreach collection="conditionParamRef.certificateUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('printStatus')">
<if test="conditionParamRef.printStatus != null ">
${_conditionType_} a.printStatus = #{${_conditionParam_}.printStatus}
</if>
<if test="conditionParamRef.printStatus == null">
${_conditionType_} a.printStatus is null
</if>
</if>
<if test="conditionParamRef.containsKey('printStatusList')">
${_conditionType_} a.printStatus in
<foreach collection="conditionParamRef.printStatusList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('printStatusStart') and conditionParamRef.printStatusStart != null">
${_conditionType_} a.printStatus <![CDATA[ >= ]]> #{${_conditionParam_}.printStatusStart}
</if>
<if test="conditionParamRef.containsKey('printStatusEnd') and conditionParamRef.printStatusEnd != null">
${_conditionType_} a.printStatus <![CDATA[ <= ]]> #{${_conditionParam_}.printStatusEnd}
</if>
<if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if>
<if test="conditionParamRef.createUserId == null">
${_conditionType_} a.createUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('createUserIdList')">
${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</if>
<if test="conditionParamRef.createTime == null">
${_conditionType_} a.createTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('updateUserId')">
<if test="conditionParamRef.updateUserId != null ">
${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
</if>
<if test="conditionParamRef.updateUserId == null">
${_conditionType_} a.updateUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateUserIdList')">
${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if>
<if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('updateTime')">
<if test="conditionParamRef.updateTime != null ">
${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
</if>
<if test="conditionParamRef.updateTime == null">
${_conditionType_} a.updateTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('catalogId')">
<if test="conditionParamRef.catalogId != null ">
${_conditionType_} a.catalogId = #{${_conditionParam_}.catalogId}
</if>
<if test="conditionParamRef.catalogId == null">
${_conditionType_} a.catalogId is null
</if>
</if>
<if test="conditionParamRef.containsKey('catalogIdList')">
${_conditionType_} a.catalogId in
<foreach collection="conditionParamRef.catalogIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('catalogIdStart') and conditionParamRef.catalogIdStart != null">
${_conditionType_} a.catalogId <![CDATA[ >= ]]> #{${_conditionParam_}.catalogIdStart}
</if>
<if test="conditionParamRef.containsKey('catalogIdEnd') and conditionParamRef.catalogIdEnd != null">
${_conditionType_} a.catalogId <![CDATA[ <= ]]> #{${_conditionParam_}.catalogIdEnd}
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')">
a.id
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('applyId')">
a.applyId
<if test='orderCol.applyId != null and "DESC".equalsIgnoreCase(orderCol.applyId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('catalogCode')">
a.catalogCode
<if test='orderCol.catalogCode != null and "DESC".equalsIgnoreCase(orderCol.catalogCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('certificateName')">
a.certificateName
<if test='orderCol.certificateName != null and "DESC".equalsIgnoreCase(orderCol.certificateName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('certificateCode')">
a.certificateCode
<if test='orderCol.certificateCode != null and "DESC".equalsIgnoreCase(orderCol.certificateCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('enterpriseName')">
a.enterpriseName
<if test='orderCol.enterpriseName != null and "DESC".equalsIgnoreCase(orderCol.enterpriseName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('holderName')">
a.holderName
<if test='orderCol.holderName != null and "DESC".equalsIgnoreCase(orderCol.holderName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('holderIDCardNo')">
a.holderIDCardNo
<if test='orderCol.holderIDCardNo != null and "DESC".equalsIgnoreCase(orderCol.holderIDCardNo)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('pickerName')">
a.pickerName
<if test='orderCol.pickerName != null and "DESC".equalsIgnoreCase(orderCol.pickerName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('pickerIDCardNo')">
a.pickerIDCardNo
<if test='orderCol.pickerIDCardNo != null and "DESC".equalsIgnoreCase(orderCol.pickerIDCardNo)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('certificateType')">
a.certificateType
<if test='orderCol.certificateType != null and "DESC".equalsIgnoreCase(orderCol.certificateType)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('previewUrl')">
a.previewUrl
<if test='orderCol.previewUrl != null and "DESC".equalsIgnoreCase(orderCol.previewUrl)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('certificateUrl')">
a.certificateUrl
<if test='orderCol.certificateUrl != null and "DESC".equalsIgnoreCase(orderCol.certificateUrl)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('printStatus')">
a.printStatus
<if test='orderCol.printStatus != null and "DESC".equalsIgnoreCase(orderCol.printStatus)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createUserId')">
a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createTime')">
a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('updateUserId')">
a.updateUserId
<if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('updateTime')">
a.updateTime
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('catalogId')">
a.catalogId
<if test='orderCol.catalogId != null and "DESC".equalsIgnoreCase(orderCol.catalogId)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
<sql id="_group_by_">
<if test="groupList != null and !groupList.isEmpty()">
GROUP BY
<trim suffixOverrides="," suffix="">
<foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
${item}
</foreach>
</trim>
</if>
</sql>
</mapper>
\ No newline at end of file
certificate-manager/src/main/resources/sqlmap/module/record/RetainLogMapper.xml
View file @ 8cac55a4
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd"> "mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.record.dao.ibatis.RetainLogDaoImpl"> <mapper namespace="com.mortals.xhx.module.record.dao.ibatis.RetainLogDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<result property="catalogCode" column="catalogCode" /> <result property="catalogCode" column="catalogCode" />
<result property="certificateName" column="certificateName" /> <result property="certificateName" column="certificateName" />
<result property="certificateCode" column="certificateCode" /> <result property="certificateCode" column="certificateCode" />
<result property="enterpriseNam" column="enterpriseNam" /> <result property="enterpriseName" column="enterpriseName" />
<result property="holderName" column="holderName" /> <result property="holderName" column="holderName" />
<result property="holderIDCardNo" column="holderIDCardNo" /> <result property="holderIDCardNo" column="holderIDCardNo" />
<result property="certificateStatus" column="certificateStatus" /> <result property="certificateStatus" column="certificateStatus" />
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('certificateCode') or colPickMode == 1 and data.containsKey('certificateCode')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('certificateCode') or colPickMode == 1 and data.containsKey('certificateCode')))">
a.certificateCode, a.certificateCode,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('enterpriseNam') or colPickMode == 1 and data.containsKey('enterpriseNam')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('enterpriseName') or colPickMode == 1 and data.containsKey('enterpriseName')))">
a.enterpriseNam, a.enterpriseName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('holderName') or colPickMode == 1 and data.containsKey('holderName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('holderName') or colPickMode == 1 and data.containsKey('holderName')))">
a.holderName, a.holderName,
...@@ -85,18 +85,18 @@ ...@@ -85,18 +85,18 @@
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="RetainLogEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="RetainLogEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_retain_log insert into mortals_xhx_retain_log
(catalogCode,certificateName,certificateCode,enterpriseNam,holderName,holderIDCardNo,certificateStatus,originalCount,duplicateCount,originalUrl,duplicateUrl,createUserId,createTime,updateUserId,updateTime,catalogId) (catalogCode,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,certificateStatus,originalCount,duplicateCount,originalUrl,duplicateUrl,createUserId,createTime,updateUserId,updateTime,catalogId)
VALUES VALUES
(#{catalogCode},#{certificateName},#{certificateCode},#{enterpriseNam},#{holderName},#{holderIDCardNo},#{certificateStatus},#{originalCount},#{duplicateCount},#{originalUrl},#{duplicateUrl},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{catalogId}) (#{catalogCode},#{certificateName},#{certificateCode},#{enterpriseName},#{holderName},#{holderIDCardNo},#{certificateStatus},#{originalCount},#{duplicateCount},#{originalUrl},#{duplicateUrl},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{catalogId})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_retain_log insert into mortals_xhx_retain_log
(catalogCode,certificateName,certificateCode,enterpriseNam,holderName,holderIDCardNo,certificateStatus,originalCount,duplicateCount,originalUrl,duplicateUrl,createUserId,createTime,updateUserId,updateTime,catalogId) (catalogCode,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,certificateStatus,originalCount,duplicateCount,originalUrl,duplicateUrl,createUserId,createTime,updateUserId,updateTime,catalogId)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.catalogCode},#{item.certificateName},#{item.certificateCode},#{item.enterpriseNam},#{item.holderName},#{item.holderIDCardNo},#{item.certificateStatus},#{item.originalCount},#{item.duplicateCount},#{item.originalUrl},#{item.duplicateUrl},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.catalogId}) (#{item.catalogCode},#{item.certificateName},#{item.certificateCode},#{item.enterpriseName},#{item.holderName},#{item.holderIDCardNo},#{item.certificateStatus},#{item.originalCount},#{item.duplicateCount},#{item.originalUrl},#{item.duplicateUrl},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.catalogId})
</foreach> </foreach>
</insert> </insert>
...@@ -115,8 +115,8 @@ ...@@ -115,8 +115,8 @@
<if test="(colPickMode==0 and data.containsKey('certificateCode')) or (colPickMode==1 and !data.containsKey('certificateCode'))"> <if test="(colPickMode==0 and data.containsKey('certificateCode')) or (colPickMode==1 and !data.containsKey('certificateCode'))">
a.certificateCode=#{data.certificateCode}, a.certificateCode=#{data.certificateCode},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('enterpriseNam')) or (colPickMode==1 and !data.containsKey('enterpriseNam'))"> <if test="(colPickMode==0 and data.containsKey('enterpriseName')) or (colPickMode==1 and !data.containsKey('enterpriseName'))">
a.enterpriseNam=#{data.enterpriseNam}, a.enterpriseName=#{data.enterpriseName},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('holderName')) or (colPickMode==1 and !data.containsKey('holderName'))"> <if test="(colPickMode==0 and data.containsKey('holderName')) or (colPickMode==1 and !data.containsKey('holderName'))">
a.holderName=#{data.holderName}, a.holderName=#{data.holderName},
...@@ -205,10 +205,10 @@ ...@@ -205,10 +205,10 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="enterpriseNam=(case" suffix="ELSE enterpriseNam end),"> <trim prefix="enterpriseName=(case" suffix="ELSE enterpriseName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('enterpriseNam')) or (colPickMode==1 and !item.containsKey('enterpriseNam'))"> <if test="(colPickMode==0 and item.containsKey('enterpriseName')) or (colPickMode==1 and !item.containsKey('enterpriseName'))">
when a.id=#{item.id} then #{item.enterpriseNam} when a.id=#{item.id} then #{item.enterpriseName}
</if> </if>
</foreach> </foreach>
</trim> </trim>
...@@ -494,17 +494,17 @@ ...@@ -494,17 +494,17 @@
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('enterpriseNam')"> <if test="conditionParamRef.containsKey('enterpriseName')">
<if test="conditionParamRef.enterpriseNam != null and conditionParamRef.enterpriseNam != ''"> <if test="conditionParamRef.enterpriseName != null and conditionParamRef.enterpriseName != ''">
${_conditionType_} a.enterpriseNam like #{${_conditionParam_}.enterpriseNam} ${_conditionType_} a.enterpriseName like #{${_conditionParam_}.enterpriseName}
</if> </if>
<if test="conditionParamRef.enterpriseNam == null"> <if test="conditionParamRef.enterpriseName == null">
${_conditionType_} a.enterpriseNam is null ${_conditionType_} a.enterpriseName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('enterpriseNamList')"> <if test="conditionParamRef.containsKey('enterpriseNameList')">
${_conditionType_} a.enterpriseNam in ${_conditionType_} a.enterpriseName in
<foreach collection="conditionParamRef.enterpriseNamList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.enterpriseNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
...@@ -757,9 +757,9 @@ ...@@ -757,9 +757,9 @@
<if test='orderCol.certificateCode != null and "DESC".equalsIgnoreCase(orderCol.certificateCode)'>DESC</if> <if test='orderCol.certificateCode != null and "DESC".equalsIgnoreCase(orderCol.certificateCode)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('enterpriseNam')"> <if test="orderCol.containsKey('enterpriseName')">
a.enterpriseNam a.enterpriseName
<if test='orderCol.enterpriseNam != null and "DESC".equalsIgnoreCase(orderCol.enterpriseNam)'>DESC</if> <if test='orderCol.enterpriseName != null and "DESC".equalsIgnoreCase(orderCol.enterpriseName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('holderName')"> <if test="orderCol.containsKey('holderName')">
......
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