Skip to content

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

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

parent 0616399f
Show whitespace changes
Inline Side-by-side
Showing with 9017 additions and 8597 deletions
certificate-manager/src/main/java/com/mortals/xhx/module/api/CertificateApi.java
View file @ 37354cdd
...@@ -243,6 +243,7 @@ public class CertificateApi extends BaseJsonBodyController { ...@@ -243,6 +243,7 @@ public class CertificateApi extends BaseJsonBodyController {
printWaitQueueVO.setPrinterIp(printCatalogEntity.getPrinterIp()); printWaitQueueVO.setPrinterIp(printCatalogEntity.getPrinterIp());
printWaitQueueVO.setPrinterName(printCatalogEntity.getPrinterName()); printWaitQueueVO.setPrinterName(printCatalogEntity.getPrinterName());
printWaitQueueVO.setPaperSource(printCatalogEntity.getPaperSource()); printWaitQueueVO.setPaperSource(printCatalogEntity.getPaperSource());
printWaitQueueVO.setMobile(printWaitQueueEntity.getMobile());
waitQueueVOList.add(printWaitQueueVO); waitQueueVOList.add(printWaitQueueVO);
} }
model.put("data", waitQueueVOList); model.put("data", waitQueueVOList);
......
certificate-manager/src/main/java/com/mortals/xhx/module/api/PrintWaitQueueVO.java
View file @ 37354cdd
...@@ -78,4 +78,9 @@ public class PrintWaitQueueVO { ...@@ -78,4 +78,9 @@ public class PrintWaitQueueVO {
* 打印机纸盒 * 打印机纸盒
*/ */
private String paperSource; private String paperSource;
/**
* 手机号码
*/
private String mobile;
} }
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/ApplyLogEntity.java
View file @ 37354cdd
...@@ -8,19 +8,15 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -8,19 +8,15 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.record.model.vo.ApplyLogVo; import com.mortals.xhx.module.record.model.vo.ApplyLogVo;
import lombok.Data; import lombok.Data;
/** /**
* 证照申请实体对象 * 证照申请实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-24 * @date 2023-07-05
*/ */
@Data @Data
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 siteId;
/** /**
* 证照档案ID * 证照档案ID
*/ */
...@@ -38,14 +34,6 @@ public class ApplyLogEntity extends ApplyLogVo { ...@@ -38,14 +34,6 @@ public class ApplyLogEntity extends ApplyLogVo {
*/ */
private String catalogName; private String catalogName;
/** /**
* 证照目录模板ID
*/
private Long templateId;
/**
* 证照模板名称
*/
private String templateName;
/**
* 证件编号 * 证件编号
*/ */
private String certificateCode; private String certificateCode;
...@@ -125,6 +113,22 @@ public class ApplyLogEntity extends ApplyLogVo { ...@@ -125,6 +113,22 @@ public class ApplyLogEntity extends ApplyLogVo {
* 归档状态0否1是 * 归档状态0否1是
*/ */
private Integer recordStatus; private Integer recordStatus;
/**
* 站点id
*/
private Long siteId;
/**
* 证照目录模板ID
*/
private Long templateId;
/**
* 证照模板名称
*/
private String templateName;
/**
* 手机号码
*/
private String mobile;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -143,8 +147,6 @@ public class ApplyLogEntity extends ApplyLogVo { ...@@ -143,8 +147,6 @@ public class ApplyLogEntity extends ApplyLogVo {
public void initAttrValue(){ public void initAttrValue(){
this.siteId = -1L;
this.recordId = -1L; this.recordId = -1L;
this.catalogId = -1L; this.catalogId = -1L;
...@@ -153,10 +155,6 @@ public class ApplyLogEntity extends ApplyLogVo { ...@@ -153,10 +155,6 @@ public class ApplyLogEntity extends ApplyLogVo {
this.catalogName = ""; this.catalogName = "";
this.templateId = -1L;
this.templateName = "";
this.certificateCode = ""; this.certificateCode = "";
this.certificateName = ""; this.certificateName = "";
...@@ -196,5 +194,13 @@ public class ApplyLogEntity extends ApplyLogVo { ...@@ -196,5 +194,13 @@ public class ApplyLogEntity extends ApplyLogVo {
this.operType = 1; this.operType = 1;
this.recordStatus = 0; this.recordStatus = 0;
this.siteId = -1L;
this.templateId = -1L;
this.templateName = "";
this.mobile = "";
} }
} }
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/ApplyLogQuery.java
View file @ 37354cdd
...@@ -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 2023-05-24 * @date 2023-07-05
*/ */
public class ApplyLogQuery extends ApplyLogEntity { public class ApplyLogQuery extends ApplyLogEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -25,21 +25,6 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -25,21 +25,6 @@ public class ApplyLogQuery extends ApplyLogEntity {
/** 序号，主键，自增长排除列表 */ /** 序号，主键，自增长排除列表 */
private List <Long> idNotList; private List <Long> idNotList;
/** 开始 站点id */
private Long siteIdStart;
/** 结束 站点id */
private Long siteIdEnd;
/** 增加 站点id */
private Long siteIdIncrement;
/** 站点id列表 */
private List <Long> siteIdList;
/** 站点id排除列表 */
private List <Long> siteIdNotList;
/** 开始 证照档案ID */ /** 开始 证照档案ID */
private Long recordIdStart; private Long recordIdStart;
...@@ -80,26 +65,6 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -80,26 +65,6 @@ public class ApplyLogQuery extends ApplyLogEntity {
/** 目录名称排除列表 */ /** 目录名称排除列表 */
private List <String> catalogNameNotList; private List <String> catalogNameNotList;
/** 开始 证照目录模板ID */
private Long templateIdStart;
/** 结束 证照目录模板ID */
private Long templateIdEnd;
/** 增加 证照目录模板ID */
private Long templateIdIncrement;
/** 证照目录模板ID列表 */
private List <Long> templateIdList;
/** 证照目录模板ID排除列表 */
private List <Long> templateIdNotList;
/** 证照模板名称 */
private List<String> templateNameList;
/** 证照模板名称排除列表 */
private List <String> templateNameNotList;
/** 证件编号 */ /** 证件编号 */
private List<String> certificateCodeList; private List<String> certificateCodeList;
...@@ -295,6 +260,46 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -295,6 +260,46 @@ public class ApplyLogQuery extends ApplyLogEntity {
/** 归档状态0否1是排除列表 */ /** 归档状态0否1是排除列表 */
private List <Integer> recordStatusNotList; private List <Integer> recordStatusNotList;
/** 开始 站点id */
private Long siteIdStart;
/** 结束 站点id */
private Long siteIdEnd;
/** 增加 站点id */
private Long siteIdIncrement;
/** 站点id列表 */
private List <Long> siteIdList;
/** 站点id排除列表 */
private List <Long> siteIdNotList;
/** 开始 证照目录模板ID */
private Long templateIdStart;
/** 结束 证照目录模板ID */
private Long templateIdEnd;
/** 增加 证照目录模板ID */
private Long templateIdIncrement;
/** 证照目录模板ID列表 */
private List <Long> templateIdList;
/** 证照目录模板ID排除列表 */
private List <Long> templateIdNotList;
/** 证照模板名称 */
private List<String> templateNameList;
/** 证照模板名称排除列表 */
private List <String> templateNameNotList;
/** 手机号码 */
private List<String> mobileList;
/** 手机号码排除列表 */
private List <String> mobileNotList;
/** 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;
...@@ -384,87 +389,6 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -384,87 +389,6 @@ public class ApplyLogQuery extends ApplyLogEntity {
} }
/**
* 获取 开始 站点id
* @return siteIdStart
*/
public Long getSiteIdStart(){
return this.siteIdStart;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
}
/**
* 获取 结束 站点id
* @return $siteIdEnd
*/
public Long getSiteIdEnd(){
return this.siteIdEnd;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
}
/**
* 获取 增加 站点id
* @return siteIdIncrement
*/
public Long getSiteIdIncrement(){
return this.siteIdIncrement;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
}
/**
* 获取 站点id
* @return siteIdList
*/
public List<Long> getSiteIdList(){
return this.siteIdList;
}
/**
* 设置 站点id
* @param siteIdList
*/
public void setSiteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
}
/**
* 获取 站点id
* @return siteIdNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/** /**
* 获取 开始 证照档案ID * 获取 开始 证照档案ID
* @return recordIdStart * @return recordIdStart
...@@ -691,119 +615,6 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -691,119 +615,6 @@ public class ApplyLogQuery extends ApplyLogEntity {
this.catalogNameNotList = catalogNameNotList; this.catalogNameNotList = catalogNameNotList;
} }
/**
* 获取 开始 证照目录模板ID
* @return templateIdStart
*/
public Long getTemplateIdStart(){
return this.templateIdStart;
}
/**
* 设置 开始 证照目录模板ID
* @param templateIdStart
*/
public void setTemplateIdStart(Long templateIdStart){
this.templateIdStart = templateIdStart;
}
/**
* 获取 结束 证照目录模板ID
* @return $templateIdEnd
*/
public Long getTemplateIdEnd(){
return this.templateIdEnd;
}
/**
* 设置 结束 证照目录模板ID
* @param templateIdEnd
*/
public void setTemplateIdEnd(Long templateIdEnd){
this.templateIdEnd = templateIdEnd;
}
/**
* 获取 增加 证照目录模板ID
* @return templateIdIncrement
*/
public Long getTemplateIdIncrement(){
return this.templateIdIncrement;
}
/**
* 设置 增加 证照目录模板ID
* @param templateIdIncrement
*/
public void setTemplateIdIncrement(Long templateIdIncrement){
this.templateIdIncrement = templateIdIncrement;
}
/**
* 获取 证照目录模板ID
* @return templateIdList
*/
public List<Long> getTemplateIdList(){
return this.templateIdList;
}
/**
* 设置 证照目录模板ID
* @param templateIdList
*/
public void setTemplateIdList(List<Long> templateIdList){
this.templateIdList = templateIdList;
}
/**
* 获取 证照目录模板ID
* @return templateIdNotList
*/
public List<Long> getTemplateIdNotList(){
return this.templateIdNotList;
}
/**
* 设置 证照目录模板ID
* @param templateIdNotList
*/
public void setTemplateIdNotList(List<Long> templateIdNotList){
this.templateIdNotList = templateIdNotList;
}
/**
* 获取 证照模板名称
* @return templateNameList
*/
public List<String> getTemplateNameList(){
return this.templateNameList;
}
/**
* 设置 证照模板名称
* @param templateNameList
*/
public void setTemplateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
}
/**
* 获取 证照模板名称
* @return templateNameNotList
*/
public List<String> getTemplateNameNotList(){
return this.templateNameNotList;
}
/**
* 设置 证照模板名称
* @param templateNameNotList
*/
public void setTemplateNameNotList(List<String> templateNameNotList){
this.templateNameNotList = templateNameNotList;
}
/** /**
* 获取 证件编号 * 获取 证件编号
* @return certificateCodeList * @return certificateCodeList
...@@ -1916,110 +1727,282 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -1916,110 +1727,282 @@ public class ApplyLogQuery extends ApplyLogEntity {
/** /**
* 设置 序号，主键，自增长 * 获取 开始 站点id
* @param id * @return siteIdStart
*/ */
public ApplyLogQuery id(Long id){ public Long getSiteIdStart(){
setId(id); return this.siteIdStart;
return this;
} }
/** /**
* 设置 开始 序号，主键，自增长 * 设置 开始 站点id
* @param idStart * @param siteIdStart
*/ */
public ApplyLogQuery idStart(Long idStart){ public void setSiteIdStart(Long siteIdStart){
this.idStart = idStart; this.siteIdStart = siteIdStart;
return this;
} }
/** /**
* 设置 结束 序号，主键，自增长 * 获取 结束 站点id
* @param idEnd * @return $siteIdEnd
*/ */
public ApplyLogQuery idEnd(Long idEnd){ public Long getSiteIdEnd(){
this.idEnd = idEnd; return this.siteIdEnd;
return this;
} }
/** /**
* 设置 增加 序号，主键，自增长 * 设置 结束 站点id
* @param idIncrement * @param siteIdEnd
*/ */
public ApplyLogQuery idIncrement(Long idIncrement){ public void setSiteIdEnd(Long siteIdEnd){
this.idIncrement = idIncrement; this.siteIdEnd = siteIdEnd;
return this;
} }
/** /**
* 设置 序号，主键，自增长 * 获取 增加 站点id
* @param idList * @return siteIdIncrement
*/ */
public ApplyLogQuery idList(List<Long> idList){ public Long getSiteIdIncrement(){
this.idList = idList; return this.siteIdIncrement;
return this;
} }
/** /**
* 设置 序号，主键，自增长 * 设置 增加 站点id
* @param idNotList * @param siteIdIncrement
*/ */
public ApplyLogQuery idNotList(List<Long> idNotList){ public void setSiteIdIncrement(Long siteIdIncrement){
this.idNotList = idNotList; this.siteIdIncrement = siteIdIncrement;
return this; }
/**
* 获取 站点id
* @return siteIdList
*/
public List<Long> getSiteIdList(){
return this.siteIdList;
} }
/** /**
* 设置 站点id * 设置 站点id
* @param siteId * @param siteIdList
*/
public void setSiteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
}
/**
* 获取 站点id
* @return siteIdNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/**
* 获取 开始 证照目录模板ID
* @return templateIdStart
*/
public Long getTemplateIdStart(){
return this.templateIdStart;
}
/**
* 设置 开始 证照目录模板ID
* @param templateIdStart
*/
public void setTemplateIdStart(Long templateIdStart){
this.templateIdStart = templateIdStart;
}
/**
* 获取 结束 证照目录模板ID
* @return $templateIdEnd
*/
public Long getTemplateIdEnd(){
return this.templateIdEnd;
}
/**
* 设置 结束 证照目录模板ID
* @param templateIdEnd
*/
public void setTemplateIdEnd(Long templateIdEnd){
this.templateIdEnd = templateIdEnd;
}
/**
* 获取 增加 证照目录模板ID
* @return templateIdIncrement
*/
public Long getTemplateIdIncrement(){
return this.templateIdIncrement;
}
/**
* 设置 增加 证照目录模板ID
* @param templateIdIncrement
*/
public void setTemplateIdIncrement(Long templateIdIncrement){
this.templateIdIncrement = templateIdIncrement;
}
/**
* 获取 证照目录模板ID
* @return templateIdList
*/
public List<Long> getTemplateIdList(){
return this.templateIdList;
}
/**
* 设置 证照目录模板ID
* @param templateIdList
*/
public void setTemplateIdList(List<Long> templateIdList){
this.templateIdList = templateIdList;
}
/**
* 获取 证照目录模板ID
* @return templateIdNotList
*/
public List<Long> getTemplateIdNotList(){
return this.templateIdNotList;
}
/**
* 设置 证照目录模板ID
* @param templateIdNotList
*/
public void setTemplateIdNotList(List<Long> templateIdNotList){
this.templateIdNotList = templateIdNotList;
}
/**
* 获取 证照模板名称
* @return templateNameList
*/
public List<String> getTemplateNameList(){
return this.templateNameList;
}
/**
* 设置 证照模板名称
* @param templateNameList
*/
public void setTemplateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
}
/**
* 获取 证照模板名称
* @return templateNameNotList
*/
public List<String> getTemplateNameNotList(){
return this.templateNameNotList;
}
/**
* 设置 证照模板名称
* @param templateNameNotList
*/
public void setTemplateNameNotList(List<String> templateNameNotList){
this.templateNameNotList = templateNameNotList;
}
/**
* 获取 手机号码
* @return mobileList
*/
public List<String> getMobileList(){
return this.mobileList;
}
/**
* 设置 手机号码
* @param mobileList
*/
public void setMobileList(List<String> mobileList){
this.mobileList = mobileList;
}
/**
* 获取 手机号码
* @return mobileNotList
*/
public List<String> getMobileNotList(){
return this.mobileNotList;
}
/**
* 设置 手机号码
* @param mobileNotList
*/
public void setMobileNotList(List<String> mobileNotList){
this.mobileNotList = mobileNotList;
}
/**
* 设置 序号，主键，自增长
* @param id
*/ */
public ApplyLogQuery siteId(Long siteId){ public ApplyLogQuery id(Long id){
setSiteId(siteId); setId(id);
return this; return this;
} }
/** /**
* 设置 开始 站点id * 设置 开始 序号，主键，自增长
* @param siteIdStart * @param idStart
*/ */
public ApplyLogQuery siteIdStart(Long siteIdStart){ public ApplyLogQuery idStart(Long idStart){
this.siteIdStart = siteIdStart; this.idStart = idStart;
return this; return this;
} }
/** /**
* 设置 结束 站点id * 设置 结束 序号，主键，自增长
* @param siteIdEnd * @param idEnd
*/ */
public ApplyLogQuery siteIdEnd(Long siteIdEnd){ public ApplyLogQuery idEnd(Long idEnd){
this.siteIdEnd = siteIdEnd; this.idEnd = idEnd;
return this; return this;
} }
/** /**
* 设置 增加 站点id * 设置 增加 序号，主键，自增长
* @param siteIdIncrement * @param idIncrement
*/ */
public ApplyLogQuery siteIdIncrement(Long siteIdIncrement){ public ApplyLogQuery idIncrement(Long idIncrement){
this.siteIdIncrement = siteIdIncrement; this.idIncrement = idIncrement;
return this; return this;
} }
/** /**
* 设置 站点id * 设置 序号，主键，自增长
* @param siteIdList * @param idList
*/ */
public ApplyLogQuery siteIdList(List<Long> siteIdList){ public ApplyLogQuery idList(List<Long> idList){
this.siteIdList = siteIdList; this.idList = idList;
return this; return this;
} }
/** /**
* 设置 站点id * 设置 序号，主键，自增长
* @param siteIdNotList * @param idNotList
*/ */
public ApplyLogQuery siteIdNotList(List<Long> siteIdNotList){ public ApplyLogQuery idNotList(List<Long> idNotList){
this.siteIdNotList = siteIdNotList; this.idNotList = idNotList;
return this; return this;
} }
...@@ -2169,79 +2152,6 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -2169,79 +2152,6 @@ public class ApplyLogQuery extends ApplyLogEntity {
return this; return this;
} }
/**
* 设置 证照目录模板ID
* @param templateId
*/
public ApplyLogQuery templateId(Long templateId){
setTemplateId(templateId);
return this;
}
/**
* 设置 开始 证照目录模板ID
* @param templateIdStart
*/
public ApplyLogQuery templateIdStart(Long templateIdStart){
this.templateIdStart = templateIdStart;
return this;
}
/**
* 设置 结束 证照目录模板ID
* @param templateIdEnd
*/
public ApplyLogQuery templateIdEnd(Long templateIdEnd){
this.templateIdEnd = templateIdEnd;
return this;
}
/**
* 设置 增加 证照目录模板ID
* @param templateIdIncrement
*/
public ApplyLogQuery templateIdIncrement(Long templateIdIncrement){
this.templateIdIncrement = templateIdIncrement;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateIdList
*/
public ApplyLogQuery templateIdList(List<Long> templateIdList){
this.templateIdList = templateIdList;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateIdNotList
*/
public ApplyLogQuery templateIdNotList(List<Long> templateIdNotList){
this.templateIdNotList = templateIdNotList;
return this;
}
/**
* 设置 证照模板名称
* @param templateName
*/
public ApplyLogQuery templateName(String templateName){
setTemplateName(templateName);
return this;
}
/**
* 设置 证照模板名称
* @param templateNameList
*/
public ApplyLogQuery templateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
return this;
}
/** /**
* 设置 证件编号 * 设置 证件编号
...@@ -2853,6 +2763,152 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -2853,6 +2763,152 @@ public class ApplyLogQuery extends ApplyLogEntity {
return this; return this;
} }
/**
* 设置 站点id
* @param siteId
*/
public ApplyLogQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public ApplyLogQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public ApplyLogQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public ApplyLogQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点id
* @param siteIdList
*/
public ApplyLogQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public ApplyLogQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateId
*/
public ApplyLogQuery templateId(Long templateId){
setTemplateId(templateId);
return this;
}
/**
* 设置 开始 证照目录模板ID
* @param templateIdStart
*/
public ApplyLogQuery templateIdStart(Long templateIdStart){
this.templateIdStart = templateIdStart;
return this;
}
/**
* 设置 结束 证照目录模板ID
* @param templateIdEnd
*/
public ApplyLogQuery templateIdEnd(Long templateIdEnd){
this.templateIdEnd = templateIdEnd;
return this;
}
/**
* 设置 增加 证照目录模板ID
* @param templateIdIncrement
*/
public ApplyLogQuery templateIdIncrement(Long templateIdIncrement){
this.templateIdIncrement = templateIdIncrement;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateIdList
*/
public ApplyLogQuery templateIdList(List<Long> templateIdList){
this.templateIdList = templateIdList;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateIdNotList
*/
public ApplyLogQuery templateIdNotList(List<Long> templateIdNotList){
this.templateIdNotList = templateIdNotList;
return this;
}
/**
* 设置 证照模板名称
* @param templateName
*/
public ApplyLogQuery templateName(String templateName){
setTemplateName(templateName);
return this;
}
/**
* 设置 证照模板名称
* @param templateNameList
*/
public ApplyLogQuery templateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
return this;
}
/**
* 设置 手机号码
* @param mobile
*/
public ApplyLogQuery mobile(String mobile){
setMobile(mobile);
return this;
}
/**
* 设置 手机号码
* @param mobileList
*/
public ApplyLogQuery mobileList(List<String> mobileList){
this.mobileList = mobileList;
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 @ 37354cdd
...@@ -8,19 +8,15 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -8,19 +8,15 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.record.model.vo.PrintLogVo; import com.mortals.xhx.module.record.model.vo.PrintLogVo;
import lombok.Data; import lombok.Data;
/** /**
* 证照打印记录实体对象 * 证照打印记录实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-24 * @date 2023-07-05
*/ */
@Data @Data
public class PrintLogEntity extends PrintLogVo { public class PrintLogEntity extends PrintLogVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
* 站点id
*/
private Long siteId;
/** /**
* 证照目录ID * 证照目录ID
*/ */
...@@ -42,14 +38,6 @@ public class PrintLogEntity extends PrintLogVo { ...@@ -42,14 +38,6 @@ public class PrintLogEntity extends PrintLogVo {
*/ */
private String certificateCode; private String certificateCode;
/** /**
* 证照目录模板ID
*/
private Long templateId;
/**
* 证照模板名称
*/
private String templateName;
/**
* 企业名称 * 企业名称
*/ */
private String enterpriseName; private String enterpriseName;
...@@ -85,6 +73,22 @@ public class PrintLogEntity extends PrintLogVo { ...@@ -85,6 +73,22 @@ public class PrintLogEntity extends PrintLogVo {
* 打印设备 * 打印设备
*/ */
private Long deviceId; private Long deviceId;
/**
* 站点id
*/
private Long siteId;
/**
* 证照目录模板ID
*/
private Long templateId;
/**
* 证照模板名称
*/
private String templateName;
/**
* 手机号码
*/
private String mobile;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -103,8 +107,6 @@ public class PrintLogEntity extends PrintLogVo { ...@@ -103,8 +107,6 @@ public class PrintLogEntity extends PrintLogVo {
public void initAttrValue(){ public void initAttrValue(){
this.siteId = -1L;
this.catalogId = -1L; this.catalogId = -1L;
this.catalogCode = ""; this.catalogCode = "";
...@@ -115,10 +117,6 @@ public class PrintLogEntity extends PrintLogVo { ...@@ -115,10 +117,6 @@ public class PrintLogEntity extends PrintLogVo {
this.certificateCode = ""; this.certificateCode = "";
this.templateId = -1L;
this.templateName = "";
this.enterpriseName = ""; this.enterpriseName = "";
this.holderName = ""; this.holderName = "";
...@@ -136,5 +134,13 @@ public class PrintLogEntity extends PrintLogVo { ...@@ -136,5 +134,13 @@ public class PrintLogEntity extends PrintLogVo {
this.statusRemark = ""; this.statusRemark = "";
this.deviceId = -1L; this.deviceId = -1L;
this.siteId = -1L;
this.templateId = -1L;
this.templateName = "";
this.mobile = "";
} }
} }
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintLogQuery.java
View file @ 37354cdd
...@@ -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 2023-05-24 * @date 2023-07-05
*/ */
public class PrintLogQuery extends PrintLogEntity { public class PrintLogQuery extends PrintLogEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -25,21 +25,6 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -25,21 +25,6 @@ public class PrintLogQuery extends PrintLogEntity {
/** 序号，主键，自增长排除列表 */ /** 序号，主键，自增长排除列表 */
private List <Long> idNotList; private List <Long> idNotList;
/** 开始 站点id */
private Long siteIdStart;
/** 结束 站点id */
private Long siteIdEnd;
/** 增加 站点id */
private Long siteIdIncrement;
/** 站点id列表 */
private List <Long> siteIdList;
/** 站点id排除列表 */
private List <Long> siteIdNotList;
/** 开始 证照目录ID */ /** 开始 证照目录ID */
private Long catalogIdStart; private Long catalogIdStart;
...@@ -75,26 +60,6 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -75,26 +60,6 @@ public class PrintLogQuery extends PrintLogEntity {
/** 证照编号排除列表 */ /** 证照编号排除列表 */
private List <String> certificateCodeNotList; private List <String> certificateCodeNotList;
/** 开始 证照目录模板ID */
private Long templateIdStart;
/** 结束 证照目录模板ID */
private Long templateIdEnd;
/** 增加 证照目录模板ID */
private Long templateIdIncrement;
/** 证照目录模板ID列表 */
private List <Long> templateIdList;
/** 证照目录模板ID排除列表 */
private List <Long> templateIdNotList;
/** 证照模板名称 */
private List<String> templateNameList;
/** 证照模板名称排除列表 */
private List <String> templateNameNotList;
/** 企业名称 */ /** 企业名称 */
private List<String> enterpriseNameList; private List<String> enterpriseNameList;
...@@ -203,6 +168,46 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -203,6 +168,46 @@ public class PrintLogQuery extends PrintLogEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 开始 站点id */
private Long siteIdStart;
/** 结束 站点id */
private Long siteIdEnd;
/** 增加 站点id */
private Long siteIdIncrement;
/** 站点id列表 */
private List <Long> siteIdList;
/** 站点id排除列表 */
private List <Long> siteIdNotList;
/** 开始 证照目录模板ID */
private Long templateIdStart;
/** 结束 证照目录模板ID */
private Long templateIdEnd;
/** 增加 证照目录模板ID */
private Long templateIdIncrement;
/** 证照目录模板ID列表 */
private List <Long> templateIdList;
/** 证照目录模板ID排除列表 */
private List <Long> templateIdNotList;
/** 证照模板名称 */
private List<String> templateNameList;
/** 证照模板名称排除列表 */
private List <String> templateNameNotList;
/** 手机号码 */
private List<String> mobileList;
/** 手机号码排除列表 */
private List <String> mobileNotList;
/** 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<PrintLogQuery> orConditionList; private List<PrintLogQuery> orConditionList;
...@@ -292,87 +297,6 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -292,87 +297,6 @@ public class PrintLogQuery extends PrintLogEntity {
} }
/**
* 获取 开始 站点id
* @return siteIdStart
*/
public Long getSiteIdStart(){
return this.siteIdStart;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
}
/**
* 获取 结束 站点id
* @return $siteIdEnd
*/
public Long getSiteIdEnd(){
return this.siteIdEnd;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
}
/**
* 获取 增加 站点id
* @return siteIdIncrement
*/
public Long getSiteIdIncrement(){
return this.siteIdIncrement;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
}
/**
* 获取 站点id
* @return siteIdList
*/
public List<Long> getSiteIdList(){
return this.siteIdList;
}
/**
* 设置 站点id
* @param siteIdList
*/
public void setSiteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
}
/**
* 获取 站点id
* @return siteIdNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/** /**
* 获取 开始 证照目录ID * 获取 开始 证照目录ID
* @return catalogIdStart * @return catalogIdStart
...@@ -583,217 +507,104 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -583,217 +507,104 @@ public class PrintLogQuery extends PrintLogEntity {
} }
/** /**
* 获取 开始 证照目录模板ID * 获取 企业名称
* @return templateIdStart * @return enterpriseNameList
*/ */
public Long getTemplateIdStart(){ public List<String> getEnterpriseNameList(){
return this.templateIdStart; return this.enterpriseNameList;
} }
/** /**
* 设置 开始 证照目录模板ID * 设置 企业名称
* @param templateIdStart * @param enterpriseNameList
*/ */
public void setTemplateIdStart(Long templateIdStart){ public void setEnterpriseNameList(List<String> enterpriseNameList){
this.templateIdStart = templateIdStart; this.enterpriseNameList = enterpriseNameList;
} }
/** /**
* 获取 结束 证照目录模板ID * 获取 企业名称
* @return $templateIdEnd * @return enterpriseNameNotList
*/ */
public Long getTemplateIdEnd(){ public List<String> getEnterpriseNameNotList(){
return this.templateIdEnd; return this.enterpriseNameNotList;
} }
/** /**
* 设置 结束 证照目录模板ID * 设置 企业名称
* @param templateIdEnd * @param enterpriseNameNotList
*/ */
public void setTemplateIdEnd(Long templateIdEnd){ public void setEnterpriseNameNotList(List<String> enterpriseNameNotList){
this.templateIdEnd = templateIdEnd; this.enterpriseNameNotList = enterpriseNameNotList;
} }
/** /**
* 获取 增加 证照目录模板ID * 获取 持有者姓名
* @return templateIdIncrement * @return holderNameList
*/ */
public Long getTemplateIdIncrement(){ public List<String> getHolderNameList(){
return this.templateIdIncrement; return this.holderNameList;
} }
/** /**
* 设置 增加 证照目录模板ID * 设置 持有者姓名
* @param templateIdIncrement * @param holderNameList
*/ */
public void setTemplateIdIncrement(Long templateIdIncrement){ public void setHolderNameList(List<String> holderNameList){
this.templateIdIncrement = templateIdIncrement; this.holderNameList = holderNameList;
} }
/** /**
* 获取 证照目录模板ID * 获取 持有者姓名
* @return templateIdList * @return holderNameNotList
*/ */
public List<Long> getTemplateIdList(){ public List<String> getHolderNameNotList(){
return this.templateIdList; return this.holderNameNotList;
} }
/** /**
* 设置 证照目录模板ID * 设置 持有者姓名
* @param templateIdList * @param holderNameNotList
*/ */
public void setTemplateIdList(List<Long> templateIdList){ public void setHolderNameNotList(List<String> holderNameNotList){
this.templateIdList = templateIdList; this.holderNameNotList = holderNameNotList;
} }
/** /**
* 获取 证照目录模板ID * 获取 持有者证件号码
* @return templateIdNotList * @return holderIDCardNoList
*/ */
public List<Long> getTemplateIdNotList(){ public List<String> getHolderIDCardNoList(){
return this.templateIdNotList; return this.holderIDCardNoList;
} }
/** /**
* 设置 证照目录模板ID * 设置 持有者证件号码
* @param templateIdNotList * @param holderIDCardNoList
*/ */
public void setTemplateIdNotList(List<Long> templateIdNotList){ public void setHolderIDCardNoList(List<String> holderIDCardNoList){
this.templateIdNotList = templateIdNotList; this.holderIDCardNoList = holderIDCardNoList;
} }
/** /**
* 获取 证照模板名称 * 获取 持有者证件号码
* @return templateNameList * @return holderIDCardNoNotList
*/ */
public List<String> getTemplateNameList(){ public List<String> getHolderIDCardNoNotList(){
return this.templateNameList; return this.holderIDCardNoNotList;
} }
/** /**
* 设置 证照模板名称 * 设置 持有者证件号码
* @param templateNameList * @param holderIDCardNoNotList
*/ */
public void setTemplateNameList(List<String> templateNameList){ public void setHolderIDCardNoNotList(List<String> holderIDCardNoNotList){
this.templateNameList = templateNameList; this.holderIDCardNoNotList = holderIDCardNoNotList;
} }
/** /**
* 获取 证照模板名称 * 获取 取件人姓名
* @return templateNameNotList * @return pickerNameList
*/
public List<String> getTemplateNameNotList(){
return this.templateNameNotList;
}
/**
* 设置 证照模板名称
* @param templateNameNotList
*/
public void setTemplateNameNotList(List<String> templateNameNotList){
this.templateNameNotList = templateNameNotList;
}
/**
* 获取 企业名称
* @return enterpriseNameList
*/
public List<String> getEnterpriseNameList(){
return this.enterpriseNameList;
}
/**
* 设置 企业名称
* @param enterpriseNameList
*/
public void setEnterpriseNameList(List<String> enterpriseNameList){
this.enterpriseNameList = enterpriseNameList;
}
/**
* 获取 企业名称
* @return enterpriseNameNotList
*/
public List<String> getEnterpriseNameNotList(){
return this.enterpriseNameNotList;
}
/**
* 设置 企业名称
* @param enterpriseNameNotList
*/
public void setEnterpriseNameNotList(List<String> enterpriseNameNotList){
this.enterpriseNameNotList = enterpriseNameNotList;
}
/**
* 获取 持有者姓名
* @return holderNameList
*/
public List<String> getHolderNameList(){
return this.holderNameList;
}
/**
* 设置 持有者姓名
* @param holderNameList
*/
public void setHolderNameList(List<String> holderNameList){
this.holderNameList = holderNameList;
}
/**
* 获取 持有者姓名
* @return holderNameNotList
*/
public List<String> getHolderNameNotList(){
return this.holderNameNotList;
}
/**
* 设置 持有者姓名
* @param holderNameNotList
*/
public void setHolderNameNotList(List<String> holderNameNotList){
this.holderNameNotList = holderNameNotList;
}
/**
* 获取 持有者证件号码
* @return holderIDCardNoList
*/
public List<String> getHolderIDCardNoList(){
return this.holderIDCardNoList;
}
/**
* 设置 持有者证件号码
* @param holderIDCardNoList
*/
public void setHolderIDCardNoList(List<String> holderIDCardNoList){
this.holderIDCardNoList = holderIDCardNoList;
}
/**
* 获取 持有者证件号码
* @return holderIDCardNoNotList
*/
public List<String> getHolderIDCardNoNotList(){
return this.holderIDCardNoNotList;
}
/**
* 设置 持有者证件号码
* @param holderIDCardNoNotList
*/
public void setHolderIDCardNoNotList(List<String> holderIDCardNoNotList){
this.holderIDCardNoNotList = holderIDCardNoNotList;
}
/**
* 获取 取件人姓名
* @return pickerNameList
*/ */
public List<String> getPickerNameList(){ public List<String> getPickerNameList(){
return this.pickerNameList; return this.pickerNameList;
...@@ -1308,313 +1119,412 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -1308,313 +1119,412 @@ public class PrintLogQuery extends PrintLogEntity {
} }
/** /**
* 设置 序号，主键，自增长 * 获取 开始 站点id
* @param id * @return siteIdStart
*/ */
public PrintLogQuery id(Long id){ public Long getSiteIdStart(){
setId(id); return this.siteIdStart;
return this;
} }
/** /**
* 设置 开始 序号，主键，自增长 * 设置 开始 站点id
* @param idStart * @param siteIdStart
*/ */
public PrintLogQuery idStart(Long idStart){ public void setSiteIdStart(Long siteIdStart){
this.idStart = idStart; this.siteIdStart = siteIdStart;
return this;
} }
/** /**
* 设置 结束 序号，主键，自增长 * 获取 结束 站点id
* @param idEnd * @return $siteIdEnd
*/ */
public PrintLogQuery idEnd(Long idEnd){ public Long getSiteIdEnd(){
this.idEnd = idEnd; return this.siteIdEnd;
return this;
} }
/** /**
* 设置 增加 序号，主键，自增长 * 设置 结束 站点id
* @param idIncrement * @param siteIdEnd
*/ */
public PrintLogQuery idIncrement(Long idIncrement){ public void setSiteIdEnd(Long siteIdEnd){
this.idIncrement = idIncrement; this.siteIdEnd = siteIdEnd;
return this;
} }
/** /**
* 设置 序号，主键，自增长 * 获取 增加 站点id
* @param idList * @return siteIdIncrement
*/ */
public PrintLogQuery idList(List<Long> idList){ public Long getSiteIdIncrement(){
this.idList = idList; return this.siteIdIncrement;
return this;
} }
/** /**
* 设置 序号，主键，自增长 * 设置 增加 站点id
* @param idNotList * @param siteIdIncrement
*/ */
public PrintLogQuery idNotList(List<Long> idNotList){ public void setSiteIdIncrement(Long siteIdIncrement){
this.idNotList = idNotList; this.siteIdIncrement = siteIdIncrement;
return this;
} }
/** /**
* 设置 站点id * 获取 站点id
* @param siteId * @return siteIdList
*/ */
public PrintLogQuery siteId(Long siteId){ public List<Long> getSiteIdList(){
setSiteId(siteId); return this.siteIdList;
return this;
} }
/** /**
* 设置 开始 站点id * 设置 站点id
* @param siteIdStart * @param siteIdList
*/ */
public PrintLogQuery siteIdStart(Long siteIdStart){ public void setSiteIdList(List<Long> siteIdList){
this.siteIdStart = siteIdStart; this.siteIdList = siteIdList;
return this;
} }
/** /**
* 设置 结束 站点id * 获取 站点id
* @param siteIdEnd * @return siteIdNotList
*/ */
public PrintLogQuery siteIdEnd(Long siteIdEnd){ public List<Long> getSiteIdNotList(){
this.siteIdEnd = siteIdEnd; return this.siteIdNotList;
return this;
} }
/** /**
* 设置 增加 站点id * 设置 站点id
* @param siteIdIncrement * @param siteIdNotList
*/ */
public PrintLogQuery siteIdIncrement(Long siteIdIncrement){ public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdIncrement = siteIdIncrement; this.siteIdNotList = siteIdNotList;
return this;
} }
/** /**
* 设置 站点id * 获取 开始 证照目录模板ID
* @param siteIdList * @return templateIdStart
*/ */
public PrintLogQuery siteIdList(List<Long> siteIdList){ public Long getTemplateIdStart(){
this.siteIdList = siteIdList; return this.templateIdStart;
return this;
} }
/** /**
* 设置 站点id * 设置 开始 证照目录模板ID
* @param siteIdNotList * @param templateIdStart
*/ */
public PrintLogQuery siteIdNotList(List<Long> siteIdNotList){ public void setTemplateIdStart(Long templateIdStart){
this.siteIdNotList = siteIdNotList; this.templateIdStart = templateIdStart;
return this;
} }
/** /**
* 设置 证照目录ID * 获取 结束 证照目录模板ID
* @param catalogId * @return $templateIdEnd
*/ */
public PrintLogQuery catalogId(Long catalogId){ public Long getTemplateIdEnd(){
setCatalogId(catalogId); return this.templateIdEnd;
return this;
} }
/** /**
* 设置 开始 证照目录ID * 设置 结束 证照目录模板ID
* @param catalogIdStart * @param templateIdEnd
*/ */
public PrintLogQuery catalogIdStart(Long catalogIdStart){ public void setTemplateIdEnd(Long templateIdEnd){
this.catalogIdStart = catalogIdStart; this.templateIdEnd = templateIdEnd;
return this;
} }
/** /**
* 设置 结束 证照目录ID * 获取 增加 证照目录模板ID
* @param catalogIdEnd * @return templateIdIncrement
*/ */
public PrintLogQuery catalogIdEnd(Long catalogIdEnd){ public Long getTemplateIdIncrement(){
this.catalogIdEnd = catalogIdEnd; return this.templateIdIncrement;
return this;
} }
/** /**
* 设置 增加 证照目录ID * 设置 增加 证照目录模板ID
* @param catalogIdIncrement * @param templateIdIncrement
*/ */
public PrintLogQuery catalogIdIncrement(Long catalogIdIncrement){ public void setTemplateIdIncrement(Long templateIdIncrement){
this.catalogIdIncrement = catalogIdIncrement; this.templateIdIncrement = templateIdIncrement;
return this;
} }
/** /**
* 设置 证照目录ID * 获取 证照目录模板ID
* @param catalogIdList * @return templateIdList
*/ */
public PrintLogQuery catalogIdList(List<Long> catalogIdList){ public List<Long> getTemplateIdList(){
this.catalogIdList = catalogIdList; return this.templateIdList;
return this;
} }
/** /**
* 设置 证照目录ID * 设置 证照目录模板ID
* @param catalogIdNotList * @param templateIdList
*/ */
public PrintLogQuery catalogIdNotList(List<Long> catalogIdNotList){ public void setTemplateIdList(List<Long> templateIdList){
this.catalogIdNotList = catalogIdNotList; this.templateIdList = templateIdList;
return this; }
/**
* 获取 证照目录模板ID
* @return templateIdNotList
*/
public List<Long> getTemplateIdNotList(){
return this.templateIdNotList;
}
/**
* 设置 证照目录模板ID
* @param templateIdNotList
*/
public void setTemplateIdNotList(List<Long> templateIdNotList){
this.templateIdNotList = templateIdNotList;
} }
/** /**
* 设置 证照目录编号 * 获取 证照模板名称
* @param catalogCode * @return templateNameList
*/ */
public PrintLogQuery catalogCode(String catalogCode){ public List<String> getTemplateNameList(){
setCatalogCode(catalogCode); return this.templateNameList;
}
/**
* 设置 证照模板名称
* @param templateNameList
*/
public void setTemplateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
}
/**
* 获取 证照模板名称
* @return templateNameNotList
*/
public List<String> getTemplateNameNotList(){
return this.templateNameNotList;
}
/**
* 设置 证照模板名称
* @param templateNameNotList
*/
public void setTemplateNameNotList(List<String> templateNameNotList){
this.templateNameNotList = templateNameNotList;
}
/**
* 获取 手机号码
* @return mobileList
*/
public List<String> getMobileList(){
return this.mobileList;
}
/**
* 设置 手机号码
* @param mobileList
*/
public void setMobileList(List<String> mobileList){
this.mobileList = mobileList;
}
/**
* 获取 手机号码
* @return mobileNotList
*/
public List<String> getMobileNotList(){
return this.mobileNotList;
}
/**
* 设置 手机号码
* @param mobileNotList
*/
public void setMobileNotList(List<String> mobileNotList){
this.mobileNotList = mobileNotList;
}
/**
* 设置 序号，主键，自增长
* @param id
*/
public PrintLogQuery id(Long id){
setId(id);
return this; return this;
} }
/** /**
* 设置 证照目录编号 * 设置 开始 序号，主键，自增长
* @param catalogCodeList * @param idStart
*/ */
public PrintLogQuery catalogCodeList(List<String> catalogCodeList){ public PrintLogQuery idStart(Long idStart){
this.catalogCodeList = catalogCodeList; this.idStart = idStart;
return this; return this;
} }
/**
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
public PrintLogQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/** /**
* 设置 目录名称 * 设置 增加 序号，主键，自增长
* @param catalogName * @param idIncrement
*/ */
public PrintLogQuery catalogName(String catalogName){ public PrintLogQuery idIncrement(Long idIncrement){
setCatalogName(catalogName); this.idIncrement = idIncrement;
return this; return this;
} }
/** /**
* 设置 目录名称 * 设置 序号，主键，自增长
* @param catalogNameList * @param idList
*/ */
public PrintLogQuery catalogNameList(List<String> catalogNameList){ public PrintLogQuery idList(List<Long> idList){
this.catalogNameList = catalogNameList; this.idList = idList;
return this; return this;
} }
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public PrintLogQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/** /**
* 设置 证照名称 * 设置 证照目录ID
* @param certificateName * @param catalogId
*/ */
public PrintLogQuery certificateName(String certificateName){ public PrintLogQuery catalogId(Long catalogId){
setCertificateName(certificateName); setCatalogId(catalogId);
return this; return this;
} }
/** /**
* 设置 证照名称 * 设置 开始 证照目录ID
* @param certificateNameList * @param catalogIdStart
*/ */
public PrintLogQuery certificateNameList(List<String> certificateNameList){ public PrintLogQuery catalogIdStart(Long catalogIdStart){
this.certificateNameList = certificateNameList; this.catalogIdStart = catalogIdStart;
return this; return this;
} }
/**
* 设置 结束 证照目录ID
* @param catalogIdEnd
*/
public PrintLogQuery catalogIdEnd(Long catalogIdEnd){
this.catalogIdEnd = catalogIdEnd;
return this;
}
/** /**
* 设置 证照编号 * 设置 增加 证照目录ID
* @param certificateCode * @param catalogIdIncrement
*/ */
public PrintLogQuery certificateCode(String certificateCode){ public PrintLogQuery catalogIdIncrement(Long catalogIdIncrement){
setCertificateCode(certificateCode); this.catalogIdIncrement = catalogIdIncrement;
return this; return this;
} }
/** /**
* 设置 证照编号 * 设置 证照目录ID
* @param certificateCodeList * @param catalogIdList
*/ */
public PrintLogQuery certificateCodeList(List<String> certificateCodeList){ public PrintLogQuery catalogIdList(List<Long> catalogIdList){
this.certificateCodeList = certificateCodeList; this.catalogIdList = catalogIdList;
return this; return this;
} }
/** /**
* 设置 证照目录模板ID * 设置 证照目录ID
* @param templateId * @param catalogIdNotList
*/ */
public PrintLogQuery templateId(Long templateId){ public PrintLogQuery catalogIdNotList(List<Long> catalogIdNotList){
setTemplateId(templateId); this.catalogIdNotList = catalogIdNotList;
return this; return this;
} }
/** /**
* 设置 开始 证照目录模板ID * 设置 证照目录编号
* @param templateIdStart * @param catalogCode
*/ */
public PrintLogQuery templateIdStart(Long templateIdStart){ public PrintLogQuery catalogCode(String catalogCode){
this.templateIdStart = templateIdStart; setCatalogCode(catalogCode);
return this; return this;
} }
/** /**
* 设置 结束 证照目录模板ID * 设置 证照目录编号
* @param templateIdEnd * @param catalogCodeList
*/ */
public PrintLogQuery templateIdEnd(Long templateIdEnd){ public PrintLogQuery catalogCodeList(List<String> catalogCodeList){
this.templateIdEnd = templateIdEnd; this.catalogCodeList = catalogCodeList;
return this; return this;
} }
/** /**
* 设置 增加 证照目录模板ID * 设置 目录名称
* @param templateIdIncrement * @param catalogName
*/ */
public PrintLogQuery templateIdIncrement(Long templateIdIncrement){ public PrintLogQuery catalogName(String catalogName){
this.templateIdIncrement = templateIdIncrement; setCatalogName(catalogName);
return this; return this;
} }
/** /**
* 设置 证照目录模板ID * 设置 目录名称
* @param templateIdList * @param catalogNameList
*/ */
public PrintLogQuery templateIdList(List<Long> templateIdList){ public PrintLogQuery catalogNameList(List<String> catalogNameList){
this.templateIdList = templateIdList; this.catalogNameList = catalogNameList;
return this; return this;
} }
/** /**
* 设置 证照目录模板ID * 设置 证照名称
* @param templateIdNotList * @param certificateName
*/ */
public PrintLogQuery templateIdNotList(List<Long> templateIdNotList){ public PrintLogQuery certificateName(String certificateName){
this.templateIdNotList = templateIdNotList; setCertificateName(certificateName);
return this;
}
/**
* 设置 证照名称
* @param certificateNameList
*/
public PrintLogQuery certificateNameList(List<String> certificateNameList){
this.certificateNameList = certificateNameList;
return this; return this;
} }
/** /**
* 设置 证照模板名称 * 设置 证照编号
* @param templateName * @param certificateCode
*/ */
public PrintLogQuery templateName(String templateName){ public PrintLogQuery certificateCode(String certificateCode){
setTemplateName(templateName); setCertificateCode(certificateCode);
return this; return this;
} }
/** /**
* 设置 证照模板名称 * 设置 证照编号
* @param templateNameList * @param certificateCodeList
*/ */
public PrintLogQuery templateNameList(List<String> templateNameList){ public PrintLogQuery certificateCodeList(List<String> certificateCodeList){
this.templateNameList = templateNameList; this.certificateCodeList = certificateCodeList;
return this; return this;
} }
...@@ -1951,6 +1861,152 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -1951,6 +1861,152 @@ public class PrintLogQuery extends PrintLogEntity {
} }
/**
* 设置 站点id
* @param siteId
*/
public PrintLogQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public PrintLogQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public PrintLogQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public PrintLogQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点id
* @param siteIdList
*/
public PrintLogQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public PrintLogQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateId
*/
public PrintLogQuery templateId(Long templateId){
setTemplateId(templateId);
return this;
}
/**
* 设置 开始 证照目录模板ID
* @param templateIdStart
*/
public PrintLogQuery templateIdStart(Long templateIdStart){
this.templateIdStart = templateIdStart;
return this;
}
/**
* 设置 结束 证照目录模板ID
* @param templateIdEnd
*/
public PrintLogQuery templateIdEnd(Long templateIdEnd){
this.templateIdEnd = templateIdEnd;
return this;
}
/**
* 设置 增加 证照目录模板ID
* @param templateIdIncrement
*/
public PrintLogQuery templateIdIncrement(Long templateIdIncrement){
this.templateIdIncrement = templateIdIncrement;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateIdList
*/
public PrintLogQuery templateIdList(List<Long> templateIdList){
this.templateIdList = templateIdList;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateIdNotList
*/
public PrintLogQuery templateIdNotList(List<Long> templateIdNotList){
this.templateIdNotList = templateIdNotList;
return this;
}
/**
* 设置 证照模板名称
* @param templateName
*/
public PrintLogQuery templateName(String templateName){
setTemplateName(templateName);
return this;
}
/**
* 设置 证照模板名称
* @param templateNameList
*/
public PrintLogQuery templateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
return this;
}
/**
* 设置 手机号码
* @param mobile
*/
public PrintLogQuery mobile(String mobile){
setMobile(mobile);
return this;
}
/**
* 设置 手机号码
* @param mobileList
*/
public PrintLogQuery mobileList(List<String> mobileList){
this.mobileList = mobileList;
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/PrintWaitQueueEntity.java
View file @ 37354cdd
...@@ -7,19 +7,15 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -7,19 +7,15 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.record.model.vo.PrintWaitQueueVo; import com.mortals.xhx.module.record.model.vo.PrintWaitQueueVo;
import lombok.Data; import lombok.Data;
/** /**
* 证照打印记录实体对象 * 证照打印记录实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-24 * @date 2023-07-05
*/ */
@Data @Data
public class PrintWaitQueueEntity extends PrintWaitQueueVo { public class PrintWaitQueueEntity extends PrintWaitQueueVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
* 站点id
*/
private Long siteId;
/** /**
* 证照档案ID * 证照档案ID
*/ */
...@@ -41,14 +37,6 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo { ...@@ -41,14 +37,6 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
*/ */
private String catalogName; private String catalogName;
/** /**
* 证照目录模板ID
*/
private Long templateId;
/**
* 证照模板名称
*/
private String templateName;
/**
* 证照名称 * 证照名称
*/ */
private String certificateName; private String certificateName;
...@@ -92,6 +80,22 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo { ...@@ -92,6 +80,22 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
* 允许打印次数 * 允许打印次数
*/ */
private Integer total; private Integer total;
/**
* 站点id
*/
private Long siteId;
/**
* 证照目录模板ID
*/
private Long templateId;
/**
* 证照模板名称
*/
private String templateName;
/**
* 手机号码
*/
private String mobile;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -110,8 +114,6 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo { ...@@ -110,8 +114,6 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
public void initAttrValue(){ public void initAttrValue(){
this.siteId = -1L;
this.recordId = -1L; this.recordId = -1L;
this.applyId = -1L; this.applyId = -1L;
...@@ -122,10 +124,6 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo { ...@@ -122,10 +124,6 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
this.catalogName = ""; this.catalogName = "";
this.templateId = -1L;
this.templateName = "";
this.certificateName = ""; this.certificateName = "";
this.certificateCode = ""; this.certificateCode = "";
...@@ -147,5 +145,13 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo { ...@@ -147,5 +145,13 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
this.printStatus = 0; this.printStatus = 0;
this.total = 1; this.total = 1;
this.siteId = -1L;
this.templateId = -1L;
this.templateName = "";
this.mobile = "";
} }
} }
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintWaitQueueQuery.java
View file @ 37354cdd
...@@ -3,42 +3,12 @@ package com.mortals.xhx.module.record.model; ...@@ -3,42 +3,12 @@ package com.mortals.xhx.module.record.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.record.model.PrintWaitQueueEntity; import com.mortals.xhx.module.record.model.PrintWaitQueueEntity;
/** /**
* 证照打印记录查询对象 * 证照打印记录查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-24 * @date 2023-07-05
*/ */
public class PrintWaitQueueQuery extends PrintWaitQueueEntity { public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
/** 开始 序号，主键，自增长 */
private Long idStart;
/** 结束 序号，主键，自增长 */
private Long idEnd;
/** 增加 序号，主键，自增长 */
private Long idIncrement;
/** 序号，主键，自增长列表 */
private List <Long> idList;
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 站点id */
private Long siteIdStart;
/** 结束 站点id */
private Long siteIdEnd;
/** 增加 站点id */
private Long siteIdIncrement;
/** 站点id列表 */
private List <Long> siteIdList;
/** 站点id排除列表 */
private List <Long> siteIdNotList;
/** 开始 证照档案ID */ /** 开始 证照档案ID */
private Long recordIdStart; private Long recordIdStart;
...@@ -94,26 +64,6 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -94,26 +64,6 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
/** 目录名称排除列表 */ /** 目录名称排除列表 */
private List <String> catalogNameNotList; private List <String> catalogNameNotList;
/** 开始 证照目录模板ID */
private Long templateIdStart;
/** 结束 证照目录模板ID */
private Long templateIdEnd;
/** 增加 证照目录模板ID */
private Long templateIdIncrement;
/** 证照目录模板ID列表 */
private List <Long> templateIdList;
/** 证照目录模板ID排除列表 */
private List <Long> templateIdNotList;
/** 证照模板名称 */
private List<String> templateNameList;
/** 证照模板名称排除列表 */
private List <String> templateNameNotList;
/** 证照名称 */ /** 证照名称 */
private List<String> certificateNameList; private List<String> certificateNameList;
...@@ -231,175 +181,68 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -231,175 +181,68 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** 开始 站点id */
private List<PrintWaitQueueQuery> orConditionList; private Long siteIdStart;
/** 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;
}
/** /** 结束 站点id */
* 设置 结束 序号，主键，自增长 private Long siteIdEnd;
* @param idEnd
*/
public void setIdEnd(Long idEnd){
this.idEnd = idEnd;
}
/** /** 增加 站点id */
* 获取 增加 序号，主键，自增长 private Long siteIdIncrement;
* @return idIncrement
*/
public Long getIdIncrement(){
return this.idIncrement;
}
/** /** 站点id列表 */
* 设置 增加 序号，主键，自增长 private List <Long> siteIdList;
* @param idIncrement
*/
public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement;
}
/** /** 站点id排除列表 */
* 获取 序号，主键，自增长 private List <Long> siteIdNotList;
* @return idList
*/
public List<Long> getIdList(){
return this.idList;
}
/** /** 开始 序号，主键，自增长 */
* 设置 序号，主键，自增长 private Long IdStart;
* @param idList
*/
public void setIdList(List<Long> idList){
this.idList = idList;
}
/** /** 结束 序号，主键，自增长 */
* 获取 序号，主键，自增长 private Long IdEnd;
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/** /** 增加 序号，主键，自增长 */
* 设置 序号，主键，自增长 private Long IdIncrement;
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/** 序号，主键，自增长列表 */
private List <Long> IdList;
/** /** 序号，主键，自增长排除列表 */
* 获取 开始 站点id private List <Long> IdNotList;
* @return siteIdStart
*/
public Long getSiteIdStart(){
return this.siteIdStart;
}
/** /** 开始 证照目录模板ID */
* 设置 开始 站点id private Long templateIdStart;
* @param siteIdStart
*/
public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
}
/** /** 结束 证照目录模板ID */
* 获取 结束 站点id private Long templateIdEnd;
* @return $siteIdEnd
*/
public Long getSiteIdEnd(){
return this.siteIdEnd;
}
/** /** 增加 证照目录模板ID */
* 设置 结束 站点id private Long templateIdIncrement;
* @param siteIdEnd
*/
public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
}
/** /** 证照目录模板ID列表 */
* 获取 增加 站点id private List <Long> templateIdList;
* @return siteIdIncrement
*/
public Long getSiteIdIncrement(){
return this.siteIdIncrement;
}
/** /** 证照目录模板ID排除列表 */
* 设置 增加 站点id private List <Long> templateIdNotList;
* @param siteIdIncrement
*/
public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
}
/** /** 证照模板名称 */
* 获取 站点id private List<String> templateNameList;
* @return siteIdList
*/
public List<Long> getSiteIdList(){
return this.siteIdList;
}
/** /** 证照模板名称排除列表 */
* 设置 站点id private List <String> templateNameNotList;
* @param siteIdList /** 手机号码 */
*/ private List<String> mobileList;
public void setSiteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
}
/** /** 手机号码排除列表 */
* 获取 站点id private List <String> mobileNotList;
* @return siteIdNotList /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
*/ private List<PrintWaitQueueQuery> orConditionList;
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
}
/** /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
* 设置 站点id private List<PrintWaitQueueQuery> andConditionList;
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
public PrintWaitQueueQuery(){}
/** /**
* 获取 开始 证照档案ID * 获取 开始 证照档案ID
...@@ -692,133 +535,20 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -692,133 +535,20 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
this.catalogNameList = catalogNameList; this.catalogNameList = catalogNameList;
} }
/** /**
* 获取 目录名称 * 获取 目录名称
* @return catalogNameNotList * @return catalogNameNotList
*/
public List<String> getCatalogNameNotList(){
return this.catalogNameNotList;
}
/**
* 设置 目录名称
* @param catalogNameNotList
*/
public void setCatalogNameNotList(List<String> catalogNameNotList){
this.catalogNameNotList = catalogNameNotList;
}
/**
* 获取 开始 证照目录模板ID
* @return templateIdStart
*/
public Long getTemplateIdStart(){
return this.templateIdStart;
}
/**
* 设置 开始 证照目录模板ID
* @param templateIdStart
*/
public void setTemplateIdStart(Long templateIdStart){
this.templateIdStart = templateIdStart;
}
/**
* 获取 结束 证照目录模板ID
* @return $templateIdEnd
*/
public Long getTemplateIdEnd(){
return this.templateIdEnd;
}
/**
* 设置 结束 证照目录模板ID
* @param templateIdEnd
*/
public void setTemplateIdEnd(Long templateIdEnd){
this.templateIdEnd = templateIdEnd;
}
/**
* 获取 增加 证照目录模板ID
* @return templateIdIncrement
*/
public Long getTemplateIdIncrement(){
return this.templateIdIncrement;
}
/**
* 设置 增加 证照目录模板ID
* @param templateIdIncrement
*/
public void setTemplateIdIncrement(Long templateIdIncrement){
this.templateIdIncrement = templateIdIncrement;
}
/**
* 获取 证照目录模板ID
* @return templateIdList
*/
public List<Long> getTemplateIdList(){
return this.templateIdList;
}
/**
* 设置 证照目录模板ID
* @param templateIdList
*/
public void setTemplateIdList(List<Long> templateIdList){
this.templateIdList = templateIdList;
}
/**
* 获取 证照目录模板ID
* @return templateIdNotList
*/
public List<Long> getTemplateIdNotList(){
return this.templateIdNotList;
}
/**
* 设置 证照目录模板ID
* @param templateIdNotList
*/
public void setTemplateIdNotList(List<Long> templateIdNotList){
this.templateIdNotList = templateIdNotList;
}
/**
* 获取 证照模板名称
* @return templateNameList
*/
public List<String> getTemplateNameList(){
return this.templateNameList;
}
/**
* 设置 证照模板名称
* @param templateNameList
*/
public void setTemplateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
}
/**
* 获取 证照模板名称
* @return templateNameNotList
*/ */
public List<String> getTemplateNameNotList(){ public List<String> getCatalogNameNotList(){
return this.templateNameNotList; return this.catalogNameNotList;
} }
/** /**
* 设置 证照模板名称 * 设置 目录名称
* @param templateNameNotList * @param catalogNameNotList
*/ */
public void setTemplateNameNotList(List<String> templateNameNotList){ public void setCatalogNameNotList(List<String> catalogNameNotList){
this.templateNameNotList = templateNameNotList; this.catalogNameNotList = catalogNameNotList;
} }
/** /**
...@@ -1498,111 +1228,310 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -1498,111 +1228,310 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
} }
/** /**
* 设置 序号，主键，自增长 * 获取 开始 站点id
* @param id * @return siteIdStart
*/ */
public PrintWaitQueueQuery id(Long id){ public Long getSiteIdStart(){
setId(id); return this.siteIdStart;
return this; }
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
}
/**
* 获取 结束 站点id
* @return $siteIdEnd
*/
public Long getSiteIdEnd(){
return this.siteIdEnd;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
}
/**
* 获取 增加 站点id
* @return siteIdIncrement
*/
public Long getSiteIdIncrement(){
return this.siteIdIncrement;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
}
/**
* 获取 站点id
* @return siteIdList
*/
public List<Long> getSiteIdList(){
return this.siteIdList;
}
/**
* 设置 站点id
* @param siteIdList
*/
public void setSiteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
}
/**
* 获取 站点id
* @return siteIdNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/**
* 获取 开始 序号，主键，自增长
* @return IdStart
*/
public Long getIdStart(){
return this.IdStart;
} }
/** /**
* 设置 开始 序号，主键，自增长 * 设置 开始 序号，主键，自增长
* @param idStart * @param IdStart
*/ */
public PrintWaitQueueQuery idStart(Long idStart){ public void setIdStart(Long IdStart){
this.idStart = idStart; this.IdStart = IdStart;
return this; }
/**
* 获取 结束 序号，主键，自增长
* @return $IdEnd
*/
public Long getIdEnd(){
return this.IdEnd;
} }
/** /**
* 设置 结束 序号，主键，自增长 * 设置 结束 序号，主键，自增长
* @param idEnd * @param IdEnd
*/ */
public PrintWaitQueueQuery idEnd(Long idEnd){ public void setIdEnd(Long IdEnd){
this.idEnd = idEnd; this.IdEnd = IdEnd;
return this; }
/**
* 获取 增加 序号，主键，自增长
* @return IdIncrement
*/
public Long getIdIncrement(){
return this.IdIncrement;
} }
/** /**
* 设置 增加 序号，主键，自增长 * 设置 增加 序号，主键，自增长
* @param idIncrement * @param IdIncrement
*/ */
public PrintWaitQueueQuery idIncrement(Long idIncrement){ public void setIdIncrement(Long IdIncrement){
this.idIncrement = idIncrement; this.IdIncrement = IdIncrement;
return this; }
/**
* 获取 序号，主键，自增长
* @return IdList
*/
public List<Long> getIdList(){
return this.IdList;
} }
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param idList * @param IdList
*/ */
public PrintWaitQueueQuery idList(List<Long> idList){ public void setIdList(List<Long> IdList){
this.idList = idList; this.IdList = IdList;
return this; }
/**
* 获取 序号，主键，自增长
* @return IdNotList
*/
public List<Long> getIdNotList(){
return this.IdNotList;
} }
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param idNotList * @param IdNotList
*/ */
public PrintWaitQueueQuery idNotList(List<Long> idNotList){ public void setIdNotList(List<Long> IdNotList){
this.idNotList = idNotList; this.IdNotList = IdNotList;
return this;
} }
/** /**
* 设置 站点id * 获取 开始 证照目录模板ID
* @param siteId * @return templateIdStart
*/ */
public PrintWaitQueueQuery siteId(Long siteId){ public Long getTemplateIdStart(){
setSiteId(siteId); return this.templateIdStart;
return this;
} }
/** /**
* 设置 开始 站点id * 设置 开始 证照目录模板ID
* @param siteIdStart * @param templateIdStart
*/ */
public PrintWaitQueueQuery siteIdStart(Long siteIdStart){ public void setTemplateIdStart(Long templateIdStart){
this.siteIdStart = siteIdStart; this.templateIdStart = templateIdStart;
return this;
} }
/** /**
* 设置 结束 站点id * 获取 结束 证照目录模板ID
* @param siteIdEnd * @return $templateIdEnd
*/ */
public PrintWaitQueueQuery siteIdEnd(Long siteIdEnd){ public Long getTemplateIdEnd(){
this.siteIdEnd = siteIdEnd; return this.templateIdEnd;
return this;
} }
/** /**
* 设置 增加 站点id * 设置 结束 证照目录模板ID
* @param siteIdIncrement * @param templateIdEnd
*/ */
public PrintWaitQueueQuery siteIdIncrement(Long siteIdIncrement){ public void setTemplateIdEnd(Long templateIdEnd){
this.siteIdIncrement = siteIdIncrement; this.templateIdEnd = templateIdEnd;
return this;
} }
/** /**
* 设置 站点id * 获取 增加 证照目录模板ID
* @param siteIdList * @return templateIdIncrement
*/
public Long getTemplateIdIncrement(){
return this.templateIdIncrement;
}
/**
* 设置 增加 证照目录模板ID
* @param templateIdIncrement
*/
public void setTemplateIdIncrement(Long templateIdIncrement){
this.templateIdIncrement = templateIdIncrement;
}
/**
* 获取 证照目录模板ID
* @return templateIdList
*/
public List<Long> getTemplateIdList(){
return this.templateIdList;
}
/**
* 设置 证照目录模板ID
* @param templateIdList
*/
public void setTemplateIdList(List<Long> templateIdList){
this.templateIdList = templateIdList;
}
/**
* 获取 证照目录模板ID
* @return templateIdNotList
*/
public List<Long> getTemplateIdNotList(){
return this.templateIdNotList;
}
/**
* 设置 证照目录模板ID
* @param templateIdNotList
*/
public void setTemplateIdNotList(List<Long> templateIdNotList){
this.templateIdNotList = templateIdNotList;
}
/**
* 获取 证照模板名称
* @return templateNameList
*/
public List<String> getTemplateNameList(){
return this.templateNameList;
}
/**
* 设置 证照模板名称
* @param templateNameList
*/
public void setTemplateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
}
/**
* 获取 证照模板名称
* @return templateNameNotList
*/
public List<String> getTemplateNameNotList(){
return this.templateNameNotList;
}
/**
* 设置 证照模板名称
* @param templateNameNotList
*/
public void setTemplateNameNotList(List<String> templateNameNotList){
this.templateNameNotList = templateNameNotList;
}
/**
* 获取 手机号码
* @return mobileList
*/
public List<String> getMobileList(){
return this.mobileList;
}
/**
* 设置 手机号码
* @param mobileList
*/
public void setMobileList(List<String> mobileList){
this.mobileList = mobileList;
}
/**
* 获取 手机号码
* @return mobileNotList
*/ */
public PrintWaitQueueQuery siteIdList(List<Long> siteIdList){ public List<String> getMobileNotList(){
this.siteIdList = siteIdList; return this.mobileNotList;
return this;
} }
/** /**
* 设置 站点id * 设置 手机号码
* @param siteIdNotList * @param mobileNotList
*/ */
public PrintWaitQueueQuery siteIdNotList(List<Long> siteIdNotList){ public void setMobileNotList(List<String> mobileNotList){
this.siteIdNotList = siteIdNotList; this.mobileNotList = mobileNotList;
return this;
} }
/** /**
...@@ -1805,79 +1734,6 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -1805,79 +1734,6 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
return this; return this;
} }
/**
* 设置 证照目录模板ID
* @param templateId
*/
public PrintWaitQueueQuery templateId(Long templateId){
setTemplateId(templateId);
return this;
}
/**
* 设置 开始 证照目录模板ID
* @param templateIdStart
*/
public PrintWaitQueueQuery templateIdStart(Long templateIdStart){
this.templateIdStart = templateIdStart;
return this;
}
/**
* 设置 结束 证照目录模板ID
* @param templateIdEnd
*/
public PrintWaitQueueQuery templateIdEnd(Long templateIdEnd){
this.templateIdEnd = templateIdEnd;
return this;
}
/**
* 设置 增加 证照目录模板ID
* @param templateIdIncrement
*/
public PrintWaitQueueQuery templateIdIncrement(Long templateIdIncrement){
this.templateIdIncrement = templateIdIncrement;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateIdList
*/
public PrintWaitQueueQuery templateIdList(List<Long> templateIdList){
this.templateIdList = templateIdList;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateIdNotList
*/
public PrintWaitQueueQuery templateIdNotList(List<Long> templateIdNotList){
this.templateIdNotList = templateIdNotList;
return this;
}
/**
* 设置 证照模板名称
* @param templateName
*/
public PrintWaitQueueQuery templateName(String templateName){
setTemplateName(templateName);
return this;
}
/**
* 设置 证照模板名称
* @param templateNameList
*/
public PrintWaitQueueQuery templateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
return this;
}
/** /**
* 设置 证照名称 * 设置 证照名称
...@@ -2267,6 +2123,206 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -2267,6 +2123,206 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
} }
/**
* 设置 站点id
* @param siteId
*/
public PrintWaitQueueQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public PrintWaitQueueQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public PrintWaitQueueQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public PrintWaitQueueQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点id
* @param siteIdList
*/
public PrintWaitQueueQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public PrintWaitQueueQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
/**
* 设置 序号，主键，自增长
* @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;
}
/**
* 设置 序号，主键，自增长
* @param IdNotList
*/
public PrintWaitQueueQuery IdNotList(List<Long> IdNotList){
this.IdNotList = IdNotList;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateId
*/
public PrintWaitQueueQuery templateId(Long templateId){
setTemplateId(templateId);
return this;
}
/**
* 设置 开始 证照目录模板ID
* @param templateIdStart
*/
public PrintWaitQueueQuery templateIdStart(Long templateIdStart){
this.templateIdStart = templateIdStart;
return this;
}
/**
* 设置 结束 证照目录模板ID
* @param templateIdEnd
*/
public PrintWaitQueueQuery templateIdEnd(Long templateIdEnd){
this.templateIdEnd = templateIdEnd;
return this;
}
/**
* 设置 增加 证照目录模板ID
* @param templateIdIncrement
*/
public PrintWaitQueueQuery templateIdIncrement(Long templateIdIncrement){
this.templateIdIncrement = templateIdIncrement;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateIdList
*/
public PrintWaitQueueQuery templateIdList(List<Long> templateIdList){
this.templateIdList = templateIdList;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateIdNotList
*/
public PrintWaitQueueQuery templateIdNotList(List<Long> templateIdNotList){
this.templateIdNotList = templateIdNotList;
return this;
}
/**
* 设置 证照模板名称
* @param templateName
*/
public PrintWaitQueueQuery templateName(String templateName){
setTemplateName(templateName);
return this;
}
/**
* 设置 证照模板名称
* @param templateNameList
*/
public PrintWaitQueueQuery templateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
return this;
}
/**
* 设置 手机号码
* @param mobile
*/
public PrintWaitQueueQuery mobile(String mobile){
setMobile(mobile);
return this;
}
/**
* 设置 手机号码
* @param mobileList
*/
public PrintWaitQueueQuery mobileList(List<String> mobileList){
this.mobileList = mobileList;
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/RetainLogEntity.java
View file @ 37354cdd
...@@ -7,19 +7,15 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -7,19 +7,15 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.record.model.vo.RetainLogVo; import com.mortals.xhx.module.record.model.vo.RetainLogVo;
import lombok.Data; import lombok.Data;
/** /**
* 证照持有实体对象 * 证照持有实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-24 * @date 2023-07-05
*/ */
@Data @Data
public class RetainLogEntity extends RetainLogVo { public class RetainLogEntity extends RetainLogVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
* 站点id
*/
private Long siteId;
/** /**
* 证照档案ID * 证照档案ID
*/ */
...@@ -37,14 +33,6 @@ public class RetainLogEntity extends RetainLogVo { ...@@ -37,14 +33,6 @@ public class RetainLogEntity extends RetainLogVo {
*/ */
private String catalogName; private String catalogName;
/** /**
* 证照目录模板ID
*/
private Long templateId;
/**
* 证照模板名称
*/
private String templateName;
/**
* 证照名称 * 证照名称
*/ */
private String certificateName; private String certificateName;
...@@ -76,6 +64,22 @@ public class RetainLogEntity extends RetainLogVo { ...@@ -76,6 +64,22 @@ public class RetainLogEntity extends RetainLogVo {
* 证件预览地址 * 证件预览地址
*/ */
private String previewUrl; private String previewUrl;
/**
* 站点id
*/
private Long siteId;
/**
* 证照目录模板ID
*/
private Long templateId;
/**
* 证照模板名称
*/
private String templateName;
/**
* 手机号码
*/
private String mobile;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -94,8 +98,6 @@ public class RetainLogEntity extends RetainLogVo { ...@@ -94,8 +98,6 @@ public class RetainLogEntity extends RetainLogVo {
public void initAttrValue(){ public void initAttrValue(){
this.siteId = -1L;
this.recordId = -1L; this.recordId = -1L;
this.catalogId = -1L; this.catalogId = -1L;
...@@ -104,10 +106,6 @@ public class RetainLogEntity extends RetainLogVo { ...@@ -104,10 +106,6 @@ public class RetainLogEntity extends RetainLogVo {
this.catalogName = ""; this.catalogName = "";
this.templateId = -1L;
this.templateName = "";
this.certificateName = ""; this.certificateName = "";
this.certificateCode = ""; this.certificateCode = "";
...@@ -123,5 +121,13 @@ public class RetainLogEntity extends RetainLogVo { ...@@ -123,5 +121,13 @@ public class RetainLogEntity extends RetainLogVo {
this.certificateUrl = ""; this.certificateUrl = "";
this.previewUrl = ""; this.previewUrl = "";
this.siteId = -1L;
this.templateId = -1L;
this.templateName = "";
this.mobile = "";
} }
} }
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/RetainLogQuery.java
View file @ 37354cdd
...@@ -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 2023-05-24 * @date 2023-07-05
*/ */
public class RetainLogQuery extends RetainLogEntity { public class RetainLogQuery extends RetainLogEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -24,21 +24,6 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -24,21 +24,6 @@ public class RetainLogQuery extends RetainLogEntity {
/** 序号，主键，自增长排除列表 */ /** 序号，主键，自增长排除列表 */
private List <Long> idNotList; private List <Long> idNotList;
/** 开始 站点id */
private Long siteIdStart;
/** 结束 站点id */
private Long siteIdEnd;
/** 增加 站点id */
private Long siteIdIncrement;
/** 站点id列表 */
private List <Long> siteIdList;
/** 站点id排除列表 */
private List <Long> siteIdNotList;
/** 开始 证照档案ID */ /** 开始 证照档案ID */
private Long recordIdStart; private Long recordIdStart;
...@@ -79,26 +64,6 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -79,26 +64,6 @@ public class RetainLogQuery extends RetainLogEntity {
/** 目录名称排除列表 */ /** 目录名称排除列表 */
private List <String> catalogNameNotList; private List <String> catalogNameNotList;
/** 开始 证照目录模板ID */
private Long templateIdStart;
/** 结束 证照目录模板ID */
private Long templateIdEnd;
/** 增加 证照目录模板ID */
private Long templateIdIncrement;
/** 证照目录模板ID列表 */
private List <Long> templateIdList;
/** 证照目录模板ID排除列表 */
private List <Long> templateIdNotList;
/** 证照模板名称 */
private List<String> templateNameList;
/** 证照模板名称排除列表 */
private List <String> templateNameNotList;
/** 证照名称 */ /** 证照名称 */
private List<String> certificateNameList; private List<String> certificateNameList;
...@@ -191,6 +156,46 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -191,6 +156,46 @@ public class RetainLogQuery extends RetainLogEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 开始 站点id */
private Long siteIdStart;
/** 结束 站点id */
private Long siteIdEnd;
/** 增加 站点id */
private Long siteIdIncrement;
/** 站点id列表 */
private List <Long> siteIdList;
/** 站点id排除列表 */
private List <Long> siteIdNotList;
/** 开始 证照目录模板ID */
private Long templateIdStart;
/** 结束 证照目录模板ID */
private Long templateIdEnd;
/** 增加 证照目录模板ID */
private Long templateIdIncrement;
/** 证照目录模板ID列表 */
private List <Long> templateIdList;
/** 证照目录模板ID排除列表 */
private List <Long> templateIdNotList;
/** 证照模板名称 */
private List<String> templateNameList;
/** 证照模板名称排除列表 */
private List <String> templateNameNotList;
/** 手机号码 */
private List<String> mobileList;
/** 手机号码排除列表 */
private List <String> mobileNotList;
/** 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<RetainLogQuery> orConditionList; private List<RetainLogQuery> orConditionList;
...@@ -280,87 +285,6 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -280,87 +285,6 @@ public class RetainLogQuery extends RetainLogEntity {
} }
/**
* 获取 开始 站点id
* @return siteIdStart
*/
public Long getSiteIdStart(){
return this.siteIdStart;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
}
/**
* 获取 结束 站点id
* @return $siteIdEnd
*/
public Long getSiteIdEnd(){
return this.siteIdEnd;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
}
/**
* 获取 增加 站点id
* @return siteIdIncrement
*/
public Long getSiteIdIncrement(){
return this.siteIdIncrement;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
}
/**
* 获取 站点id
* @return siteIdList
*/
public List<Long> getSiteIdList(){
return this.siteIdList;
}
/**
* 设置 站点id
* @param siteIdList
*/
public void setSiteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
}
/**
* 获取 站点id
* @return siteIdNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/** /**
* 获取 开始 证照档案ID * 获取 开始 证照档案ID
* @return recordIdStart * @return recordIdStart
...@@ -588,217 +512,104 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -588,217 +512,104 @@ public class RetainLogQuery extends RetainLogEntity {
} }
/** /**
* 获取 开始 证照目录模板ID * 获取 证照名称
* @return templateIdStart * @return certificateNameList
*/ */
public Long getTemplateIdStart(){ public List<String> getCertificateNameList(){
return this.templateIdStart; return this.certificateNameList;
} }
/** /**
* 设置 开始 证照目录模板ID * 设置 证照名称
* @param templateIdStart * @param certificateNameList
*/ */
public void setTemplateIdStart(Long templateIdStart){ public void setCertificateNameList(List<String> certificateNameList){
this.templateIdStart = templateIdStart; this.certificateNameList = certificateNameList;
} }
/** /**
* 获取 结束 证照目录模板ID * 获取 证照名称
* @return $templateIdEnd * @return certificateNameNotList
*/ */
public Long getTemplateIdEnd(){ public List<String> getCertificateNameNotList(){
return this.templateIdEnd; return this.certificateNameNotList;
} }
/** /**
* 设置 结束 证照目录模板ID * 设置 证照名称
* @param templateIdEnd * @param certificateNameNotList
*/ */
public void setTemplateIdEnd(Long templateIdEnd){ public void setCertificateNameNotList(List<String> certificateNameNotList){
this.templateIdEnd = templateIdEnd; this.certificateNameNotList = certificateNameNotList;
} }
/** /**
* 获取 增加 证照目录模板ID * 获取 证照编号
* @return templateIdIncrement * @return certificateCodeList
*/ */
public Long getTemplateIdIncrement(){ public List<String> getCertificateCodeList(){
return this.templateIdIncrement; return this.certificateCodeList;
} }
/** /**
* 设置 增加 证照目录模板ID * 设置 证照编号
* @param templateIdIncrement * @param certificateCodeList
*/ */
public void setTemplateIdIncrement(Long templateIdIncrement){ public void setCertificateCodeList(List<String> certificateCodeList){
this.templateIdIncrement = templateIdIncrement; this.certificateCodeList = certificateCodeList;
} }
/** /**
* 获取 证照目录模板ID * 获取 证照编号
* @return templateIdList * @return certificateCodeNotList
*/ */
public List<Long> getTemplateIdList(){ public List<String> getCertificateCodeNotList(){
return this.templateIdList; return this.certificateCodeNotList;
} }
/** /**
* 设置 证照目录模板ID * 设置 证照编号
* @param templateIdList * @param certificateCodeNotList
*/ */
public void setTemplateIdList(List<Long> templateIdList){ public void setCertificateCodeNotList(List<String> certificateCodeNotList){
this.templateIdList = templateIdList; this.certificateCodeNotList = certificateCodeNotList;
} }
/** /**
* 获取 证照目录模板ID * 获取 企业名称
* @return templateIdNotList * @return enterpriseNameList
*/ */
public List<Long> getTemplateIdNotList(){ public List<String> getEnterpriseNameList(){
return this.templateIdNotList; return this.enterpriseNameList;
} }
/** /**
* 设置 证照目录模板ID * 设置 企业名称
* @param templateIdNotList * @param enterpriseNameList
*/ */
public void setTemplateIdNotList(List<Long> templateIdNotList){ public void setEnterpriseNameList(List<String> enterpriseNameList){
this.templateIdNotList = templateIdNotList; this.enterpriseNameList = enterpriseNameList;
} }
/** /**
* 获取 证照模板名称 * 获取 企业名称
* @return templateNameList * @return enterpriseNameNotList
*/ */
public List<String> getTemplateNameList(){ public List<String> getEnterpriseNameNotList(){
return this.templateNameList; return this.enterpriseNameNotList;
} }
/** /**
* 设置 证照模板名称 * 设置 企业名称
* @param templateNameList * @param enterpriseNameNotList
*/ */
public void setTemplateNameList(List<String> templateNameList){ public void setEnterpriseNameNotList(List<String> enterpriseNameNotList){
this.templateNameList = templateNameList; this.enterpriseNameNotList = enterpriseNameNotList;
} }
/** /**
* 获取 证照模板名称 * 获取 持有者姓名
* @return templateNameNotList * @return holderNameList
*/
public List<String> getTemplateNameNotList(){
return this.templateNameNotList;
}
/**
* 设置 证照模板名称
* @param templateNameNotList
*/
public void setTemplateNameNotList(List<String> templateNameNotList){
this.templateNameNotList = templateNameNotList;
}
/**
* 获取 证照名称
* @return certificateNameList
*/
public List<String> getCertificateNameList(){
return this.certificateNameList;
}
/**
* 设置 证照名称
* @param certificateNameList
*/
public void setCertificateNameList(List<String> certificateNameList){
this.certificateNameList = certificateNameList;
}
/**
* 获取 证照名称
* @return certificateNameNotList
*/
public List<String> getCertificateNameNotList(){
return this.certificateNameNotList;
}
/**
* 设置 证照名称
* @param certificateNameNotList
*/
public void setCertificateNameNotList(List<String> certificateNameNotList){
this.certificateNameNotList = certificateNameNotList;
}
/**
* 获取 证照编号
* @return certificateCodeList
*/
public List<String> getCertificateCodeList(){
return this.certificateCodeList;
}
/**
* 设置 证照编号
* @param certificateCodeList
*/
public void setCertificateCodeList(List<String> certificateCodeList){
this.certificateCodeList = certificateCodeList;
}
/**
* 获取 证照编号
* @return certificateCodeNotList
*/
public List<String> getCertificateCodeNotList(){
return this.certificateCodeNotList;
}
/**
* 设置 证照编号
* @param certificateCodeNotList
*/
public void setCertificateCodeNotList(List<String> certificateCodeNotList){
this.certificateCodeNotList = certificateCodeNotList;
}
/**
* 获取 企业名称
* @return enterpriseNameList
*/
public List<String> getEnterpriseNameList(){
return this.enterpriseNameList;
}
/**
* 设置 企业名称
* @param enterpriseNameList
*/
public void setEnterpriseNameList(List<String> enterpriseNameList){
this.enterpriseNameList = enterpriseNameList;
}
/**
* 获取 企业名称
* @return enterpriseNameNotList
*/
public List<String> getEnterpriseNameNotList(){
return this.enterpriseNameNotList;
}
/**
* 设置 企业名称
* @param enterpriseNameNotList
*/
public void setEnterpriseNameNotList(List<String> enterpriseNameNotList){
this.enterpriseNameNotList = enterpriseNameNotList;
}
/**
* 获取 持有者姓名
* @return holderNameList
*/ */
public List<String> getHolderNameList(){ public List<String> getHolderNameList(){
return this.holderNameList; return this.holderNameList;
...@@ -1232,151 +1043,323 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -1232,151 +1043,323 @@ public class RetainLogQuery extends RetainLogEntity {
} }
/** /**
* 设置 序号，主键，自增长 * 获取 开始 站点id
* @param id * @return siteIdStart
*/ */
public RetainLogQuery id(Long id){ public Long getSiteIdStart(){
setId(id); return this.siteIdStart;
return this;
} }
/** /**
* 设置 开始 序号，主键，自增长 * 设置 开始 站点id
* @param idStart * @param siteIdStart
*/ */
public RetainLogQuery idStart(Long idStart){ public void setSiteIdStart(Long siteIdStart){
this.idStart = idStart; this.siteIdStart = siteIdStart;
return this;
} }
/** /**
* 设置 结束 序号，主键，自增长 * 获取 结束 站点id
* @param idEnd * @return $siteIdEnd
*/ */
public RetainLogQuery idEnd(Long idEnd){ public Long getSiteIdEnd(){
this.idEnd = idEnd; return this.siteIdEnd;
return this;
} }
/** /**
* 设置 增加 序号，主键，自增长 * 设置 结束 站点id
* @param idIncrement * @param siteIdEnd
*/ */
public RetainLogQuery idIncrement(Long idIncrement){ public void setSiteIdEnd(Long siteIdEnd){
this.idIncrement = idIncrement; this.siteIdEnd = siteIdEnd;
return this;
} }
/** /**
* 设置 序号，主键，自增长 * 获取 增加 站点id
* @param idList * @return siteIdIncrement
*/ */
public RetainLogQuery idList(List<Long> idList){ public Long getSiteIdIncrement(){
this.idList = idList; return this.siteIdIncrement;
return this;
} }
/** /**
* 设置 序号，主键，自增长 * 设置 增加 站点id
* @param idNotList * @param siteIdIncrement
*/ */
public RetainLogQuery idNotList(List<Long> idNotList){ public void setSiteIdIncrement(Long siteIdIncrement){
this.idNotList = idNotList; this.siteIdIncrement = siteIdIncrement;
return this;
} }
/** /**
* 设置 站点id * 获取 站点id
* @param siteId * @return siteIdList
*/ */
public RetainLogQuery siteId(Long siteId){ public List<Long> getSiteIdList(){
setSiteId(siteId); return this.siteIdList;
return this;
} }
/** /**
* 设置 开始 站点id * 设置 站点id
* @param siteIdStart * @param siteIdList
*/ */
public RetainLogQuery siteIdStart(Long siteIdStart){ public void setSiteIdList(List<Long> siteIdList){
this.siteIdStart = siteIdStart; this.siteIdList = siteIdList;
return this;
} }
/** /**
* 设置 结束 站点id * 获取 站点id
* @param siteIdEnd * @return siteIdNotList
*/ */
public RetainLogQuery siteIdEnd(Long siteIdEnd){ public List<Long> getSiteIdNotList(){
this.siteIdEnd = siteIdEnd; return this.siteIdNotList;
return this;
} }
/** /**
* 设置 增加 站点id * 设置 站点id
* @param siteIdIncrement * @param siteIdNotList
*/ */
public RetainLogQuery siteIdIncrement(Long siteIdIncrement){ public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdIncrement = siteIdIncrement; this.siteIdNotList = siteIdNotList;
return this;
} }
/** /**
* 设置 站点id * 获取 开始 证照目录模板ID
* @param siteIdList * @return templateIdStart
*/ */
public RetainLogQuery siteIdList(List<Long> siteIdList){ public Long getTemplateIdStart(){
this.siteIdList = siteIdList; return this.templateIdStart;
return this;
} }
/** /**
* 设置 站点id * 设置 开始 证照目录模板ID
* @param siteIdNotList * @param templateIdStart
*/ */
public RetainLogQuery siteIdNotList(List<Long> siteIdNotList){ public void setTemplateIdStart(Long templateIdStart){
this.siteIdNotList = siteIdNotList; this.templateIdStart = templateIdStart;
return this;
} }
/** /**
* 设置 证照档案ID * 获取 结束 证照目录模板ID
* @param recordId * @return $templateIdEnd
*/ */
public RetainLogQuery recordId(Long recordId){ public Long getTemplateIdEnd(){
setRecordId(recordId); return this.templateIdEnd;
return this;
} }
/** /**
* 设置 开始 证照档案ID * 设置 结束 证照目录模板ID
* @param recordIdStart * @param templateIdEnd
*/ */
public RetainLogQuery recordIdStart(Long recordIdStart){ public void setTemplateIdEnd(Long templateIdEnd){
this.recordIdStart = recordIdStart; this.templateIdEnd = templateIdEnd;
return this;
} }
/** /**
* 设置 结束 证照档案ID * 获取 增加 证照目录模板ID
* @param recordIdEnd * @return templateIdIncrement
*/ */
public RetainLogQuery recordIdEnd(Long recordIdEnd){ public Long getTemplateIdIncrement(){
this.recordIdEnd = recordIdEnd; return this.templateIdIncrement;
return this;
} }
/** /**
* 设置 增加 证照档案ID * 设置 增加 证照目录模板ID
* @param recordIdIncrement * @param templateIdIncrement
*/ */
public RetainLogQuery recordIdIncrement(Long recordIdIncrement){ public void setTemplateIdIncrement(Long templateIdIncrement){
this.recordIdIncrement = recordIdIncrement; this.templateIdIncrement = templateIdIncrement;
return this;
} }
/** /**
* 设置 证照档案ID * 获取 证照目录模板ID
* @return templateIdList
*/
public List<Long> getTemplateIdList(){
return this.templateIdList;
}
/**
* 设置 证照目录模板ID
* @param templateIdList
*/
public void setTemplateIdList(List<Long> templateIdList){
this.templateIdList = templateIdList;
}
/**
* 获取 证照目录模板ID
* @return templateIdNotList
*/
public List<Long> getTemplateIdNotList(){
return this.templateIdNotList;
}
/**
* 设置 证照目录模板ID
* @param templateIdNotList
*/
public void setTemplateIdNotList(List<Long> templateIdNotList){
this.templateIdNotList = templateIdNotList;
}
/**
* 获取 证照模板名称
* @return templateNameList
*/
public List<String> getTemplateNameList(){
return this.templateNameList;
}
/**
* 设置 证照模板名称
* @param templateNameList
*/
public void setTemplateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
}
/**
* 获取 证照模板名称
* @return templateNameNotList
*/
public List<String> getTemplateNameNotList(){
return this.templateNameNotList;
}
/**
* 设置 证照模板名称
* @param templateNameNotList
*/
public void setTemplateNameNotList(List<String> templateNameNotList){
this.templateNameNotList = templateNameNotList;
}
/**
* 获取 手机号码
* @return mobileList
*/
public List<String> getMobileList(){
return this.mobileList;
}
/**
* 设置 手机号码
* @param mobileList
*/
public void setMobileList(List<String> mobileList){
this.mobileList = mobileList;
}
/**
* 获取 手机号码
* @return mobileNotList
*/
public List<String> getMobileNotList(){
return this.mobileNotList;
}
/**
* 设置 手机号码
* @param mobileNotList
*/
public void setMobileNotList(List<String> mobileNotList){
this.mobileNotList = mobileNotList;
}
/**
* 设置 序号，主键，自增长
* @param id
*/
public RetainLogQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 开始 序号，主键，自增长
* @param idStart
*/
public RetainLogQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
public RetainLogQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
public RetainLogQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idList
*/
public RetainLogQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public RetainLogQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/**
* 设置 证照档案ID
* @param recordId
*/
public RetainLogQuery recordId(Long recordId){
setRecordId(recordId);
return this;
}
/**
* 设置 开始 证照档案ID
* @param recordIdStart
*/
public RetainLogQuery recordIdStart(Long recordIdStart){
this.recordIdStart = recordIdStart;
return this;
}
/**
* 设置 结束 证照档案ID
* @param recordIdEnd
*/
public RetainLogQuery recordIdEnd(Long recordIdEnd){
this.recordIdEnd = recordIdEnd;
return this;
}
/**
* 设置 增加 证照档案ID
* @param recordIdIncrement
*/
public RetainLogQuery recordIdIncrement(Long recordIdIncrement){
this.recordIdIncrement = recordIdIncrement;
return this;
}
/**
* 设置 证照档案ID
* @param recordIdList * @param recordIdList
*/ */
public RetainLogQuery recordIdList(List<Long> recordIdList){ public RetainLogQuery recordIdList(List<Long> recordIdList){
...@@ -1485,79 +1468,6 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -1485,79 +1468,6 @@ public class RetainLogQuery extends RetainLogEntity {
return this; return this;
} }
/**
* 设置 证照目录模板ID
* @param templateId
*/
public RetainLogQuery templateId(Long templateId){
setTemplateId(templateId);
return this;
}
/**
* 设置 开始 证照目录模板ID
* @param templateIdStart
*/
public RetainLogQuery templateIdStart(Long templateIdStart){
this.templateIdStart = templateIdStart;
return this;
}
/**
* 设置 结束 证照目录模板ID
* @param templateIdEnd
*/
public RetainLogQuery templateIdEnd(Long templateIdEnd){
this.templateIdEnd = templateIdEnd;
return this;
}
/**
* 设置 增加 证照目录模板ID
* @param templateIdIncrement
*/
public RetainLogQuery templateIdIncrement(Long templateIdIncrement){
this.templateIdIncrement = templateIdIncrement;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateIdList
*/
public RetainLogQuery templateIdList(List<Long> templateIdList){
this.templateIdList = templateIdList;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateIdNotList
*/
public RetainLogQuery templateIdNotList(List<Long> templateIdNotList){
this.templateIdNotList = templateIdNotList;
return this;
}
/**
* 设置 证照模板名称
* @param templateName
*/
public RetainLogQuery templateName(String templateName){
setTemplateName(templateName);
return this;
}
/**
* 设置 证照模板名称
* @param templateNameList
*/
public RetainLogQuery templateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
return this;
}
/** /**
* 设置 证照名称 * 设置 证照名称
...@@ -1855,6 +1765,152 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -1855,6 +1765,152 @@ public class RetainLogQuery extends RetainLogEntity {
} }
/**
* 设置 站点id
* @param siteId
*/
public RetainLogQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public RetainLogQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public RetainLogQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public RetainLogQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点id
* @param siteIdList
*/
public RetainLogQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public RetainLogQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateId
*/
public RetainLogQuery templateId(Long templateId){
setTemplateId(templateId);
return this;
}
/**
* 设置 开始 证照目录模板ID
* @param templateIdStart
*/
public RetainLogQuery templateIdStart(Long templateIdStart){
this.templateIdStart = templateIdStart;
return this;
}
/**
* 设置 结束 证照目录模板ID
* @param templateIdEnd
*/
public RetainLogQuery templateIdEnd(Long templateIdEnd){
this.templateIdEnd = templateIdEnd;
return this;
}
/**
* 设置 增加 证照目录模板ID
* @param templateIdIncrement
*/
public RetainLogQuery templateIdIncrement(Long templateIdIncrement){
this.templateIdIncrement = templateIdIncrement;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateIdList
*/
public RetainLogQuery templateIdList(List<Long> templateIdList){
this.templateIdList = templateIdList;
return this;
}
/**
* 设置 证照目录模板ID
* @param templateIdNotList
*/
public RetainLogQuery templateIdNotList(List<Long> templateIdNotList){
this.templateIdNotList = templateIdNotList;
return this;
}
/**
* 设置 证照模板名称
* @param templateName
*/
public RetainLogQuery templateName(String templateName){
setTemplateName(templateName);
return this;
}
/**
* 设置 证照模板名称
* @param templateNameList
*/
public RetainLogQuery templateNameList(List<String> templateNameList){
this.templateNameList = templateNameList;
return this;
}
/**
* 设置 手机号码
* @param mobile
*/
public RetainLogQuery mobile(String mobile){
setMobile(mobile);
return this;
}
/**
* 设置 手机号码
* @param mobileList
*/
public RetainLogQuery mobileList(List<String> mobileList){
this.mobileList = mobileList;
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/service/impl/PrintLogServiceImpl.java
View file @ 37354cdd
...@@ -37,17 +37,20 @@ public class PrintLogServiceImpl extends AbstractCRUDServiceImpl<PrintLogDao, Pr ...@@ -37,17 +37,20 @@ public class PrintLogServiceImpl extends AbstractCRUDServiceImpl<PrintLogDao, Pr
PrintLogQuery condition3 = new PrintLogQuery(); PrintLogQuery condition3 = new PrintLogQuery();
PrintLogQuery condition4 = new PrintLogQuery(); PrintLogQuery condition4 = new PrintLogQuery();
PrintLogQuery condition5 = new PrintLogQuery(); PrintLogQuery condition5 = new PrintLogQuery();
PrintLogQuery condition6 = new PrintLogQuery();
condition1.setEnterpriseName(condition.toString()); condition1.setEnterpriseName(condition.toString());
condition2.setPickerName(condition.toString()); condition2.setPickerName(condition.toString());
condition3.setPickerIDCardNo(condition.toString()); condition3.setPickerIDCardNo(condition.toString());
condition4.setHolderIDCardNo(condition.toString()); condition4.setHolderIDCardNo(condition.toString());
condition5.setHolderName(condition.toString()); condition5.setHolderName(condition.toString());
condition6.setMobile(condition.toString());
List<PrintLogQuery> orConditionList = new ArrayList<>(); List<PrintLogQuery> orConditionList = new ArrayList<>();
orConditionList.add(condition1); orConditionList.add(condition1);
orConditionList.add(condition2); orConditionList.add(condition2);
orConditionList.add(condition3); orConditionList.add(condition3);
orConditionList.add(condition4); orConditionList.add(condition4);
orConditionList.add(condition5); orConditionList.add(condition5);
orConditionList.add(condition6);
query.setOrConditionList(orConditionList); query.setOrConditionList(orConditionList);
} }
return query; return query;
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/PrintWaitQueueServiceImpl.java
View file @ 37354cdd
...@@ -139,6 +139,7 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait ...@@ -139,6 +139,7 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
waitQueueEntity.setPreviewUrl(applyLogEntity.getPreviewUrl()); waitQueueEntity.setPreviewUrl(applyLogEntity.getPreviewUrl());
waitQueueEntity.setCertificateUrl(applyLogEntity.getCertificateUrl()); waitQueueEntity.setCertificateUrl(applyLogEntity.getCertificateUrl());
waitQueueEntity.setPrintStatus(YesNoEnum.NO.getValue()); waitQueueEntity.setPrintStatus(YesNoEnum.NO.getValue());
waitQueueEntity.setMobile(applyLogEntity.getMobile());
waitQueueEntity.setTotal(paramService.getParamIntValue(ParamKey.ALLOW_PRINT_MAX_COUNT)); waitQueueEntity.setTotal(paramService.getParamIntValue(ParamKey.ALLOW_PRINT_MAX_COUNT));
waitQueueEntity.setCreateUserId(applyLogEntity.getCreateUserId()); waitQueueEntity.setCreateUserId(applyLogEntity.getCreateUserId());
waitQueueEntity.setCreateTime(new Date()); waitQueueEntity.setCreateTime(new Date());
...@@ -192,6 +193,7 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait ...@@ -192,6 +193,7 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
printLogEntity.setCreateTime(now); printLogEntity.setCreateTime(now);
printLogEntity.setPrintStatus(PrintStatus.FAIL.getValue()); printLogEntity.setPrintStatus(PrintStatus.FAIL.getValue());
printLogEntity.setStatusRemark(statusRemark); printLogEntity.setStatusRemark(statusRemark);
printLogEntity.setMobile(waitQueueEntity.getMobile());
printLogDao.insert(printLogEntity); printLogDao.insert(printLogEntity);
} }
...@@ -210,6 +212,7 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait ...@@ -210,6 +212,7 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
retainLogEntity.setHolderName(waitQueueEntity.getHolderName()); retainLogEntity.setHolderName(waitQueueEntity.getHolderName());
retainLogEntity.setHolderIDCardNo(waitQueueEntity.getHolderIDCardNo()); retainLogEntity.setHolderIDCardNo(waitQueueEntity.getHolderIDCardNo());
retainLogEntity.setCertificateStatus(CertificateStatus.NORMAL.getValue()); retainLogEntity.setCertificateStatus(CertificateStatus.NORMAL.getValue());
retainLogEntity.setMobile(waitQueueEntity.getMobile());
retainLogEntity.setCreateUserId(waitQueueEntity.getCreateUserId()); retainLogEntity.setCreateUserId(waitQueueEntity.getCreateUserId());
retainLogEntity.setCreateTime(now); retainLogEntity.setCreateTime(now);
...@@ -227,7 +230,7 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait ...@@ -227,7 +230,7 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
printLogEntity.setHolderIDCardNo(waitQueueEntity.getHolderIDCardNo()); printLogEntity.setHolderIDCardNo(waitQueueEntity.getHolderIDCardNo());
printLogEntity.setPickerName(waitQueueEntity.getPickerName()); printLogEntity.setPickerName(waitQueueEntity.getPickerName());
printLogEntity.setPickerIDCardNo(waitQueueEntity.getPickerIDCardNo()); printLogEntity.setPickerIDCardNo(waitQueueEntity.getPickerIDCardNo());
printLogEntity.setMobile(waitQueueEntity.getMobile());
printLogEntity.setPrintDate(now); printLogEntity.setPrintDate(now);
printLogEntity.setCreateUserId(waitQueueEntity.getCreateUserId()); printLogEntity.setCreateUserId(waitQueueEntity.getCreateUserId());
printLogEntity.setCreateTime(now); printLogEntity.setCreateTime(now);
......
certificate-manager/src/main/resources/sqlmap/module/record/ApplyLogMapper.xml
View file @ 37354cdd
<?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="siteId" column="siteId" />
<result property="recordId" column="recordId" /> <result property="recordId" column="recordId" />
<result property="catalogId" column="catalogId" /> <result property="catalogId" column="catalogId" />
<result property="catalogCode" column="catalogCode" /> <result property="catalogCode" column="catalogCode" />
<result property="catalogName" column="catalogName" /> <result property="catalogName" column="catalogName" />
<result property="templateId" column="templateId" />
<result property="templateName" column="templateName" />
<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" />
...@@ -37,6 +34,10 @@ ...@@ -37,6 +34,10 @@
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="recordStatus" column="recordStatus" /> <result property="recordStatus" column="recordStatus" />
<result property="siteId" column="siteId" />
<result property="templateId" column="templateId" />
<result property="templateName" column="templateName" />
<result property="mobile" column="mobile" />
</resultMap> </resultMap>
...@@ -47,9 +48,6 @@ ...@@ -47,9 +48,6 @@
<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('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('recordId') or colPickMode == 1 and data.containsKey('recordId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('recordId') or colPickMode == 1 and data.containsKey('recordId')))">
a.recordId, a.recordId,
</if> </if>
...@@ -62,12 +60,6 @@ ...@@ -62,12 +60,6 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('catalogName') or colPickMode == 1 and data.containsKey('catalogName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('catalogName') or colPickMode == 1 and data.containsKey('catalogName')))">
a.catalogName, a.catalogName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('templateId') or colPickMode == 1 and data.containsKey('templateId')))">
a.templateId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('templateName') or colPickMode == 1 and data.containsKey('templateName')))">
a.templateName,
</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>
...@@ -140,23 +132,35 @@ ...@@ -140,23 +132,35 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('recordStatus') or colPickMode == 1 and data.containsKey('recordStatus')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('recordStatus') or colPickMode == 1 and data.containsKey('recordStatus')))">
a.recordStatus, a.recordStatus,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('templateId') or colPickMode == 1 and data.containsKey('templateId')))">
a.templateId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('templateName') or colPickMode == 1 and data.containsKey('templateName')))">
a.templateName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('mobile') or colPickMode == 1 and data.containsKey('mobile')))">
a.mobile,
</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
(siteId,recordId,catalogId,catalogCode,catalogName,templateId,templateName,certificateCode,certificateName,issueTime,pickerName,pickerIDCardNo,holderType,holderIdType,holderName,holderIDCardNo,enterpriseName,validityStart,validityEnd,privateID,certificateUrl,previewUrl,formContent,formTemplate,generateStatus,operType,createUserId,createTime,updateUserId,updateTime,recordStatus) (recordId,catalogId,catalogCode,catalogName,certificateCode,certificateName,issueTime,pickerName,pickerIDCardNo,holderType,holderIdType,holderName,holderIDCardNo,enterpriseName,validityStart,validityEnd,privateID,certificateUrl,previewUrl,formContent,formTemplate,generateStatus,operType,createUserId,createTime,updateUserId,updateTime,recordStatus,siteId,templateId,templateName,mobile)
VALUES VALUES
(#{siteId},#{recordId},#{catalogId},#{catalogCode},#{catalogName},#{templateId},#{templateName},#{certificateCode},#{certificateName},#{issueTime},#{pickerName},#{pickerIDCardNo},#{holderType},#{holderIdType},#{holderName},#{holderIDCardNo},#{enterpriseName},#{validityStart},#{validityEnd},#{privateID},#{certificateUrl},#{previewUrl},#{formContent},#{formTemplate},#{generateStatus},#{operType},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{recordStatus}) (#{recordId},#{catalogId},#{catalogCode},#{catalogName},#{certificateCode},#{certificateName},#{issueTime},#{pickerName},#{pickerIDCardNo},#{holderType},#{holderIdType},#{holderName},#{holderIDCardNo},#{enterpriseName},#{validityStart},#{validityEnd},#{privateID},#{certificateUrl},#{previewUrl},#{formContent},#{formTemplate},#{generateStatus},#{operType},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{recordStatus},#{siteId},#{templateId},#{templateName},#{mobile})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_apply_log insert into mortals_xhx_apply_log
(siteId,recordId,catalogId,catalogCode,catalogName,templateId,templateName,certificateCode,certificateName,issueTime,pickerName,pickerIDCardNo,holderType,holderIdType,holderName,holderIDCardNo,enterpriseName,validityStart,validityEnd,privateID,certificateUrl,previewUrl,formContent,formTemplate,generateStatus,operType,createUserId,createTime,updateUserId,updateTime,recordStatus) (recordId,catalogId,catalogCode,catalogName,certificateCode,certificateName,issueTime,pickerName,pickerIDCardNo,holderType,holderIdType,holderName,holderIDCardNo,enterpriseName,validityStart,validityEnd,privateID,certificateUrl,previewUrl,formContent,formTemplate,generateStatus,operType,createUserId,createTime,updateUserId,updateTime,recordStatus,siteId,templateId,templateName,mobile)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteId},#{item.recordId},#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.templateId},#{item.templateName},#{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.certificateUrl},#{item.previewUrl},#{item.formContent},#{item.formTemplate},#{item.generateStatus},#{item.operType},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.recordStatus}) (#{item.recordId},#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{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.certificateUrl},#{item.previewUrl},#{item.formContent},#{item.formTemplate},#{item.generateStatus},#{item.operType},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.recordStatus},#{item.siteId},#{item.templateId},#{item.templateName},#{item.mobile})
</foreach> </foreach>
</insert> </insert>
...@@ -166,12 +170,6 @@ ...@@ -166,12 +170,6 @@
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('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
a.siteId=#{data.siteId},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('recordId')) or (colPickMode==1 and !data.containsKey('recordId'))"> <if test="(colPickMode==0 and data.containsKey('recordId')) or (colPickMode==1 and !data.containsKey('recordId'))">
a.recordId=#{data.recordId}, a.recordId=#{data.recordId},
</if> </if>
...@@ -190,15 +188,6 @@ ...@@ -190,15 +188,6 @@
<if test="(colPickMode==0 and data.containsKey('catalogName')) or (colPickMode==1 and !data.containsKey('catalogName'))"> <if test="(colPickMode==0 and data.containsKey('catalogName')) or (colPickMode==1 and !data.containsKey('catalogName'))">
a.catalogName=#{data.catalogName}, a.catalogName=#{data.catalogName},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('templateId')) or (colPickMode==1 and !data.containsKey('templateId'))">
a.templateId=#{data.templateId},
</if>
<if test="(colPickMode==0 and data.containsKey('templateIdIncrement')) or (colPickMode==1 and !data.containsKey('templateIdIncrement'))">
a.templateId=ifnull(a.templateId,0) + #{data.templateIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('templateName')) or (colPickMode==1 and !data.containsKey('templateName'))">
a.templateName=#{data.templateName},
</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>
...@@ -292,6 +281,24 @@ ...@@ -292,6 +281,24 @@
<if test="(colPickMode==0 and data.containsKey('recordStatusIncrement')) or (colPickMode==1 and !data.containsKey('recordStatusIncrement'))"> <if test="(colPickMode==0 and data.containsKey('recordStatusIncrement')) or (colPickMode==1 and !data.containsKey('recordStatusIncrement'))">
a.recordStatus=ifnull(a.recordStatus,0) + #{data.recordStatusIncrement}, a.recordStatus=ifnull(a.recordStatus,0) + #{data.recordStatusIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
a.siteId=#{data.siteId},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('templateId')) or (colPickMode==1 and !data.containsKey('templateId'))">
a.templateId=#{data.templateId},
</if>
<if test="(colPickMode==0 and data.containsKey('templateIdIncrement')) or (colPickMode==1 and !data.containsKey('templateIdIncrement'))">
a.templateId=ifnull(a.templateId,0) + #{data.templateIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('templateName')) or (colPickMode==1 and !data.containsKey('templateName'))">
a.templateName=#{data.templateName},
</if>
<if test="(colPickMode==0 and data.containsKey('mobile')) or (colPickMode==1 and !data.containsKey('mobile'))">
a.mobile=#{data.mobile},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -304,18 +311,6 @@ ...@@ -304,18 +311,6 @@
<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="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId}
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="recordId=(case" suffix="ELSE recordId end),"> <trim prefix="recordId=(case" suffix="ELSE recordId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
...@@ -353,25 +348,6 @@ ...@@ -353,25 +348,6 @@
when a.id=#{item.id} then #{item.catalogName} when a.id=#{item.id} then #{item.catalogName}
</if> </if>
</foreach> </foreach>
</trim>
<trim prefix="templateId=(case" suffix="ELSE templateId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('templateId')) or (colPickMode==1 and !item.containsKey('templateId'))">
when a.id=#{item.id} then #{item.templateId}
</when>
<when test="(colPickMode==0 and item.containsKey('templateIdIncrement')) or (colPickMode==1 and !item.containsKey('templateIdIncrement'))">
when a.id=#{item.id} then ifnull(a.templateId,0) + #{item.templateIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="templateName=(case" suffix="ELSE templateName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('templateName')) or (colPickMode==1 and !item.containsKey('templateName'))">
when a.id=#{item.id} then #{item.templateName}
</if>
</foreach>
</trim> </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="" >
...@@ -576,6 +552,44 @@ ...@@ -576,6 +552,44 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId}
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="templateId=(case" suffix="ELSE templateId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('templateId')) or (colPickMode==1 and !item.containsKey('templateId'))">
when a.id=#{item.id} then #{item.templateId}
</when>
<when test="(colPickMode==0 and item.containsKey('templateIdIncrement')) or (colPickMode==1 and !item.containsKey('templateIdIncrement'))">
when a.id=#{item.id} then ifnull(a.templateId,0) + #{item.templateIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="templateName=(case" suffix="ELSE templateName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('templateName')) or (colPickMode==1 and !item.containsKey('templateName'))">
when a.id=#{item.id} then #{item.templateName}
</if>
</foreach>
</trim>
<trim prefix="mobile=(case" suffix="ELSE mobile end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('mobile')) or (colPickMode==1 and !item.containsKey('mobile'))">
when a.id=#{item.id} then #{item.mobile}
</if>
</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=")">
...@@ -719,33 +733,6 @@ ...@@ -719,33 +733,6 @@
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd} ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if> </if>
<if test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
<if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
<if test="conditionParamRef.containsKey('recordId')"> <if test="conditionParamRef.containsKey('recordId')">
<if test="conditionParamRef.recordId != null "> <if test="conditionParamRef.recordId != null ">
${_conditionType_} a.recordId = #{${_conditionParam_}.recordId} ${_conditionType_} a.recordId = #{${_conditionParam_}.recordId}
...@@ -842,54 +829,6 @@ ...@@ -842,54 +829,6 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('templateId')">
<if test="conditionParamRef.templateId != null ">
${_conditionType_} a.templateId = #{${_conditionParam_}.templateId}
</if>
<if test="conditionParamRef.templateId == null">
${_conditionType_} a.templateId is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateIdList') and conditionParamRef.templateIdList.size() > 0">
${_conditionType_} a.templateId in
<foreach collection="conditionParamRef.templateIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateIdNotList') and conditionParamRef.templateIdNotList.size() > 0">
${_conditionType_} a.templateId not in
<foreach collection="conditionParamRef.templateIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateIdStart') and conditionParamRef.templateIdStart != null">
${_conditionType_} a.templateId <![CDATA[ >= ]]> #{${_conditionParam_}.templateIdStart}
</if>
<if test="conditionParamRef.containsKey('templateIdEnd') and conditionParamRef.templateIdEnd != null">
${_conditionType_} a.templateId <![CDATA[ <= ]]> #{${_conditionParam_}.templateIdEnd}
</if>
<if test="conditionParamRef.containsKey('templateName')">
<if test="conditionParamRef.templateName != null and conditionParamRef.templateName != ''">
${_conditionType_} a.templateName like #{${_conditionParam_}.templateName}
</if>
<if test="conditionParamRef.templateName == null">
${_conditionType_} a.templateName is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateNameList') and conditionParamRef.templateNameList.size() > 0">
${_conditionType_} a.templateName in
<foreach collection="conditionParamRef.templateNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateNameNotList') and conditionParamRef.templateNameNotList.size() > 0">
${_conditionType_} a.templateName not in
<foreach collection="conditionParamRef.templateNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</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 != ''">
...@@ -1406,6 +1345,102 @@ ...@@ -1406,6 +1345,102 @@
${_conditionType_} a.recordStatus <![CDATA[ <= ]]> #{${_conditionParam_}.recordStatusEnd} ${_conditionType_} a.recordStatus <![CDATA[ <= ]]> #{${_conditionParam_}.recordStatusEnd}
</if> </if>
<if test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
<if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
<if test="conditionParamRef.containsKey('templateId')">
<if test="conditionParamRef.templateId != null ">
${_conditionType_} a.templateId = #{${_conditionParam_}.templateId}
</if>
<if test="conditionParamRef.templateId == null">
${_conditionType_} a.templateId is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateIdList') and conditionParamRef.templateIdList.size() > 0">
${_conditionType_} a.templateId in
<foreach collection="conditionParamRef.templateIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateIdNotList') and conditionParamRef.templateIdNotList.size() > 0">
${_conditionType_} a.templateId not in
<foreach collection="conditionParamRef.templateIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateIdStart') and conditionParamRef.templateIdStart != null">
${_conditionType_} a.templateId <![CDATA[ >= ]]> #{${_conditionParam_}.templateIdStart}
</if>
<if test="conditionParamRef.containsKey('templateIdEnd') and conditionParamRef.templateIdEnd != null">
${_conditionType_} a.templateId <![CDATA[ <= ]]> #{${_conditionParam_}.templateIdEnd}
</if>
<if test="conditionParamRef.containsKey('templateName')">
<if test="conditionParamRef.templateName != null and conditionParamRef.templateName != ''">
${_conditionType_} a.templateName like #{${_conditionParam_}.templateName}
</if>
<if test="conditionParamRef.templateName == null">
${_conditionType_} a.templateName is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateNameList') and conditionParamRef.templateNameList.size() > 0">
${_conditionType_} a.templateName in
<foreach collection="conditionParamRef.templateNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateNameNotList') and conditionParamRef.templateNameNotList.size() > 0">
${_conditionType_} a.templateName not in
<foreach collection="conditionParamRef.templateNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('mobile')">
<if test="conditionParamRef.mobile != null and conditionParamRef.mobile != ''">
${_conditionType_} a.mobile like #{${_conditionParam_}.mobile}
</if>
<if test="conditionParamRef.mobile == null">
${_conditionType_} a.mobile is null
</if>
</if>
<if test="conditionParamRef.containsKey('mobileList') and conditionParamRef.mobileList.size() > 0">
${_conditionType_} a.mobile in
<foreach collection="conditionParamRef.mobileList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('mobileNotList') and conditionParamRef.mobileNotList.size() > 0">
${_conditionType_} a.mobile not in
<foreach collection="conditionParamRef.mobileNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -1424,11 +1459,6 @@ ...@@ -1424,11 +1459,6 @@
<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('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('recordId')"> <if test="orderCol.containsKey('recordId')">
a.recordId a.recordId
<if test='orderCol.recordId != null and "DESC".equalsIgnoreCase(orderCol.recordId)'>DESC</if> <if test='orderCol.recordId != null and "DESC".equalsIgnoreCase(orderCol.recordId)'>DESC</if>
...@@ -1449,16 +1479,6 @@ ...@@ -1449,16 +1479,6 @@
<if test='orderCol.catalogName != null and "DESC".equalsIgnoreCase(orderCol.catalogName)'>DESC</if> <if test='orderCol.catalogName != null and "DESC".equalsIgnoreCase(orderCol.catalogName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('templateId')">
a.templateId
<if test='orderCol.templateId != null and "DESC".equalsIgnoreCase(orderCol.templateId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('templateName')">
a.templateName
<if test='orderCol.templateName != null and "DESC".equalsIgnoreCase(orderCol.templateName)'>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>
...@@ -1579,6 +1599,26 @@ ...@@ -1579,6 +1599,26 @@
<if test='orderCol.recordStatus != null and "DESC".equalsIgnoreCase(orderCol.recordStatus)'>DESC</if> <if test='orderCol.recordStatus != null and "DESC".equalsIgnoreCase(orderCol.recordStatus)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('templateId')">
a.templateId
<if test='orderCol.templateId != null and "DESC".equalsIgnoreCase(orderCol.templateId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('templateName')">
a.templateName
<if test='orderCol.templateName != null and "DESC".equalsIgnoreCase(orderCol.templateName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('mobile')">
a.mobile
<if test='orderCol.mobile != null and "DESC".equalsIgnoreCase(orderCol.mobile)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
certificate-manager/src/main/resources/sqlmap/module/record/PrintLogMapper.xml
View file @ 37354cdd
<?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">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
<resultMap type="PrintLogEntity" id="PrintLogEntity-Map"> <resultMap type="PrintLogEntity" id="PrintLogEntity-Map">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="siteId" column="siteId" />
<result property="catalogId" column="catalogId" /> <result property="catalogId" column="catalogId" />
<result property="catalogCode" column="catalogCode" /> <result property="catalogCode" column="catalogCode" />
<result property="catalogName" column="catalogName" /> <result property="catalogName" column="catalogName" />
<result property="certificateName" column="certificateName" /> <result property="certificateName" column="certificateName" />
<result property="certificateCode" column="certificateCode" /> <result property="certificateCode" column="certificateCode" />
<result property="templateId" column="templateId" />
<result property="templateName" column="templateName" />
<result property="enterpriseName" column="enterpriseName" /> <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" />
...@@ -27,6 +24,10 @@ ...@@ -27,6 +24,10 @@
<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="siteId" column="siteId" />
<result property="templateId" column="templateId" />
<result property="templateName" column="templateName" />
<result property="mobile" column="mobile" />
</resultMap> </resultMap>
...@@ -37,9 +38,6 @@ ...@@ -37,9 +38,6 @@
<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('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('catalogId') or colPickMode == 1 and data.containsKey('catalogId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('catalogId') or colPickMode == 1 and data.containsKey('catalogId')))">
a.catalogId, a.catalogId,
</if> </if>
...@@ -55,12 +53,6 @@ ...@@ -55,12 +53,6 @@
<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('templateId') or colPickMode == 1 and data.containsKey('templateId')))">
a.templateId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('templateName') or colPickMode == 1 and data.containsKey('templateName')))">
a.templateName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('enterpriseName') or colPickMode == 1 and data.containsKey('enterpriseName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('enterpriseName') or colPickMode == 1 and data.containsKey('enterpriseName')))">
a.enterpriseName, a.enterpriseName,
</if> </if>
...@@ -100,23 +92,35 @@ ...@@ -100,23 +92,35 @@
<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('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('templateId') or colPickMode == 1 and data.containsKey('templateId')))">
a.templateId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('templateName') or colPickMode == 1 and data.containsKey('templateName')))">
a.templateName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('mobile') or colPickMode == 1 and data.containsKey('mobile')))">
a.mobile,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<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
(siteId,catalogId,catalogCode,catalogName,certificateName,certificateCode,templateId,templateName,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,printStatus,printDate,statusRemark,deviceId,createUserId,createTime,updateUserId,updateTime) (catalogId,catalogCode,catalogName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,printStatus,printDate,statusRemark,deviceId,createUserId,createTime,updateUserId,updateTime,siteId,templateId,templateName,mobile)
VALUES VALUES
(#{siteId},#{catalogId},#{catalogCode},#{catalogName},#{certificateName},#{certificateCode},#{templateId},#{templateName},#{enterpriseName},#{holderName},#{holderIDCardNo},#{pickerName},#{pickerIDCardNo},#{printStatus},#{printDate},#{statusRemark},#{deviceId},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{catalogId},#{catalogCode},#{catalogName},#{certificateName},#{certificateCode},#{enterpriseName},#{holderName},#{holderIDCardNo},#{pickerName},#{pickerIDCardNo},#{printStatus},#{printDate},#{statusRemark},#{deviceId},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{siteId},#{templateId},#{templateName},#{mobile})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_print_log insert into mortals_xhx_print_log
(siteId,catalogId,catalogCode,catalogName,certificateName,certificateCode,templateId,templateName,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,printStatus,printDate,statusRemark,deviceId,createUserId,createTime,updateUserId,updateTime) (catalogId,catalogCode,catalogName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,printStatus,printDate,statusRemark,deviceId,createUserId,createTime,updateUserId,updateTime,siteId,templateId,templateName,mobile)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteId},#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.certificateName},#{item.certificateCode},#{item.templateId},#{item.templateName},#{item.enterpriseName},#{item.holderName},#{item.holderIDCardNo},#{item.pickerName},#{item.pickerIDCardNo},#{item.printStatus},#{item.printDate},#{item.statusRemark},#{item.deviceId},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.certificateName},#{item.certificateCode},#{item.enterpriseName},#{item.holderName},#{item.holderIDCardNo},#{item.pickerName},#{item.pickerIDCardNo},#{item.printStatus},#{item.printDate},#{item.statusRemark},#{item.deviceId},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.siteId},#{item.templateId},#{item.templateName},#{item.mobile})
</foreach> </foreach>
</insert> </insert>
...@@ -126,12 +130,6 @@ ...@@ -126,12 +130,6 @@
update mortals_xhx_print_log as a update mortals_xhx_print_log as a
set set
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
a.siteId=#{data.siteId},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('catalogId')) or (colPickMode==1 and !data.containsKey('catalogId'))"> <if test="(colPickMode==0 and data.containsKey('catalogId')) or (colPickMode==1 and !data.containsKey('catalogId'))">
a.catalogId=#{data.catalogId}, a.catalogId=#{data.catalogId},
</if> </if>
...@@ -150,15 +148,6 @@ ...@@ -150,15 +148,6 @@
<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('templateId')) or (colPickMode==1 and !data.containsKey('templateId'))">
a.templateId=#{data.templateId},
</if>
<if test="(colPickMode==0 and data.containsKey('templateIdIncrement')) or (colPickMode==1 and !data.containsKey('templateIdIncrement'))">
a.templateId=ifnull(a.templateId,0) + #{data.templateIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('templateName')) or (colPickMode==1 and !data.containsKey('templateName'))">
a.templateName=#{data.templateName},
</if>
<if test="(colPickMode==0 and data.containsKey('enterpriseName')) or (colPickMode==1 and !data.containsKey('enterpriseName'))"> <if test="(colPickMode==0 and data.containsKey('enterpriseName')) or (colPickMode==1 and !data.containsKey('enterpriseName'))">
a.enterpriseName=#{data.enterpriseName}, a.enterpriseName=#{data.enterpriseName},
</if> </if>
...@@ -210,6 +199,24 @@ ...@@ -210,6 +199,24 @@
<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('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
a.siteId=#{data.siteId},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('templateId')) or (colPickMode==1 and !data.containsKey('templateId'))">
a.templateId=#{data.templateId},
</if>
<if test="(colPickMode==0 and data.containsKey('templateIdIncrement')) or (colPickMode==1 and !data.containsKey('templateIdIncrement'))">
a.templateId=ifnull(a.templateId,0) + #{data.templateIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('templateName')) or (colPickMode==1 and !data.containsKey('templateName'))">
a.templateName=#{data.templateName},
</if>
<if test="(colPickMode==0 and data.containsKey('mobile')) or (colPickMode==1 and !data.containsKey('mobile'))">
a.mobile=#{data.mobile},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -222,18 +229,6 @@ ...@@ -222,18 +229,6 @@
<update id="updateBatch" parameterType="paramDto"> <update id="updateBatch" parameterType="paramDto">
update mortals_xhx_print_log as a update mortals_xhx_print_log as a
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId}
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="catalogId=(case" suffix="ELSE catalogId end),"> <trim prefix="catalogId=(case" suffix="ELSE catalogId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
...@@ -273,25 +268,6 @@ ...@@ -273,25 +268,6 @@
when a.id=#{item.id} then #{item.certificateCode} when a.id=#{item.id} then #{item.certificateCode}
</if> </if>
</foreach> </foreach>
</trim>
<trim prefix="templateId=(case" suffix="ELSE templateId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('templateId')) or (colPickMode==1 and !item.containsKey('templateId'))">
when a.id=#{item.id} then #{item.templateId}
</when>
<when test="(colPickMode==0 and item.containsKey('templateIdIncrement')) or (colPickMode==1 and !item.containsKey('templateIdIncrement'))">
when a.id=#{item.id} then ifnull(a.templateId,0) + #{item.templateIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="templateName=(case" suffix="ELSE templateName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('templateName')) or (colPickMode==1 and !item.containsKey('templateName'))">
when a.id=#{item.id} then #{item.templateName}
</if>
</foreach>
</trim> </trim>
<trim prefix="enterpriseName=(case" suffix="ELSE enterpriseName 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="" >
...@@ -404,6 +380,44 @@ ...@@ -404,6 +380,44 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId}
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="templateId=(case" suffix="ELSE templateId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('templateId')) or (colPickMode==1 and !item.containsKey('templateId'))">
when a.id=#{item.id} then #{item.templateId}
</when>
<when test="(colPickMode==0 and item.containsKey('templateIdIncrement')) or (colPickMode==1 and !item.containsKey('templateIdIncrement'))">
when a.id=#{item.id} then ifnull(a.templateId,0) + #{item.templateIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="templateName=(case" suffix="ELSE templateName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('templateName')) or (colPickMode==1 and !item.containsKey('templateName'))">
when a.id=#{item.id} then #{item.templateName}
</if>
</foreach>
</trim>
<trim prefix="mobile=(case" suffix="ELSE mobile end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('mobile')) or (colPickMode==1 and !item.containsKey('mobile'))">
when a.id=#{item.id} then #{item.mobile}
</if>
</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=")">
...@@ -547,33 +561,6 @@ ...@@ -547,33 +561,6 @@
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd} ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if> </if>
<if test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
<if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
<if test="conditionParamRef.containsKey('catalogId')"> <if test="conditionParamRef.containsKey('catalogId')">
<if test="conditionParamRef.catalogId != null "> <if test="conditionParamRef.catalogId != null ">
${_conditionType_} a.catalogId = #{${_conditionParam_}.catalogId} ${_conditionType_} a.catalogId = #{${_conditionParam_}.catalogId}
...@@ -685,54 +672,6 @@ ...@@ -685,54 +672,6 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('templateId')">
<if test="conditionParamRef.templateId != null ">
${_conditionType_} a.templateId = #{${_conditionParam_}.templateId}
</if>
<if test="conditionParamRef.templateId == null">
${_conditionType_} a.templateId is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateIdList') and conditionParamRef.templateIdList.size() > 0">
${_conditionType_} a.templateId in
<foreach collection="conditionParamRef.templateIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateIdNotList') and conditionParamRef.templateIdNotList.size() > 0">
${_conditionType_} a.templateId not in
<foreach collection="conditionParamRef.templateIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateIdStart') and conditionParamRef.templateIdStart != null">
${_conditionType_} a.templateId <![CDATA[ >= ]]> #{${_conditionParam_}.templateIdStart}
</if>
<if test="conditionParamRef.containsKey('templateIdEnd') and conditionParamRef.templateIdEnd != null">
${_conditionType_} a.templateId <![CDATA[ <= ]]> #{${_conditionParam_}.templateIdEnd}
</if>
<if test="conditionParamRef.containsKey('templateName')">
<if test="conditionParamRef.templateName != null and conditionParamRef.templateName != ''">
${_conditionType_} a.templateName like #{${_conditionParam_}.templateName}
</if>
<if test="conditionParamRef.templateName == null">
${_conditionType_} a.templateName is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateNameList') and conditionParamRef.templateNameList.size() > 0">
${_conditionType_} a.templateName in
<foreach collection="conditionParamRef.templateNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateNameNotList') and conditionParamRef.templateNameNotList.size() > 0">
${_conditionType_} a.templateName not in
<foreach collection="conditionParamRef.templateNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('enterpriseName')"> <if test="conditionParamRef.containsKey('enterpriseName')">
<if test="conditionParamRef.enterpriseName != null and conditionParamRef.enterpriseName != ''"> <if test="conditionParamRef.enterpriseName != null and conditionParamRef.enterpriseName != ''">
...@@ -1012,6 +951,102 @@ ...@@ -1012,6 +951,102 @@
<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('siteId')">
<if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
<if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
<if test="conditionParamRef.containsKey('templateId')">
<if test="conditionParamRef.templateId != null ">
${_conditionType_} a.templateId = #{${_conditionParam_}.templateId}
</if>
<if test="conditionParamRef.templateId == null">
${_conditionType_} a.templateId is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateIdList') and conditionParamRef.templateIdList.size() > 0">
${_conditionType_} a.templateId in
<foreach collection="conditionParamRef.templateIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateIdNotList') and conditionParamRef.templateIdNotList.size() > 0">
${_conditionType_} a.templateId not in
<foreach collection="conditionParamRef.templateIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateIdStart') and conditionParamRef.templateIdStart != null">
${_conditionType_} a.templateId <![CDATA[ >= ]]> #{${_conditionParam_}.templateIdStart}
</if>
<if test="conditionParamRef.containsKey('templateIdEnd') and conditionParamRef.templateIdEnd != null">
${_conditionType_} a.templateId <![CDATA[ <= ]]> #{${_conditionParam_}.templateIdEnd}
</if>
<if test="conditionParamRef.containsKey('templateName')">
<if test="conditionParamRef.templateName != null and conditionParamRef.templateName != ''">
${_conditionType_} a.templateName like #{${_conditionParam_}.templateName}
</if>
<if test="conditionParamRef.templateName == null">
${_conditionType_} a.templateName is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateNameList') and conditionParamRef.templateNameList.size() > 0">
${_conditionType_} a.templateName in
<foreach collection="conditionParamRef.templateNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateNameNotList') and conditionParamRef.templateNameNotList.size() > 0">
${_conditionType_} a.templateName not in
<foreach collection="conditionParamRef.templateNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('mobile')">
<if test="conditionParamRef.mobile != null and conditionParamRef.mobile != ''">
${_conditionType_} a.mobile like #{${_conditionParam_}.mobile}
</if>
<if test="conditionParamRef.mobile == null">
${_conditionType_} a.mobile is null
</if>
</if>
<if test="conditionParamRef.containsKey('mobileList') and conditionParamRef.mobileList.size() > 0">
${_conditionType_} a.mobile in
<foreach collection="conditionParamRef.mobileList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('mobileNotList') and conditionParamRef.mobileNotList.size() > 0">
${_conditionType_} a.mobile not in
<foreach collection="conditionParamRef.mobileNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -1030,11 +1065,6 @@ ...@@ -1030,11 +1065,6 @@
<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('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('catalogId')"> <if test="orderCol.containsKey('catalogId')">
a.catalogId a.catalogId
<if test='orderCol.catalogId != null and "DESC".equalsIgnoreCase(orderCol.catalogId)'>DESC</if> <if test='orderCol.catalogId != null and "DESC".equalsIgnoreCase(orderCol.catalogId)'>DESC</if>
...@@ -1060,16 +1090,6 @@ ...@@ -1060,16 +1090,6 @@
<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('templateId')">
a.templateId
<if test='orderCol.templateId != null and "DESC".equalsIgnoreCase(orderCol.templateId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('templateName')">
a.templateName
<if test='orderCol.templateName != null and "DESC".equalsIgnoreCase(orderCol.templateName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('enterpriseName')"> <if test="orderCol.containsKey('enterpriseName')">
a.enterpriseName a.enterpriseName
<if test='orderCol.enterpriseName != null and "DESC".equalsIgnoreCase(orderCol.enterpriseName)'>DESC</if> <if test='orderCol.enterpriseName != null and "DESC".equalsIgnoreCase(orderCol.enterpriseName)'>DESC</if>
...@@ -1135,6 +1155,26 @@ ...@@ -1135,6 +1155,26 @@
<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('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('templateId')">
a.templateId
<if test='orderCol.templateId != null and "DESC".equalsIgnoreCase(orderCol.templateId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('templateName')">
a.templateName
<if test='orderCol.templateName != null and "DESC".equalsIgnoreCase(orderCol.templateName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('mobile')">
a.mobile
<if test='orderCol.mobile != null and "DESC".equalsIgnoreCase(orderCol.mobile)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
certificate-manager/src/main/resources/sqlmap/module/record/PrintWaitQueueMapper.xml
View file @ 37354cdd
<?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.PrintWaitQueueDaoImpl"> <mapper namespace="com.mortals.xhx.module.record.dao.ibatis.PrintWaitQueueDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
<resultMap type="PrintWaitQueueEntity" id="PrintWaitQueueEntity-Map"> <resultMap type="PrintWaitQueueEntity" id="PrintWaitQueueEntity-Map">
<id property="id" column="id" />
<result property="siteId" column="siteId" />
<result property="recordId" column="recordId" /> <result property="recordId" column="recordId" />
<result property="applyId" column="applyId" /> <result property="applyId" column="applyId" />
<result property="catalogId" column="catalogId" /> <result property="catalogId" column="catalogId" />
<result property="catalogCode" column="catalogCode" /> <result property="catalogCode" column="catalogCode" />
<result property="catalogName" column="catalogName" /> <result property="catalogName" column="catalogName" />
<result property="templateId" column="templateId" />
<result property="templateName" column="templateName" />
<result property="certificateName" column="certificateName" /> <result property="certificateName" column="certificateName" />
<result property="certificateCode" column="certificateCode" /> <result property="certificateCode" column="certificateCode" />
<result property="enterpriseName" column="enterpriseName" /> <result property="enterpriseName" column="enterpriseName" />
...@@ -29,6 +25,11 @@ ...@@ -29,6 +25,11 @@
<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="siteId" column="siteId" />
<id property="Id" column="Id" />
<result property="templateId" column="templateId" />
<result property="templateName" column="templateName" />
<result property="mobile" column="mobile" />
</resultMap> </resultMap>
...@@ -36,12 +37,6 @@ ...@@ -36,12 +37,6 @@
<!-- 表所有列 --> <!-- 表所有列 -->
<sql id="_columns"> <sql id="_columns">
<trim suffixOverrides="," suffix=""> <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('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('recordId') or colPickMode == 1 and data.containsKey('recordId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('recordId') or colPickMode == 1 and data.containsKey('recordId')))">
a.recordId, a.recordId,
</if> </if>
...@@ -57,12 +52,6 @@ ...@@ -57,12 +52,6 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('catalogName') or colPickMode == 1 and data.containsKey('catalogName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('catalogName') or colPickMode == 1 and data.containsKey('catalogName')))">
a.catalogName, a.catalogName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('templateId') or colPickMode == 1 and data.containsKey('templateId')))">
a.templateId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('templateName') or colPickMode == 1 and data.containsKey('templateName')))">
a.templateName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('certificateName') or colPickMode == 1 and data.containsKey('certificateName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('certificateName') or colPickMode == 1 and data.containsKey('certificateName')))">
a.certificateName, a.certificateName,
</if> </if>
...@@ -108,23 +97,38 @@ ...@@ -108,23 +97,38 @@
<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('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId,
</if>
<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('templateId') or colPickMode == 1 and data.containsKey('templateId')))">
a.templateId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('templateName') or colPickMode == 1 and data.containsKey('templateName')))">
a.templateName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('mobile') or colPickMode == 1 and data.containsKey('mobile')))">
a.mobile,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="PrintWaitQueueEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="PrintWaitQueueEntity" useGeneratedKeys="true" keyProperty="Id">
insert into mortals_xhx_print_wait_queue insert into mortals_xhx_print_wait_queue
(siteId,recordId,applyId,catalogId,catalogCode,catalogName,templateId,templateName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,previewUrl,certificateUrl,printStatus,total,createUserId,createTime,updateUserId,updateTime) (recordId,applyId,catalogId,catalogCode,catalogName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,previewUrl,certificateUrl,printStatus,total,createUserId,createTime,updateUserId,updateTime,siteId,templateId,templateName,mobile)
VALUES VALUES
(#{siteId},#{recordId},#{applyId},#{catalogId},#{catalogCode},#{catalogName},#{templateId},#{templateName},#{certificateName},#{certificateCode},#{enterpriseName},#{holderName},#{holderIDCardNo},#{pickerName},#{pickerIDCardNo},#{previewUrl},#{certificateUrl},#{printStatus},#{total},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{recordId},#{applyId},#{catalogId},#{catalogCode},#{catalogName},#{certificateName},#{certificateCode},#{enterpriseName},#{holderName},#{holderIDCardNo},#{pickerName},#{pickerIDCardNo},#{previewUrl},#{certificateUrl},#{printStatus},#{total},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{siteId},#{templateId},#{templateName},#{mobile})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_print_wait_queue insert into mortals_xhx_print_wait_queue
(siteId,recordId,applyId,catalogId,catalogCode,catalogName,templateId,templateName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,previewUrl,certificateUrl,printStatus,total,createUserId,createTime,updateUserId,updateTime) (recordId,applyId,catalogId,catalogCode,catalogName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,pickerName,pickerIDCardNo,previewUrl,certificateUrl,printStatus,total,createUserId,createTime,updateUserId,updateTime,siteId,templateId,templateName,mobile)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteId},#{item.recordId},#{item.applyId},#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.templateId},#{item.templateName},#{item.certificateName},#{item.certificateCode},#{item.enterpriseName},#{item.holderName},#{item.holderIDCardNo},#{item.pickerName},#{item.pickerIDCardNo},#{item.previewUrl},#{item.certificateUrl},#{item.printStatus},#{item.total},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.recordId},#{item.applyId},#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.certificateName},#{item.certificateCode},#{item.enterpriseName},#{item.holderName},#{item.holderIDCardNo},#{item.pickerName},#{item.pickerIDCardNo},#{item.previewUrl},#{item.certificateUrl},#{item.printStatus},#{item.total},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.siteId},#{item.templateId},#{item.templateName},#{item.mobile})
</foreach> </foreach>
</insert> </insert>
...@@ -134,12 +138,6 @@ ...@@ -134,12 +138,6 @@
update mortals_xhx_print_wait_queue as a update mortals_xhx_print_wait_queue as a
set set
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
a.siteId=#{data.siteId},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('recordId')) or (colPickMode==1 and !data.containsKey('recordId'))"> <if test="(colPickMode==0 and data.containsKey('recordId')) or (colPickMode==1 and !data.containsKey('recordId'))">
a.recordId=#{data.recordId}, a.recordId=#{data.recordId},
</if> </if>
...@@ -164,15 +162,6 @@ ...@@ -164,15 +162,6 @@
<if test="(colPickMode==0 and data.containsKey('catalogName')) or (colPickMode==1 and !data.containsKey('catalogName'))"> <if test="(colPickMode==0 and data.containsKey('catalogName')) or (colPickMode==1 and !data.containsKey('catalogName'))">
a.catalogName=#{data.catalogName}, a.catalogName=#{data.catalogName},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('templateId')) or (colPickMode==1 and !data.containsKey('templateId'))">
a.templateId=#{data.templateId},
</if>
<if test="(colPickMode==0 and data.containsKey('templateIdIncrement')) or (colPickMode==1 and !data.containsKey('templateIdIncrement'))">
a.templateId=ifnull(a.templateId,0) + #{data.templateIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('templateName')) or (colPickMode==1 and !data.containsKey('templateName'))">
a.templateName=#{data.templateName},
</if>
<if test="(colPickMode==0 and data.containsKey('certificateName')) or (colPickMode==1 and !data.containsKey('certificateName'))"> <if test="(colPickMode==0 and data.containsKey('certificateName')) or (colPickMode==1 and !data.containsKey('certificateName'))">
a.certificateName=#{data.certificateName}, a.certificateName=#{data.certificateName},
</if> </if>
...@@ -230,6 +219,24 @@ ...@@ -230,6 +219,24 @@
<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('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
a.siteId=#{data.siteId},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('templateId')) or (colPickMode==1 and !data.containsKey('templateId'))">
a.templateId=#{data.templateId},
</if>
<if test="(colPickMode==0 and data.containsKey('templateIdIncrement')) or (colPickMode==1 and !data.containsKey('templateIdIncrement'))">
a.templateId=ifnull(a.templateId,0) + #{data.templateIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('templateName')) or (colPickMode==1 and !data.containsKey('templateName'))">
a.templateName=#{data.templateName},
</if>
<if test="(colPickMode==0 and data.containsKey('mobile')) or (colPickMode==1 and !data.containsKey('mobile'))">
a.mobile=#{data.mobile},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -242,26 +249,14 @@ ...@@ -242,26 +249,14 @@
<update id="updateBatch" parameterType="paramDto"> <update id="updateBatch" parameterType="paramDto">
update mortals_xhx_print_wait_queue as a update mortals_xhx_print_wait_queue as a
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId}
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="recordId=(case" suffix="ELSE recordId end),"> <trim prefix="recordId=(case" suffix="ELSE recordId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('recordId')) or (colPickMode==1 and !item.containsKey('recordId'))"> <when test="(colPickMode==0 and item.containsKey('recordId')) or (colPickMode==1 and !item.containsKey('recordId'))">
when a.id=#{item.id} then #{item.recordId} when a.Id=#{item.Id} then #{item.recordId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('recordIdIncrement')) or (colPickMode==1 and !item.containsKey('recordIdIncrement'))"> <when test="(colPickMode==0 and item.containsKey('recordIdIncrement')) or (colPickMode==1 and !item.containsKey('recordIdIncrement'))">
when a.id=#{item.id} then ifnull(a.recordId,0) + #{item.recordIdIncrement} when a.Id=#{item.Id} then ifnull(a.recordId,0) + #{item.recordIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
...@@ -270,10 +265,10 @@ ...@@ -270,10 +265,10 @@
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('applyId')) or (colPickMode==1 and !item.containsKey('applyId'))"> <when test="(colPickMode==0 and item.containsKey('applyId')) or (colPickMode==1 and !item.containsKey('applyId'))">
when a.id=#{item.id} then #{item.applyId} when a.Id=#{item.Id} then #{item.applyId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('applyIdIncrement')) or (colPickMode==1 and !item.containsKey('applyIdIncrement'))"> <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 a.Id=#{item.Id} then ifnull(a.applyId,0) + #{item.applyIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
...@@ -282,10 +277,10 @@ ...@@ -282,10 +277,10 @@
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('catalogId')) or (colPickMode==1 and !item.containsKey('catalogId'))"> <when test="(colPickMode==0 and item.containsKey('catalogId')) or (colPickMode==1 and !item.containsKey('catalogId'))">
when a.id=#{item.id} then #{item.catalogId} when a.Id=#{item.Id} then #{item.catalogId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('catalogIdIncrement')) or (colPickMode==1 and !item.containsKey('catalogIdIncrement'))"> <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 a.Id=#{item.Id} then ifnull(a.catalogId,0) + #{item.catalogIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
...@@ -293,96 +288,77 @@ ...@@ -293,96 +288,77 @@
<trim prefix="catalogCode=(case" suffix="ELSE catalogCode end),"> <trim prefix="catalogCode=(case" suffix="ELSE catalogCode 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('catalogCode')) or (colPickMode==1 and !item.containsKey('catalogCode'))"> <if test="(colPickMode==0 and item.containsKey('catalogCode')) or (colPickMode==1 and !item.containsKey('catalogCode'))">
when a.id=#{item.id} then #{item.catalogCode} when a.Id=#{item.Id} then #{item.catalogCode}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="catalogName=(case" suffix="ELSE catalogName end),"> <trim prefix="catalogName=(case" suffix="ELSE catalogName 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('catalogName')) or (colPickMode==1 and !item.containsKey('catalogName'))"> <if test="(colPickMode==0 and item.containsKey('catalogName')) or (colPickMode==1 and !item.containsKey('catalogName'))">
when a.id=#{item.id} then #{item.catalogName} when a.Id=#{item.Id} then #{item.catalogName}
</if>
</foreach>
</trim>
<trim prefix="templateId=(case" suffix="ELSE templateId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('templateId')) or (colPickMode==1 and !item.containsKey('templateId'))">
when a.id=#{item.id} then #{item.templateId}
</when>
<when test="(colPickMode==0 and item.containsKey('templateIdIncrement')) or (colPickMode==1 and !item.containsKey('templateIdIncrement'))">
when a.id=#{item.id} then ifnull(a.templateId,0) + #{item.templateIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="templateName=(case" suffix="ELSE templateName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('templateName')) or (colPickMode==1 and !item.containsKey('templateName'))">
when a.id=#{item.id} then #{item.templateName}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="certificateName=(case" suffix="ELSE certificateName end),"> <trim prefix="certificateName=(case" suffix="ELSE certificateName 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('certificateName')) or (colPickMode==1 and !item.containsKey('certificateName'))"> <if test="(colPickMode==0 and item.containsKey('certificateName')) or (colPickMode==1 and !item.containsKey('certificateName'))">
when a.id=#{item.id} then #{item.certificateName} when a.Id=#{item.Id} then #{item.certificateName}
</if> </if>
</foreach> </foreach>
</trim> </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'))">
when a.id=#{item.id} then #{item.certificateCode} when a.Id=#{item.Id} then #{item.certificateCode}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="enterpriseName=(case" suffix="ELSE enterpriseName 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('enterpriseName')) or (colPickMode==1 and !item.containsKey('enterpriseName'))"> <if test="(colPickMode==0 and item.containsKey('enterpriseName')) or (colPickMode==1 and !item.containsKey('enterpriseName'))">
when a.id=#{item.id} then #{item.enterpriseName} when a.Id=#{item.Id} then #{item.enterpriseName}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="holderName=(case" suffix="ELSE holderName end),"> <trim prefix="holderName=(case" suffix="ELSE holderName 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('holderName')) or (colPickMode==1 and !item.containsKey('holderName'))"> <if test="(colPickMode==0 and item.containsKey('holderName')) or (colPickMode==1 and !item.containsKey('holderName'))">
when a.id=#{item.id} then #{item.holderName} when a.Id=#{item.Id} then #{item.holderName}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="holderIDCardNo=(case" suffix="ELSE holderIDCardNo end),"> <trim prefix="holderIDCardNo=(case" suffix="ELSE holderIDCardNo 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('holderIDCardNo')) or (colPickMode==1 and !item.containsKey('holderIDCardNo'))"> <if test="(colPickMode==0 and item.containsKey('holderIDCardNo')) or (colPickMode==1 and !item.containsKey('holderIDCardNo'))">
when a.id=#{item.id} then #{item.holderIDCardNo} when a.Id=#{item.Id} then #{item.holderIDCardNo}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="pickerName=(case" suffix="ELSE pickerName end),"> <trim prefix="pickerName=(case" suffix="ELSE pickerName 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('pickerName')) or (colPickMode==1 and !item.containsKey('pickerName'))"> <if test="(colPickMode==0 and item.containsKey('pickerName')) or (colPickMode==1 and !item.containsKey('pickerName'))">
when a.id=#{item.id} then #{item.pickerName} when a.Id=#{item.Id} then #{item.pickerName}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="pickerIDCardNo=(case" suffix="ELSE pickerIDCardNo end),"> <trim prefix="pickerIDCardNo=(case" suffix="ELSE pickerIDCardNo 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('pickerIDCardNo')) or (colPickMode==1 and !item.containsKey('pickerIDCardNo'))"> <if test="(colPickMode==0 and item.containsKey('pickerIDCardNo')) or (colPickMode==1 and !item.containsKey('pickerIDCardNo'))">
when a.id=#{item.id} then #{item.pickerIDCardNo} when a.Id=#{item.Id} then #{item.pickerIDCardNo}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="previewUrl=(case" suffix="ELSE previewUrl end),"> <trim prefix="previewUrl=(case" suffix="ELSE previewUrl 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('previewUrl')) or (colPickMode==1 and !item.containsKey('previewUrl'))"> <if test="(colPickMode==0 and item.containsKey('previewUrl')) or (colPickMode==1 and !item.containsKey('previewUrl'))">
when a.id=#{item.id} then #{item.previewUrl} when a.Id=#{item.Id} then #{item.previewUrl}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="certificateUrl=(case" suffix="ELSE certificateUrl end),"> <trim prefix="certificateUrl=(case" suffix="ELSE certificateUrl 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('certificateUrl')) or (colPickMode==1 and !item.containsKey('certificateUrl'))"> <if test="(colPickMode==0 and item.containsKey('certificateUrl')) or (colPickMode==1 and !item.containsKey('certificateUrl'))">
when a.id=#{item.id} then #{item.certificateUrl} when a.Id=#{item.Id} then #{item.certificateUrl}
</if> </if>
</foreach> </foreach>
</trim> </trim>
...@@ -390,10 +366,10 @@ ...@@ -390,10 +366,10 @@
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('printStatus')) or (colPickMode==1 and !item.containsKey('printStatus'))"> <when test="(colPickMode==0 and item.containsKey('printStatus')) or (colPickMode==1 and !item.containsKey('printStatus'))">
when a.id=#{item.id} then #{item.printStatus} when a.Id=#{item.Id} then #{item.printStatus}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('printStatusIncrement')) or (colPickMode==1 and !item.containsKey('printStatusIncrement'))"> <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 a.Id=#{item.Id} then ifnull(a.printStatus,0) + #{item.printStatusIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
...@@ -402,10 +378,10 @@ ...@@ -402,10 +378,10 @@
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('total')) or (colPickMode==1 and !item.containsKey('total'))"> <when test="(colPickMode==0 and item.containsKey('total')) or (colPickMode==1 and !item.containsKey('total'))">
when a.id=#{item.id} then #{item.total} when a.Id=#{item.Id} then #{item.total}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('totalIncrement')) or (colPickMode==1 and !item.containsKey('totalIncrement'))"> <when test="(colPickMode==0 and item.containsKey('totalIncrement')) or (colPickMode==1 and !item.containsKey('totalIncrement'))">
when a.id=#{item.id} then ifnull(a.total,0) + #{item.totalIncrement} when a.Id=#{item.Id} then ifnull(a.total,0) + #{item.totalIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
...@@ -414,10 +390,10 @@ ...@@ -414,10 +390,10 @@
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))"> <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
when a.id=#{item.id} then #{item.createUserId} when a.Id=#{item.Id} then #{item.createUserId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))"> <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 a.Id=#{item.Id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
...@@ -425,7 +401,7 @@ ...@@ -425,7 +401,7 @@
<trim prefix="createTime=(case" suffix="ELSE createTime end),"> <trim prefix="createTime=(case" suffix="ELSE createTime 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('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))"> <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
when a.id=#{item.id} then #{item.createTime} when a.Id=#{item.Id} then #{item.createTime}
</if> </if>
</foreach> </foreach>
</trim> </trim>
...@@ -433,10 +409,10 @@ ...@@ -433,10 +409,10 @@
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))"> <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
when a.id=#{item.id} then #{item.updateUserId} when a.Id=#{item.Id} then #{item.updateUserId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))"> <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 a.Id=#{item.Id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
...@@ -444,36 +420,74 @@ ...@@ -444,36 +420,74 @@
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),"> <trim prefix="updateTime=(case" suffix="ELSE updateTime 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('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))"> <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
when a.id=#{item.id} then #{item.updateTime} when a.Id=#{item.Id} then #{item.updateTime}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.Id=#{item.Id} then #{item.siteId}
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.Id=#{item.Id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="templateId=(case" suffix="ELSE templateId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('templateId')) or (colPickMode==1 and !item.containsKey('templateId'))">
when a.Id=#{item.Id} then #{item.templateId}
</when>
<when test="(colPickMode==0 and item.containsKey('templateIdIncrement')) or (colPickMode==1 and !item.containsKey('templateIdIncrement'))">
when a.Id=#{item.Id} then ifnull(a.templateId,0) + #{item.templateIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="templateName=(case" suffix="ELSE templateName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('templateName')) or (colPickMode==1 and !item.containsKey('templateName'))">
when a.Id=#{item.Id} then #{item.templateName}
</if>
</foreach>
</trim> </trim>
where id in <trim prefix="mobile=(case" suffix="ELSE mobile end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('mobile')) or (colPickMode==1 and !item.containsKey('mobile'))">
when a.Id=#{item.Id} then #{item.mobile}
</if>
</foreach>
</trim>
</trim>
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=")">
#{item.id} #{item.Id}
</foreach> </foreach>
</update> </update>
<!-- 根据主健查询 --> <!-- 根据主健查询 -->
<select id="getByKey" parameterType="paramDto" resultMap="PrintWaitQueueEntity-Map"> <select id="getByKey" parameterType="paramDto" resultMap="PrintWaitQueueEntity-Map">
select <include refid="_columns"/> select <include refid="_columns"/>
from mortals_xhx_print_wait_queue as a from mortals_xhx_print_wait_queue as a
where a.id=#{condition.id} where a.Id=#{condition.Id}
</select> </select>
<!-- 根据主健删除 --> <!-- 根据主健删除 -->
<delete id="deleteByKey" parameterType="paramDto"> <delete id="deleteByKey" parameterType="paramDto">
delete a.* from mortals_xhx_print_wait_queue as a where a.id=#{condition.id} delete a.* from mortals_xhx_print_wait_queue as a where a.Id=#{condition.Id}
</delete> </delete>
<!-- 根据主健删除一批，针对单一主健有效 --> <!-- 根据主健删除一批，针对单一主健有效 -->
<delete id="deleteByKeys"> <delete id="deleteByKeys">
delete from mortals_xhx_print_wait_queue where id in delete from mortals_xhx_print_wait_queue where Id in
<foreach collection="array" item="item" index="index" open="(" separator="," close=")"> <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
#{item} #{item}
</foreach> </foreach>
</delete> </delete>
<!-- 根据主健列表删除一批，针对单一主健有效 --> <!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList"> <delete id="deleteByKeyList">
delete from mortals_xhx_print_wait_queue where id in delete from mortals_xhx_print_wait_queue where Id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")"> <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item} #{item}
</foreach> </foreach>
...@@ -481,9 +495,9 @@ ...@@ -481,9 +495,9 @@
<!-- 根据对象列表删除一批，针对单一主健有效 --> <!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList"> <delete id="deleteByEntityList">
delete from mortals_xhx_print_wait_queue where id in delete from mortals_xhx_print_wait_queue where Id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")"> <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id} #{item.Id}
</foreach> </foreach>
</delete> </delete>
<!-- 根据paramDto删除一批 --> <!-- 根据paramDto删除一批 -->
...@@ -561,63 +575,9 @@ ...@@ -561,63 +575,9 @@
<bind name="conditionParamRef" value="${_conditionParam_}"/> <bind name="conditionParamRef" value="${_conditionParam_}"/>
<if test="conditionParamRef.containsKey('id')"> <if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null"> <if test="conditionParamRef.id != null">
${_conditionType_} a.id=#{${_conditionParam_}.id} ${_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') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" 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>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if> </if>
<if test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
<if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
<if test="conditionParamRef.containsKey('recordId')"> <if test="conditionParamRef.containsKey('recordId')">
<if test="conditionParamRef.recordId != null "> <if test="conditionParamRef.recordId != null ">
${_conditionType_} a.recordId = #{${_conditionParam_}.recordId} ${_conditionType_} a.recordId = #{${_conditionParam_}.recordId}
...@@ -741,54 +701,6 @@ ...@@ -741,54 +701,6 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('templateId')">
<if test="conditionParamRef.templateId != null ">
${_conditionType_} a.templateId = #{${_conditionParam_}.templateId}
</if>
<if test="conditionParamRef.templateId == null">
${_conditionType_} a.templateId is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateIdList') and conditionParamRef.templateIdList.size() > 0">
${_conditionType_} a.templateId in
<foreach collection="conditionParamRef.templateIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateIdNotList') and conditionParamRef.templateIdNotList.size() > 0">
${_conditionType_} a.templateId not in
<foreach collection="conditionParamRef.templateIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateIdStart') and conditionParamRef.templateIdStart != null">
${_conditionType_} a.templateId <![CDATA[ >= ]]> #{${_conditionParam_}.templateIdStart}
</if>
<if test="conditionParamRef.containsKey('templateIdEnd') and conditionParamRef.templateIdEnd != null">
${_conditionType_} a.templateId <![CDATA[ <= ]]> #{${_conditionParam_}.templateIdEnd}
</if>
<if test="conditionParamRef.containsKey('templateName')">
<if test="conditionParamRef.templateName != null and conditionParamRef.templateName != ''">
${_conditionType_} a.templateName like #{${_conditionParam_}.templateName}
</if>
<if test="conditionParamRef.templateName == null">
${_conditionType_} a.templateName is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateNameList') and conditionParamRef.templateNameList.size() > 0">
${_conditionType_} a.templateName in
<foreach collection="conditionParamRef.templateNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateNameNotList') and conditionParamRef.templateNameNotList.size() > 0">
${_conditionType_} a.templateName not in
<foreach collection="conditionParamRef.templateNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('certificateName')"> <if test="conditionParamRef.containsKey('certificateName')">
<if test="conditionParamRef.certificateName != null and conditionParamRef.certificateName != ''"> <if test="conditionParamRef.certificateName != null and conditionParamRef.certificateName != ''">
...@@ -1116,6 +1028,129 @@ ...@@ -1116,6 +1028,129 @@
<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('siteId')">
<if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
<if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</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') and conditionParamRef.IdList.size() > 0">
${_conditionType_} a.Id in
<foreach collection="conditionParamRef.IdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('IdNotList') and conditionParamRef.IdNotList.size() > 0">
${_conditionType_} a.Id not in
<foreach collection="conditionParamRef.IdNotList" 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('templateId')">
<if test="conditionParamRef.templateId != null ">
${_conditionType_} a.templateId = #{${_conditionParam_}.templateId}
</if>
<if test="conditionParamRef.templateId == null">
${_conditionType_} a.templateId is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateIdList') and conditionParamRef.templateIdList.size() > 0">
${_conditionType_} a.templateId in
<foreach collection="conditionParamRef.templateIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateIdNotList') and conditionParamRef.templateIdNotList.size() > 0">
${_conditionType_} a.templateId not in
<foreach collection="conditionParamRef.templateIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateIdStart') and conditionParamRef.templateIdStart != null">
${_conditionType_} a.templateId <![CDATA[ >= ]]> #{${_conditionParam_}.templateIdStart}
</if>
<if test="conditionParamRef.containsKey('templateIdEnd') and conditionParamRef.templateIdEnd != null">
${_conditionType_} a.templateId <![CDATA[ <= ]]> #{${_conditionParam_}.templateIdEnd}
</if>
<if test="conditionParamRef.containsKey('templateName')">
<if test="conditionParamRef.templateName != null and conditionParamRef.templateName != ''">
${_conditionType_} a.templateName like #{${_conditionParam_}.templateName}
</if>
<if test="conditionParamRef.templateName == null">
${_conditionType_} a.templateName is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateNameList') and conditionParamRef.templateNameList.size() > 0">
${_conditionType_} a.templateName in
<foreach collection="conditionParamRef.templateNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateNameNotList') and conditionParamRef.templateNameNotList.size() > 0">
${_conditionType_} a.templateName not in
<foreach collection="conditionParamRef.templateNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('mobile')">
<if test="conditionParamRef.mobile != null and conditionParamRef.mobile != ''">
${_conditionType_} a.mobile like #{${_conditionParam_}.mobile}
</if>
<if test="conditionParamRef.mobile == null">
${_conditionType_} a.mobile is null
</if>
</if>
<if test="conditionParamRef.containsKey('mobileList') and conditionParamRef.mobileList.size() > 0">
${_conditionType_} a.mobile in
<foreach collection="conditionParamRef.mobileList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('mobileNotList') and conditionParamRef.mobileNotList.size() > 0">
${_conditionType_} a.mobile not in
<foreach collection="conditionParamRef.mobileNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -1129,16 +1164,6 @@ ...@@ -1129,16 +1164,6 @@
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()"> <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by order by
<trim suffixOverrides="," suffix=""> <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('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('recordId')"> <if test="orderCol.containsKey('recordId')">
a.recordId a.recordId
<if test='orderCol.recordId != null and "DESC".equalsIgnoreCase(orderCol.recordId)'>DESC</if> <if test='orderCol.recordId != null and "DESC".equalsIgnoreCase(orderCol.recordId)'>DESC</if>
...@@ -1164,16 +1189,6 @@ ...@@ -1164,16 +1189,6 @@
<if test='orderCol.catalogName != null and "DESC".equalsIgnoreCase(orderCol.catalogName)'>DESC</if> <if test='orderCol.catalogName != null and "DESC".equalsIgnoreCase(orderCol.catalogName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('templateId')">
a.templateId
<if test='orderCol.templateId != null and "DESC".equalsIgnoreCase(orderCol.templateId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('templateName')">
a.templateName
<if test='orderCol.templateName != null and "DESC".equalsIgnoreCase(orderCol.templateName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('certificateName')"> <if test="orderCol.containsKey('certificateName')">
a.certificateName a.certificateName
<if test='orderCol.certificateName != null and "DESC".equalsIgnoreCase(orderCol.certificateName)'>DESC</if> <if test='orderCol.certificateName != null and "DESC".equalsIgnoreCase(orderCol.certificateName)'>DESC</if>
...@@ -1249,6 +1264,31 @@ ...@@ -1249,6 +1264,31 @@
<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('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('Id')">
a.Id
<if test='orderCol.Id != null and "DESC".equalsIgnoreCase(orderCol.Id)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('templateId')">
a.templateId
<if test='orderCol.templateId != null and "DESC".equalsIgnoreCase(orderCol.templateId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('templateName')">
a.templateName
<if test='orderCol.templateName != null and "DESC".equalsIgnoreCase(orderCol.templateName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('mobile')">
a.mobile
<if test='orderCol.mobile != null and "DESC".equalsIgnoreCase(orderCol.mobile)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
certificate-manager/src/main/resources/sqlmap/module/record/RetainLogMapper.xml
View file @ 37354cdd
<?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">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
<resultMap type="RetainLogEntity" id="RetainLogEntity-Map"> <resultMap type="RetainLogEntity" id="RetainLogEntity-Map">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="siteId" column="siteId" />
<result property="recordId" column="recordId" /> <result property="recordId" column="recordId" />
<result property="catalogId" column="catalogId" /> <result property="catalogId" column="catalogId" />
<result property="catalogCode" column="catalogCode" /> <result property="catalogCode" column="catalogCode" />
<result property="catalogName" column="catalogName" /> <result property="catalogName" column="catalogName" />
<result property="templateId" column="templateId" />
<result property="templateName" column="templateName" />
<result property="certificateName" column="certificateName" /> <result property="certificateName" column="certificateName" />
<result property="certificateCode" column="certificateCode" /> <result property="certificateCode" column="certificateCode" />
<result property="enterpriseName" column="enterpriseName" /> <result property="enterpriseName" column="enterpriseName" />
...@@ -25,6 +22,10 @@ ...@@ -25,6 +22,10 @@
<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="siteId" column="siteId" />
<result property="templateId" column="templateId" />
<result property="templateName" column="templateName" />
<result property="mobile" column="mobile" />
</resultMap> </resultMap>
...@@ -35,9 +36,6 @@ ...@@ -35,9 +36,6 @@
<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('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('recordId') or colPickMode == 1 and data.containsKey('recordId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('recordId') or colPickMode == 1 and data.containsKey('recordId')))">
a.recordId, a.recordId,
</if> </if>
...@@ -50,12 +48,6 @@ ...@@ -50,12 +48,6 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('catalogName') or colPickMode == 1 and data.containsKey('catalogName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('catalogName') or colPickMode == 1 and data.containsKey('catalogName')))">
a.catalogName, a.catalogName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('templateId') or colPickMode == 1 and data.containsKey('templateId')))">
a.templateId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('templateName') or colPickMode == 1 and data.containsKey('templateName')))">
a.templateName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('certificateName') or colPickMode == 1 and data.containsKey('certificateName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('certificateName') or colPickMode == 1 and data.containsKey('certificateName')))">
a.certificateName, a.certificateName,
</if> </if>
...@@ -92,23 +84,35 @@ ...@@ -92,23 +84,35 @@
<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('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('templateId') or colPickMode == 1 and data.containsKey('templateId')))">
a.templateId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('templateName') or colPickMode == 1 and data.containsKey('templateName')))">
a.templateName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('mobile') or colPickMode == 1 and data.containsKey('mobile')))">
a.mobile,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<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
(siteId,recordId,catalogId,catalogCode,catalogName,templateId,templateName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,certificateStatus,certificateUrl,previewUrl,createUserId,createTime,updateUserId,updateTime) (recordId,catalogId,catalogCode,catalogName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,certificateStatus,certificateUrl,previewUrl,createUserId,createTime,updateUserId,updateTime,siteId,templateId,templateName,mobile)
VALUES VALUES
(#{siteId},#{recordId},#{catalogId},#{catalogCode},#{catalogName},#{templateId},#{templateName},#{certificateName},#{certificateCode},#{enterpriseName},#{holderName},#{holderIDCardNo},#{certificateStatus},#{certificateUrl},#{previewUrl},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{recordId},#{catalogId},#{catalogCode},#{catalogName},#{certificateName},#{certificateCode},#{enterpriseName},#{holderName},#{holderIDCardNo},#{certificateStatus},#{certificateUrl},#{previewUrl},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{siteId},#{templateId},#{templateName},#{mobile})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_retain_log insert into mortals_xhx_retain_log
(siteId,recordId,catalogId,catalogCode,catalogName,templateId,templateName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,certificateStatus,certificateUrl,previewUrl,createUserId,createTime,updateUserId,updateTime) (recordId,catalogId,catalogCode,catalogName,certificateName,certificateCode,enterpriseName,holderName,holderIDCardNo,certificateStatus,certificateUrl,previewUrl,createUserId,createTime,updateUserId,updateTime,siteId,templateId,templateName,mobile)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteId},#{item.recordId},#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.templateId},#{item.templateName},#{item.certificateName},#{item.certificateCode},#{item.enterpriseName},#{item.holderName},#{item.holderIDCardNo},#{item.certificateStatus},#{item.certificateUrl},#{item.previewUrl},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.recordId},#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.certificateName},#{item.certificateCode},#{item.enterpriseName},#{item.holderName},#{item.holderIDCardNo},#{item.certificateStatus},#{item.certificateUrl},#{item.previewUrl},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.siteId},#{item.templateId},#{item.templateName},#{item.mobile})
</foreach> </foreach>
</insert> </insert>
...@@ -118,12 +122,6 @@ ...@@ -118,12 +122,6 @@
update mortals_xhx_retain_log as a update mortals_xhx_retain_log as a
set set
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
a.siteId=#{data.siteId},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('recordId')) or (colPickMode==1 and !data.containsKey('recordId'))"> <if test="(colPickMode==0 and data.containsKey('recordId')) or (colPickMode==1 and !data.containsKey('recordId'))">
a.recordId=#{data.recordId}, a.recordId=#{data.recordId},
</if> </if>
...@@ -142,15 +140,6 @@ ...@@ -142,15 +140,6 @@
<if test="(colPickMode==0 and data.containsKey('catalogName')) or (colPickMode==1 and !data.containsKey('catalogName'))"> <if test="(colPickMode==0 and data.containsKey('catalogName')) or (colPickMode==1 and !data.containsKey('catalogName'))">
a.catalogName=#{data.catalogName}, a.catalogName=#{data.catalogName},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('templateId')) or (colPickMode==1 and !data.containsKey('templateId'))">
a.templateId=#{data.templateId},
</if>
<if test="(colPickMode==0 and data.containsKey('templateIdIncrement')) or (colPickMode==1 and !data.containsKey('templateIdIncrement'))">
a.templateId=ifnull(a.templateId,0) + #{data.templateIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('templateName')) or (colPickMode==1 and !data.containsKey('templateName'))">
a.templateName=#{data.templateName},
</if>
<if test="(colPickMode==0 and data.containsKey('certificateName')) or (colPickMode==1 and !data.containsKey('certificateName'))"> <if test="(colPickMode==0 and data.containsKey('certificateName')) or (colPickMode==1 and !data.containsKey('certificateName'))">
a.certificateName=#{data.certificateName}, a.certificateName=#{data.certificateName},
</if> </if>
...@@ -196,6 +185,24 @@ ...@@ -196,6 +185,24 @@
<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('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
a.siteId=#{data.siteId},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('templateId')) or (colPickMode==1 and !data.containsKey('templateId'))">
a.templateId=#{data.templateId},
</if>
<if test="(colPickMode==0 and data.containsKey('templateIdIncrement')) or (colPickMode==1 and !data.containsKey('templateIdIncrement'))">
a.templateId=ifnull(a.templateId,0) + #{data.templateIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('templateName')) or (colPickMode==1 and !data.containsKey('templateName'))">
a.templateName=#{data.templateName},
</if>
<if test="(colPickMode==0 and data.containsKey('mobile')) or (colPickMode==1 and !data.containsKey('mobile'))">
a.mobile=#{data.mobile},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -208,18 +215,6 @@ ...@@ -208,18 +215,6 @@
<update id="updateBatch" parameterType="paramDto"> <update id="updateBatch" parameterType="paramDto">
update mortals_xhx_retain_log as a update mortals_xhx_retain_log as a
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId}
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="recordId=(case" suffix="ELSE recordId end),"> <trim prefix="recordId=(case" suffix="ELSE recordId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
...@@ -257,25 +252,6 @@ ...@@ -257,25 +252,6 @@
when a.id=#{item.id} then #{item.catalogName} when a.id=#{item.id} then #{item.catalogName}
</if> </if>
</foreach> </foreach>
</trim>
<trim prefix="templateId=(case" suffix="ELSE templateId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('templateId')) or (colPickMode==1 and !item.containsKey('templateId'))">
when a.id=#{item.id} then #{item.templateId}
</when>
<when test="(colPickMode==0 and item.containsKey('templateIdIncrement')) or (colPickMode==1 and !item.containsKey('templateIdIncrement'))">
when a.id=#{item.id} then ifnull(a.templateId,0) + #{item.templateIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="templateName=(case" suffix="ELSE templateName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('templateName')) or (colPickMode==1 and !item.containsKey('templateName'))">
when a.id=#{item.id} then #{item.templateName}
</if>
</foreach>
</trim> </trim>
<trim prefix="certificateName=(case" suffix="ELSE certificateName end),"> <trim prefix="certificateName=(case" suffix="ELSE certificateName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
...@@ -376,6 +352,44 @@ ...@@ -376,6 +352,44 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId}
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="templateId=(case" suffix="ELSE templateId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('templateId')) or (colPickMode==1 and !item.containsKey('templateId'))">
when a.id=#{item.id} then #{item.templateId}
</when>
<when test="(colPickMode==0 and item.containsKey('templateIdIncrement')) or (colPickMode==1 and !item.containsKey('templateIdIncrement'))">
when a.id=#{item.id} then ifnull(a.templateId,0) + #{item.templateIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="templateName=(case" suffix="ELSE templateName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('templateName')) or (colPickMode==1 and !item.containsKey('templateName'))">
when a.id=#{item.id} then #{item.templateName}
</if>
</foreach>
</trim>
<trim prefix="mobile=(case" suffix="ELSE mobile end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('mobile')) or (colPickMode==1 and !item.containsKey('mobile'))">
when a.id=#{item.id} then #{item.mobile}
</if>
</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=")">
...@@ -519,33 +533,6 @@ ...@@ -519,33 +533,6 @@
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd} ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if> </if>
<if test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
<if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
<if test="conditionParamRef.containsKey('recordId')"> <if test="conditionParamRef.containsKey('recordId')">
<if test="conditionParamRef.recordId != null "> <if test="conditionParamRef.recordId != null ">
${_conditionType_} a.recordId = #{${_conditionParam_}.recordId} ${_conditionType_} a.recordId = #{${_conditionParam_}.recordId}
...@@ -642,54 +629,6 @@ ...@@ -642,54 +629,6 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('templateId')">
<if test="conditionParamRef.templateId != null ">
${_conditionType_} a.templateId = #{${_conditionParam_}.templateId}
</if>
<if test="conditionParamRef.templateId == null">
${_conditionType_} a.templateId is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateIdList') and conditionParamRef.templateIdList.size() > 0">
${_conditionType_} a.templateId in
<foreach collection="conditionParamRef.templateIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateIdNotList') and conditionParamRef.templateIdNotList.size() > 0">
${_conditionType_} a.templateId not in
<foreach collection="conditionParamRef.templateIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateIdStart') and conditionParamRef.templateIdStart != null">
${_conditionType_} a.templateId <![CDATA[ >= ]]> #{${_conditionParam_}.templateIdStart}
</if>
<if test="conditionParamRef.containsKey('templateIdEnd') and conditionParamRef.templateIdEnd != null">
${_conditionType_} a.templateId <![CDATA[ <= ]]> #{${_conditionParam_}.templateIdEnd}
</if>
<if test="conditionParamRef.containsKey('templateName')">
<if test="conditionParamRef.templateName != null and conditionParamRef.templateName != ''">
${_conditionType_} a.templateName like #{${_conditionParam_}.templateName}
</if>
<if test="conditionParamRef.templateName == null">
${_conditionType_} a.templateName is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateNameList') and conditionParamRef.templateNameList.size() > 0">
${_conditionType_} a.templateName in
<foreach collection="conditionParamRef.templateNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateNameNotList') and conditionParamRef.templateNameNotList.size() > 0">
${_conditionType_} a.templateName not in
<foreach collection="conditionParamRef.templateNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('certificateName')"> <if test="conditionParamRef.containsKey('certificateName')">
<if test="conditionParamRef.certificateName != null and conditionParamRef.certificateName != ''"> <if test="conditionParamRef.certificateName != null and conditionParamRef.certificateName != ''">
...@@ -948,6 +887,102 @@ ...@@ -948,6 +887,102 @@
<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('siteId')">
<if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
<if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
<if test="conditionParamRef.containsKey('templateId')">
<if test="conditionParamRef.templateId != null ">
${_conditionType_} a.templateId = #{${_conditionParam_}.templateId}
</if>
<if test="conditionParamRef.templateId == null">
${_conditionType_} a.templateId is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateIdList') and conditionParamRef.templateIdList.size() > 0">
${_conditionType_} a.templateId in
<foreach collection="conditionParamRef.templateIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateIdNotList') and conditionParamRef.templateIdNotList.size() > 0">
${_conditionType_} a.templateId not in
<foreach collection="conditionParamRef.templateIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateIdStart') and conditionParamRef.templateIdStart != null">
${_conditionType_} a.templateId <![CDATA[ >= ]]> #{${_conditionParam_}.templateIdStart}
</if>
<if test="conditionParamRef.containsKey('templateIdEnd') and conditionParamRef.templateIdEnd != null">
${_conditionType_} a.templateId <![CDATA[ <= ]]> #{${_conditionParam_}.templateIdEnd}
</if>
<if test="conditionParamRef.containsKey('templateName')">
<if test="conditionParamRef.templateName != null and conditionParamRef.templateName != ''">
${_conditionType_} a.templateName like #{${_conditionParam_}.templateName}
</if>
<if test="conditionParamRef.templateName == null">
${_conditionType_} a.templateName is null
</if>
</if>
<if test="conditionParamRef.containsKey('templateNameList') and conditionParamRef.templateNameList.size() > 0">
${_conditionType_} a.templateName in
<foreach collection="conditionParamRef.templateNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('templateNameNotList') and conditionParamRef.templateNameNotList.size() > 0">
${_conditionType_} a.templateName not in
<foreach collection="conditionParamRef.templateNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('mobile')">
<if test="conditionParamRef.mobile != null and conditionParamRef.mobile != ''">
${_conditionType_} a.mobile like #{${_conditionParam_}.mobile}
</if>
<if test="conditionParamRef.mobile == null">
${_conditionType_} a.mobile is null
</if>
</if>
<if test="conditionParamRef.containsKey('mobileList') and conditionParamRef.mobileList.size() > 0">
${_conditionType_} a.mobile in
<foreach collection="conditionParamRef.mobileList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('mobileNotList') and conditionParamRef.mobileNotList.size() > 0">
${_conditionType_} a.mobile not in
<foreach collection="conditionParamRef.mobileNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -966,11 +1001,6 @@ ...@@ -966,11 +1001,6 @@
<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('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('recordId')"> <if test="orderCol.containsKey('recordId')">
a.recordId a.recordId
<if test='orderCol.recordId != null and "DESC".equalsIgnoreCase(orderCol.recordId)'>DESC</if> <if test='orderCol.recordId != null and "DESC".equalsIgnoreCase(orderCol.recordId)'>DESC</if>
...@@ -991,16 +1021,6 @@ ...@@ -991,16 +1021,6 @@
<if test='orderCol.catalogName != null and "DESC".equalsIgnoreCase(orderCol.catalogName)'>DESC</if> <if test='orderCol.catalogName != null and "DESC".equalsIgnoreCase(orderCol.catalogName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('templateId')">
a.templateId
<if test='orderCol.templateId != null and "DESC".equalsIgnoreCase(orderCol.templateId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('templateName')">
a.templateName
<if test='orderCol.templateName != null and "DESC".equalsIgnoreCase(orderCol.templateName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('certificateName')"> <if test="orderCol.containsKey('certificateName')">
a.certificateName a.certificateName
<if test='orderCol.certificateName != null and "DESC".equalsIgnoreCase(orderCol.certificateName)'>DESC</if> <if test='orderCol.certificateName != null and "DESC".equalsIgnoreCase(orderCol.certificateName)'>DESC</if>
...@@ -1061,6 +1081,26 @@ ...@@ -1061,6 +1081,26 @@
<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('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('templateId')">
a.templateId
<if test='orderCol.templateId != null and "DESC".equalsIgnoreCase(orderCol.templateId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('templateName')">
a.templateName
<if test='orderCol.templateName != null and "DESC".equalsIgnoreCase(orderCol.templateName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('mobile')">
a.mobile
<if test='orderCol.mobile != null and "DESC".equalsIgnoreCase(orderCol.mobile)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
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