Skip to content

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

所有表增加站点id属性

parent 11beb7c7
Show whitespace changes
Inline Side-by-side
Showing with 18206 additions and 10129 deletions
certificate-manager/src/main/java/com/mortals/xhx/module/business/model/BusinessLicenseEntity.java
View file @ 4018c60f
...@@ -10,7 +10,7 @@ import com.mortals.xhx.module.business.model.vo.BusinessLicenseVo; ...@@ -10,7 +10,7 @@ import com.mortals.xhx.module.business.model.vo.BusinessLicenseVo;
* 营业执照信息实体对象 * 营业执照信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-12-13 * @date 2023-05-14
*/ */
public class BusinessLicenseEntity extends BusinessLicenseVo { public class BusinessLicenseEntity extends BusinessLicenseVo {
...@@ -92,6 +92,10 @@ public class BusinessLicenseEntity extends BusinessLicenseVo { ...@@ -92,6 +92,10 @@ public class BusinessLicenseEntity extends BusinessLicenseVo {
* 处理状态0未处理1已处理 * 处理状态0未处理1已处理
*/ */
private Integer status; private Integer status;
/**
* 站点id
*/
private Long siteId;
...@@ -362,6 +366,20 @@ public class BusinessLicenseEntity extends BusinessLicenseVo { ...@@ -362,6 +366,20 @@ public class BusinessLicenseEntity extends BusinessLicenseVo {
public void setStatus(Integer status){ public void setStatus(Integer status){
this.status = status; this.status = status;
} }
/**
* 获取 站点id
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点id
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
...@@ -403,6 +421,7 @@ public class BusinessLicenseEntity extends BusinessLicenseVo { ...@@ -403,6 +421,7 @@ public class BusinessLicenseEntity extends BusinessLicenseVo {
sb.append(",dyZb:").append(getDyZb()); sb.append(",dyZb:").append(getDyZb());
sb.append(",dyFb:").append(getDyFb()); sb.append(",dyFb:").append(getDyFb());
sb.append(",status:").append(getStatus()); sb.append(",status:").append(getStatus());
sb.append(",siteId:").append(getSiteId());
return sb.toString(); return sb.toString();
} }
...@@ -440,10 +459,12 @@ public class BusinessLicenseEntity extends BusinessLicenseVo { ...@@ -440,10 +459,12 @@ public class BusinessLicenseEntity extends BusinessLicenseVo {
this.EndDate = ""; this.EndDate = "";
this.dyZb = 2; this.dyZb = null;
this.dyFb = null;
this.dyFb = 2; this.status = null;
this.status = 0; this.siteId = null;
} }
} }
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/business/model/BusinessLicenseQuery.java
View file @ 4018c60f
...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.business.model.BusinessLicenseEntity; ...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.business.model.BusinessLicenseEntity;
* 营业执照信息查询对象 * 营业执照信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-12-13 * @date 2023-05-14
*/ */
public class BusinessLicenseQuery extends BusinessLicenseEntity { public class BusinessLicenseQuery extends BusinessLicenseEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -21,54 +21,89 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -21,54 +21,89 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
/** 序号，主键，自增长列表 */ /** 序号，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 经营者姓名 */ /** 经营者姓名 */
private List<String> ProprietorNameList; private List<String> ProprietorNameList;
/** 经营者姓名排除列表 */
private List <String> ProprietorNameNotList;
/** 营业执照号码 */ /** 营业执照号码 */
private List<String> BusinessLicenseList; private List<String> BusinessLicenseList;
/** 营业执照号码排除列表 */
private List <String> BusinessLicenseNotList;
/** 单位字号名称 */ /** 单位字号名称 */
private List<String> TypeSizeNameList; private List<String> TypeSizeNameList;
/** 单位字号名称排除列表 */
private List <String> TypeSizeNameNotList;
/** 开业日期 */ /** 开业日期 */
private List<String> StartDateList; private List<String> StartDateList;
/** 开业日期排除列表 */
private List <String> StartDateNotList;
/** 组成形式如：个人经营 */ /** 组成形式如：个人经营 */
private List<String> ComposingFormList; private List<String> ComposingFormList;
/** 组成形式如：个人经营排除列表 */
private List <String> ComposingFormNotList;
/** 经营场所 */ /** 经营场所 */
private List<String> ManageLocationList; private List<String> ManageLocationList;
/** 经营场所排除列表 */
private List <String> ManageLocationNotList;
/** 经营范围 */ /** 经营范围 */
private List<String> ManageRangeList; private List<String> ManageRangeList;
/** 经营范围排除列表 */
private List <String> ManageRangeNotList;
/** 注册号 */ /** 注册号 */
private List<String> RegCodeList; private List<String> RegCodeList;
/** 注册号排除列表 */
private List <String> RegCodeNotList;
/** 证件号码 */ /** 证件号码 */
private List<String> CredentialsCodeList; private List<String> CredentialsCodeList;
/** 证件号码排除列表 */
private List <String> CredentialsCodeNotList;
/** 证件类型 */ /** 证件类型 */
private List<String> CredentialsTypeList; private List<String> CredentialsTypeList;
/** 证件类型排除列表 */
private List <String> CredentialsTypeNotList;
/** 移动电话 */ /** 移动电话 */
private List<String> ProprietorMobileList; private List<String> ProprietorMobileList;
/** 移动电话排除列表 */
private List <String> ProprietorMobileNotList;
/** 营业执照正本二维码base64编码 */ /** 营业执照正本二维码base64编码 */
private List<String> QrCodeOriginalBase64List; private List<String> QrCodeOriginalBase64List;
/** 营业执照正本二维码base64编码排除列表 */
private List <String> QrCodeOriginalBase64NotList;
/** 营业执照副本二维码base64编码 */ /** 营业执照副本二维码base64编码 */
private List<String> QrCodeDuplicateBase64List; private List<String> QrCodeDuplicateBase64List;
/** 营业执照副本二维码base64编码排除列表 */
private List <String> QrCodeDuplicateBase64NotList;
/** 注册资本 */ /** 注册资本 */
private List<String> RegisteredCapitalList; private List<String> RegisteredCapitalList;
/** 注册资本排除列表 */
private List <String> RegisteredCapitalNotList;
/** 实收资本 */ /** 实收资本 */
private List<String> PaidupCapitalList; private List<String> PaidupCapitalList;
/** 实收资本排除列表 */
private List <String> PaidupCapitalNotList;
/** 营业期限 */ /** 营业期限 */
private List<String> EndDateList; private List<String> EndDateList;
/** 营业期限排除列表 */
private List <String> EndDateNotList;
/** 开始 允许打印 正本 1允许 2不允许 */ /** 开始 允许打印 正本 1允许 2不允许 */
private Integer dyZbStart; private Integer dyZbStart;
...@@ -81,6 +116,9 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -81,6 +116,9 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
/** 允许打印 正本 1允许 2不允许列表 */ /** 允许打印 正本 1允许 2不允许列表 */
private List <Integer> dyZbList; private List <Integer> dyZbList;
/** 允许打印 正本 1允许 2不允许排除列表 */
private List <Integer> dyZbNotList;
/** 开始 允许打印 副本 1允许 2不允许 */ /** 开始 允许打印 副本 1允许 2不允许 */
private Integer dyFbStart; private Integer dyFbStart;
...@@ -93,6 +131,9 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -93,6 +131,9 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
/** 允许打印 副本 1允许 2不允许列表 */ /** 允许打印 副本 1允许 2不允许列表 */
private List <Integer> dyFbList; private List <Integer> dyFbList;
/** 允许打印 副本 1允许 2不允许排除列表 */
private List <Integer> dyFbNotList;
/** 开始 创建用户 */ /** 开始 创建用户 */
private Long createUserIdStart; private Long createUserIdStart;
...@@ -105,6 +146,9 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -105,6 +146,9 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
/** 创建用户列表 */ /** 创建用户列表 */
private List <Long> createUserIdList; private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -123,6 +167,9 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -123,6 +167,9 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
/** 更新用户列表 */ /** 更新用户列表 */
private List <Long> updateUserIdList; private List <Long> updateUserIdList;
/** 更新用户排除列表 */
private List <Long> updateUserIdNotList;
/** 开始 更新时间 */ /** 开始 更新时间 */
private String updateTimeStart; private String updateTimeStart;
...@@ -141,6 +188,24 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -141,6 +188,24 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
/** 处理状态0未处理1已处理列表 */ /** 处理状态0未处理1已处理列表 */
private List <Integer> statusList; private List <Integer> statusList;
/** 处理状态0未处理1已处理排除列表 */
private List <Integer> statusNotList;
/** 开始 站点id */
private Long siteIdStart;
/** 结束 站点id */
private Long siteIdEnd;
/** 增加 站点id */
private Long siteIdIncrement;
/** 站点id列表 */
private List <Long> siteIdList;
/** 站点id排除列表 */
private List <Long> siteIdNotList;
/** 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<BusinessLicenseQuery> orConditionList; private List<BusinessLicenseQuery> orConditionList;
...@@ -213,6 +278,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -213,6 +278,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
this.idList = idList; this.idList = idList;
} }
/**
* 获取 序号，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/** /**
* 获取 经营者姓名 * 获取 经营者姓名
* @return ProprietorNameList * @return ProprietorNameList
...@@ -228,6 +310,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -228,6 +310,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
public void setProprietorNameList(List<String> ProprietorNameList){ public void setProprietorNameList(List<String> ProprietorNameList){
this.ProprietorNameList = ProprietorNameList; this.ProprietorNameList = ProprietorNameList;
} }
/**
* 获取 经营者姓名
* @return ProprietorNameNotList
*/
public List<String> getProprietorNameNotList(){
return this.ProprietorNameNotList;
}
/**
* 设置 经营者姓名
* @param ProprietorNameNotList
*/
public void setProprietorNameNotList(List<String> ProprietorNameNotList){
this.ProprietorNameNotList = ProprietorNameNotList;
}
/** /**
* 获取 营业执照号码 * 获取 营业执照号码
* @return BusinessLicenseList * @return BusinessLicenseList
...@@ -243,6 +342,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -243,6 +342,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
public void setBusinessLicenseList(List<String> BusinessLicenseList){ public void setBusinessLicenseList(List<String> BusinessLicenseList){
this.BusinessLicenseList = BusinessLicenseList; this.BusinessLicenseList = BusinessLicenseList;
} }
/**
* 获取 营业执照号码
* @return BusinessLicenseNotList
*/
public List<String> getBusinessLicenseNotList(){
return this.BusinessLicenseNotList;
}
/**
* 设置 营业执照号码
* @param BusinessLicenseNotList
*/
public void setBusinessLicenseNotList(List<String> BusinessLicenseNotList){
this.BusinessLicenseNotList = BusinessLicenseNotList;
}
/** /**
* 获取 单位字号名称 * 获取 单位字号名称
* @return TypeSizeNameList * @return TypeSizeNameList
...@@ -258,6 +374,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -258,6 +374,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
public void setTypeSizeNameList(List<String> TypeSizeNameList){ public void setTypeSizeNameList(List<String> TypeSizeNameList){
this.TypeSizeNameList = TypeSizeNameList; this.TypeSizeNameList = TypeSizeNameList;
} }
/**
* 获取 单位字号名称
* @return TypeSizeNameNotList
*/
public List<String> getTypeSizeNameNotList(){
return this.TypeSizeNameNotList;
}
/**
* 设置 单位字号名称
* @param TypeSizeNameNotList
*/
public void setTypeSizeNameNotList(List<String> TypeSizeNameNotList){
this.TypeSizeNameNotList = TypeSizeNameNotList;
}
/** /**
* 获取 开业日期 * 获取 开业日期
* @return StartDateList * @return StartDateList
...@@ -273,6 +406,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -273,6 +406,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
public void setStartDateList(List<String> StartDateList){ public void setStartDateList(List<String> StartDateList){
this.StartDateList = StartDateList; this.StartDateList = StartDateList;
} }
/**
* 获取 开业日期
* @return StartDateNotList
*/
public List<String> getStartDateNotList(){
return this.StartDateNotList;
}
/**
* 设置 开业日期
* @param StartDateNotList
*/
public void setStartDateNotList(List<String> StartDateNotList){
this.StartDateNotList = StartDateNotList;
}
/** /**
* 获取 组成形式如：个人经营 * 获取 组成形式如：个人经营
* @return ComposingFormList * @return ComposingFormList
...@@ -288,6 +438,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -288,6 +438,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
public void setComposingFormList(List<String> ComposingFormList){ public void setComposingFormList(List<String> ComposingFormList){
this.ComposingFormList = ComposingFormList; this.ComposingFormList = ComposingFormList;
} }
/**
* 获取 组成形式如：个人经营
* @return ComposingFormNotList
*/
public List<String> getComposingFormNotList(){
return this.ComposingFormNotList;
}
/**
* 设置 组成形式如：个人经营
* @param ComposingFormNotList
*/
public void setComposingFormNotList(List<String> ComposingFormNotList){
this.ComposingFormNotList = ComposingFormNotList;
}
/** /**
* 获取 经营场所 * 获取 经营场所
* @return ManageLocationList * @return ManageLocationList
...@@ -303,6 +470,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -303,6 +470,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
public void setManageLocationList(List<String> ManageLocationList){ public void setManageLocationList(List<String> ManageLocationList){
this.ManageLocationList = ManageLocationList; this.ManageLocationList = ManageLocationList;
} }
/**
* 获取 经营场所
* @return ManageLocationNotList
*/
public List<String> getManageLocationNotList(){
return this.ManageLocationNotList;
}
/**
* 设置 经营场所
* @param ManageLocationNotList
*/
public void setManageLocationNotList(List<String> ManageLocationNotList){
this.ManageLocationNotList = ManageLocationNotList;
}
/** /**
* 获取 经营范围 * 获取 经营范围
* @return ManageRangeList * @return ManageRangeList
...@@ -318,6 +502,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -318,6 +502,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
public void setManageRangeList(List<String> ManageRangeList){ public void setManageRangeList(List<String> ManageRangeList){
this.ManageRangeList = ManageRangeList; this.ManageRangeList = ManageRangeList;
} }
/**
* 获取 经营范围
* @return ManageRangeNotList
*/
public List<String> getManageRangeNotList(){
return this.ManageRangeNotList;
}
/**
* 设置 经营范围
* @param ManageRangeNotList
*/
public void setManageRangeNotList(List<String> ManageRangeNotList){
this.ManageRangeNotList = ManageRangeNotList;
}
/** /**
* 获取 注册号 * 获取 注册号
* @return RegCodeList * @return RegCodeList
...@@ -333,6 +534,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -333,6 +534,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
public void setRegCodeList(List<String> RegCodeList){ public void setRegCodeList(List<String> RegCodeList){
this.RegCodeList = RegCodeList; this.RegCodeList = RegCodeList;
} }
/**
* 获取 注册号
* @return RegCodeNotList
*/
public List<String> getRegCodeNotList(){
return this.RegCodeNotList;
}
/**
* 设置 注册号
* @param RegCodeNotList
*/
public void setRegCodeNotList(List<String> RegCodeNotList){
this.RegCodeNotList = RegCodeNotList;
}
/** /**
* 获取 证件号码 * 获取 证件号码
* @return CredentialsCodeList * @return CredentialsCodeList
...@@ -348,6 +566,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -348,6 +566,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
public void setCredentialsCodeList(List<String> CredentialsCodeList){ public void setCredentialsCodeList(List<String> CredentialsCodeList){
this.CredentialsCodeList = CredentialsCodeList; this.CredentialsCodeList = CredentialsCodeList;
} }
/**
* 获取 证件号码
* @return CredentialsCodeNotList
*/
public List<String> getCredentialsCodeNotList(){
return this.CredentialsCodeNotList;
}
/**
* 设置 证件号码
* @param CredentialsCodeNotList
*/
public void setCredentialsCodeNotList(List<String> CredentialsCodeNotList){
this.CredentialsCodeNotList = CredentialsCodeNotList;
}
/** /**
* 获取 证件类型 * 获取 证件类型
* @return CredentialsTypeList * @return CredentialsTypeList
...@@ -363,6 +598,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -363,6 +598,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
public void setCredentialsTypeList(List<String> CredentialsTypeList){ public void setCredentialsTypeList(List<String> CredentialsTypeList){
this.CredentialsTypeList = CredentialsTypeList; this.CredentialsTypeList = CredentialsTypeList;
} }
/**
* 获取 证件类型
* @return CredentialsTypeNotList
*/
public List<String> getCredentialsTypeNotList(){
return this.CredentialsTypeNotList;
}
/**
* 设置 证件类型
* @param CredentialsTypeNotList
*/
public void setCredentialsTypeNotList(List<String> CredentialsTypeNotList){
this.CredentialsTypeNotList = CredentialsTypeNotList;
}
/** /**
* 获取 移动电话 * 获取 移动电话
* @return ProprietorMobileList * @return ProprietorMobileList
...@@ -378,6 +630,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -378,6 +630,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
public void setProprietorMobileList(List<String> ProprietorMobileList){ public void setProprietorMobileList(List<String> ProprietorMobileList){
this.ProprietorMobileList = ProprietorMobileList; this.ProprietorMobileList = ProprietorMobileList;
} }
/**
* 获取 移动电话
* @return ProprietorMobileNotList
*/
public List<String> getProprietorMobileNotList(){
return this.ProprietorMobileNotList;
}
/**
* 设置 移动电话
* @param ProprietorMobileNotList
*/
public void setProprietorMobileNotList(List<String> ProprietorMobileNotList){
this.ProprietorMobileNotList = ProprietorMobileNotList;
}
/** /**
* 获取 营业执照正本二维码base64编码 * 获取 营业执照正本二维码base64编码
* @return QrCodeOriginalBase64List * @return QrCodeOriginalBase64List
...@@ -393,6 +662,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -393,6 +662,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
public void setQrCodeOriginalBase64List(List<String> QrCodeOriginalBase64List){ public void setQrCodeOriginalBase64List(List<String> QrCodeOriginalBase64List){
this.QrCodeOriginalBase64List = QrCodeOriginalBase64List; this.QrCodeOriginalBase64List = QrCodeOriginalBase64List;
} }
/**
* 获取 营业执照正本二维码base64编码
* @return QrCodeOriginalBase64NotList
*/
public List<String> getQrCodeOriginalBase64NotList(){
return this.QrCodeOriginalBase64NotList;
}
/**
* 设置 营业执照正本二维码base64编码
* @param QrCodeOriginalBase64NotList
*/
public void setQrCodeOriginalBase64NotList(List<String> QrCodeOriginalBase64NotList){
this.QrCodeOriginalBase64NotList = QrCodeOriginalBase64NotList;
}
/** /**
* 获取 营业执照副本二维码base64编码 * 获取 营业执照副本二维码base64编码
* @return QrCodeDuplicateBase64List * @return QrCodeDuplicateBase64List
...@@ -408,6 +694,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -408,6 +694,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
public void setQrCodeDuplicateBase64List(List<String> QrCodeDuplicateBase64List){ public void setQrCodeDuplicateBase64List(List<String> QrCodeDuplicateBase64List){
this.QrCodeDuplicateBase64List = QrCodeDuplicateBase64List; this.QrCodeDuplicateBase64List = QrCodeDuplicateBase64List;
} }
/**
* 获取 营业执照副本二维码base64编码
* @return QrCodeDuplicateBase64NotList
*/
public List<String> getQrCodeDuplicateBase64NotList(){
return this.QrCodeDuplicateBase64NotList;
}
/**
* 设置 营业执照副本二维码base64编码
* @param QrCodeDuplicateBase64NotList
*/
public void setQrCodeDuplicateBase64NotList(List<String> QrCodeDuplicateBase64NotList){
this.QrCodeDuplicateBase64NotList = QrCodeDuplicateBase64NotList;
}
/** /**
* 获取 注册资本 * 获取 注册资本
* @return RegisteredCapitalList * @return RegisteredCapitalList
...@@ -423,6 +726,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -423,6 +726,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
public void setRegisteredCapitalList(List<String> RegisteredCapitalList){ public void setRegisteredCapitalList(List<String> RegisteredCapitalList){
this.RegisteredCapitalList = RegisteredCapitalList; this.RegisteredCapitalList = RegisteredCapitalList;
} }
/**
* 获取 注册资本
* @return RegisteredCapitalNotList
*/
public List<String> getRegisteredCapitalNotList(){
return this.RegisteredCapitalNotList;
}
/**
* 设置 注册资本
* @param RegisteredCapitalNotList
*/
public void setRegisteredCapitalNotList(List<String> RegisteredCapitalNotList){
this.RegisteredCapitalNotList = RegisteredCapitalNotList;
}
/** /**
* 获取 实收资本 * 获取 实收资本
* @return PaidupCapitalList * @return PaidupCapitalList
...@@ -438,6 +758,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -438,6 +758,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
public void setPaidupCapitalList(List<String> PaidupCapitalList){ public void setPaidupCapitalList(List<String> PaidupCapitalList){
this.PaidupCapitalList = PaidupCapitalList; this.PaidupCapitalList = PaidupCapitalList;
} }
/**
* 获取 实收资本
* @return PaidupCapitalNotList
*/
public List<String> getPaidupCapitalNotList(){
return this.PaidupCapitalNotList;
}
/**
* 设置 实收资本
* @param PaidupCapitalNotList
*/
public void setPaidupCapitalNotList(List<String> PaidupCapitalNotList){
this.PaidupCapitalNotList = PaidupCapitalNotList;
}
/** /**
* 获取 营业期限 * 获取 营业期限
* @return EndDateList * @return EndDateList
...@@ -453,6 +790,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -453,6 +790,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
public void setEndDateList(List<String> EndDateList){ public void setEndDateList(List<String> EndDateList){
this.EndDateList = EndDateList; this.EndDateList = EndDateList;
} }
/**
* 获取 营业期限
* @return EndDateNotList
*/
public List<String> getEndDateNotList(){
return this.EndDateNotList;
}
/**
* 设置 营业期限
* @param EndDateNotList
*/
public void setEndDateNotList(List<String> EndDateNotList){
this.EndDateNotList = EndDateNotList;
}
/** /**
* 获取 开始 允许打印 正本 1允许 2不允许 * 获取 开始 允许打印 正本 1允许 2不允许
* @return dyZbStart * @return dyZbStart
...@@ -517,6 +871,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -517,6 +871,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
this.dyZbList = dyZbList; this.dyZbList = dyZbList;
} }
/**
* 获取 允许打印 正本 1允许 2不允许
* @return dyZbNotList
*/
public List<Integer> getDyZbNotList(){
return this.dyZbNotList;
}
/**
* 设置 允许打印 正本 1允许 2不允许
* @param dyZbNotList
*/
public void setDyZbNotList(List<Integer> dyZbNotList){
this.dyZbNotList = dyZbNotList;
}
/** /**
* 获取 开始 允许打印 副本 1允许 2不允许 * 获取 开始 允许打印 副本 1允许 2不允许
* @return dyFbStart * @return dyFbStart
...@@ -581,6 +952,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -581,6 +952,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
this.dyFbList = dyFbList; this.dyFbList = dyFbList;
} }
/**
* 获取 允许打印 副本 1允许 2不允许
* @return dyFbNotList
*/
public List<Integer> getDyFbNotList(){
return this.dyFbNotList;
}
/**
* 设置 允许打印 副本 1允许 2不允许
* @param dyFbNotList
*/
public void setDyFbNotList(List<Integer> dyFbNotList){
this.dyFbNotList = dyFbNotList;
}
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @return createUserIdStart * @return createUserIdStart
...@@ -645,6 +1033,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -645,6 +1033,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
} }
/**
* 获取 创建用户
* @return createUserIdNotList
*/
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
...@@ -741,6 +1146,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -741,6 +1146,23 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
} }
/**
* 获取 更新用户
* @return updateUserIdNotList
*/
public List<Long> getUpdateUserIdNotList(){
return this.updateUserIdNotList;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
}
/** /**
* 获取 开始 更新时间 * 获取 开始 更新时间
* @return updateTimeStart * @return updateTimeStart
...@@ -837,6 +1259,104 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -837,6 +1259,104 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
this.statusList = statusList; this.statusList = statusList;
} }
/**
* 获取 处理状态0未处理1已处理
* @return statusNotList
*/
public List<Integer> getStatusNotList(){
return this.statusNotList;
}
/**
* 设置 处理状态0未处理1已处理
* @param statusNotList
*/
public void setStatusNotList(List<Integer> statusNotList){
this.statusNotList = statusNotList;
}
/**
* 获取 开始 站点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;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -882,6 +1402,15 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -882,6 +1402,15 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
return this; return this;
} }
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public BusinessLicenseQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/** /**
* 设置 经营者姓名 * 设置 经营者姓名
...@@ -1231,6 +1760,15 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -1231,6 +1760,15 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
return this; return this;
} }
/**
* 设置 允许打印 正本 1允许 2不允许
* @param dyZbNotList
*/
public BusinessLicenseQuery dyZbNotList(List<Integer> dyZbNotList){
this.dyZbNotList = dyZbNotList;
return this;
}
/** /**
* 设置 允许打印 副本 1允许 2不允许 * 设置 允许打印 副本 1允许 2不允许
* @param dyFb * @param dyFb
...@@ -1276,6 +1814,15 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -1276,6 +1814,15 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
return this; return this;
} }
/**
* 设置 允许打印 副本 1允许 2不允许
* @param dyFbNotList
*/
public BusinessLicenseQuery dyFbNotList(List<Integer> dyFbNotList){
this.dyFbNotList = dyFbNotList;
return this;
}
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserId * @param createUserId
...@@ -1321,6 +1868,15 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -1321,6 +1868,15 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
return this; return this;
} }
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public BusinessLicenseQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/** /**
* 设置 更新用户 * 设置 更新用户
...@@ -1367,6 +1923,15 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -1367,6 +1923,15 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
return this; return this;
} }
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public BusinessLicenseQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
return this;
}
/** /**
* 设置 处理状态0未处理1已处理 * 设置 处理状态0未处理1已处理
...@@ -1413,6 +1978,69 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity { ...@@ -1413,6 +1978,69 @@ public class BusinessLicenseQuery extends BusinessLicenseEntity {
return this; return this;
} }
/**
* 设置 处理状态0未处理1已处理
* @param statusNotList
*/
public BusinessLicenseQuery statusNotList(List<Integer> statusNotList){
this.statusNotList = statusNotList;
return this;
}
/**
* 设置 站点id
* @param siteId
*/
public BusinessLicenseQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public BusinessLicenseQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public BusinessLicenseQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public BusinessLicenseQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点id
* @param siteIdList
*/
public BusinessLicenseQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public BusinessLicenseQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
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/certificate/model/CertificateCatalogEntity.java
View file @ 4018c60f
package com.mortals.xhx.module.certificate.model; package com.mortals.xhx.module.certificate.model;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.certificate.model.vo.CertificateCatalogVo; import com.mortals.xhx.module.certificate.model.vo.CertificateCatalogVo;
/** /**
* 证照目录实体对象 * 证照目录实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-09 * @date 2023-05-14
*/ */
public class CertificateCatalogEntity extends CertificateCatalogVo { public class CertificateCatalogEntity extends CertificateCatalogVo {
...@@ -87,6 +92,10 @@ public class CertificateCatalogEntity extends CertificateCatalogVo { ...@@ -87,6 +92,10 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
* 是否生成PDF，0：否1：是 * 是否生成PDF，0：否1：是
*/ */
private Integer isPdf; private Integer isPdf;
/**
* 站点id
*/
private Long siteId;
...@@ -357,6 +366,20 @@ public class CertificateCatalogEntity extends CertificateCatalogVo { ...@@ -357,6 +366,20 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
public void setIsPdf(Integer isPdf){ public void setIsPdf(Integer isPdf){
this.isPdf = isPdf; this.isPdf = isPdf;
} }
/**
* 获取 站点id
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点id
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
...@@ -398,6 +421,7 @@ public class CertificateCatalogEntity extends CertificateCatalogVo { ...@@ -398,6 +421,7 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
sb.append(",deviceId:").append(getDeviceId()); sb.append(",deviceId:").append(getDeviceId());
sb.append(",excelFile:").append(getExcelFile()); sb.append(",excelFile:").append(getExcelFile());
sb.append(",isPdf:").append(getIsPdf()); sb.append(",isPdf:").append(getIsPdf());
sb.append(",siteId:").append(getSiteId());
return sb.toString(); return sb.toString();
} }
...@@ -440,5 +464,7 @@ public class CertificateCatalogEntity extends CertificateCatalogVo { ...@@ -440,5 +464,7 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
this.excelFile = ""; this.excelFile = "";
this.isPdf = 0; this.isPdf = 0;
this.siteId = null;
} }
} }
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateCatalogQuery.java
View file @ 4018c60f
package com.mortals.xhx.module.certificate.model; package com.mortals.xhx.module.certificate.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
/** /**
* 证照目录查询对象 * 证照目录查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-09 * @date 2023-05-14
*/ */
public class CertificateCatalogQuery extends CertificateCatalogEntity { public class CertificateCatalogQuery extends CertificateCatalogEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -250,6 +251,21 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity { ...@@ -250,6 +251,21 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
/** 是否生成PDF，0：否1：是排除列表 */ /** 是否生成PDF，0：否1：是排除列表 */
private List <Integer> isPdfNotList; private List <Integer> isPdfNotList;
/** 开始 站点id */
private Long siteIdStart;
/** 结束 站点id */
private Long siteIdEnd;
/** 增加 站点id */
private Long siteIdIncrement;
/** 站点id列表 */
private List <Long> siteIdList;
/** 站点id排除列表 */
private List <Long> siteIdNotList;
/** 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<CertificateCatalogQuery> orConditionList; private List<CertificateCatalogQuery> orConditionList;
...@@ -1614,6 +1630,87 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity { ...@@ -1614,6 +1630,87 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
} }
/**
* 获取 开始 站点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;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -2454,6 +2551,60 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity { ...@@ -2454,6 +2551,60 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
return this; return this;
} }
/**
* 设置 站点id
* @param siteId
*/
public CertificateCatalogQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public CertificateCatalogQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public CertificateCatalogQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public CertificateCatalogQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点id
* @param siteIdList
*/
public CertificateCatalogQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public CertificateCatalogQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
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/certificate/model/CertificateClassifyEntity.java
View file @ 4018c60f
...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel; ...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.certificate.model.vo.CertificateClassifyVo; import com.mortals.xhx.module.certificate.model.vo.CertificateClassifyVo;
/** /**
* 证照分类实体对象 * 证照分类实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-04 * @date 2023-05-14
*/ */
public class CertificateClassifyEntity extends CertificateClassifyVo { public class CertificateClassifyEntity extends CertificateClassifyVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -36,6 +36,10 @@ public class CertificateClassifyEntity extends CertificateClassifyVo { ...@@ -36,6 +36,10 @@ public class CertificateClassifyEntity extends CertificateClassifyVo {
* 证照类型，1：普通，2：正副本 * 证照类型，1：普通，2：正副本
*/ */
private Integer classifyType; private Integer classifyType;
/**
* 站点id
*/
private Long siteId;
...@@ -110,6 +114,20 @@ public class CertificateClassifyEntity extends CertificateClassifyVo { ...@@ -110,6 +114,20 @@ public class CertificateClassifyEntity extends CertificateClassifyVo {
public void setClassifyType(Integer classifyType){ public void setClassifyType(Integer classifyType){
this.classifyType = classifyType; this.classifyType = classifyType;
} }
/**
* 获取 站点id
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点id
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
...@@ -137,6 +155,7 @@ public class CertificateClassifyEntity extends CertificateClassifyVo { ...@@ -137,6 +155,7 @@ public class CertificateClassifyEntity extends CertificateClassifyVo {
sb.append(",total:").append(getTotal()); sb.append(",total:").append(getTotal());
sb.append(",showFront:").append(getShowFront()); sb.append(",showFront:").append(getShowFront());
sb.append(",classifyType:").append(getClassifyType()); sb.append(",classifyType:").append(getClassifyType());
sb.append(",siteId:").append(getSiteId());
return sb.toString(); return sb.toString();
} }
...@@ -151,5 +170,7 @@ public class CertificateClassifyEntity extends CertificateClassifyVo { ...@@ -151,5 +170,7 @@ public class CertificateClassifyEntity extends CertificateClassifyVo {
this.showFront = 0; this.showFront = 0;
this.classifyType = 1; this.classifyType = 1;
this.siteId = null;
} }
} }
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateClassifyQuery.java
View file @ 4018c60f
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.certificate.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.certificate.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.certificate.model.CertificateClassifyEntity; import com.mortals.xhx.module.certificate.model.CertificateClassifyEntity;
/** /**
* 证照分类查询对象 * 证照分类查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-04 * @date 2023-05-14
*/ */
public class CertificateClassifyQuery extends CertificateClassifyEntity { public class CertificateClassifyQuery extends CertificateClassifyEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -21,9 +21,14 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity { ...@@ -21,9 +21,14 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity {
/** 序号，主键，自增长列表 */ /** 序号，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 分类名称 */ /** 分类名称 */
private List<String> classifyNameList; private List<String> classifyNameList;
/** 分类名称排除列表 */
private List <String> classifyNameNotList;
/** 开始 排序号 */ /** 开始 排序号 */
private Integer sortStart; private Integer sortStart;
...@@ -36,6 +41,9 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity { ...@@ -36,6 +41,9 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity {
/** 排序号列表 */ /** 排序号列表 */
private List <Integer> sortList; private List <Integer> sortList;
/** 排序号排除列表 */
private List <Integer> sortNotList;
/** 开始 打印次数 */ /** 开始 打印次数 */
private Integer totalStart; private Integer totalStart;
...@@ -48,6 +56,9 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity { ...@@ -48,6 +56,9 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity {
/** 打印次数列表 */ /** 打印次数列表 */
private List <Integer> totalList; private List <Integer> totalList;
/** 打印次数排除列表 */
private List <Integer> totalNotList;
/** 开始 是否首页展示0：否1是 */ /** 开始 是否首页展示0：否1是 */
private Integer showFrontStart; private Integer showFrontStart;
...@@ -60,6 +71,9 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity { ...@@ -60,6 +71,9 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity {
/** 是否首页展示0：否1是列表 */ /** 是否首页展示0：否1是列表 */
private List <Integer> showFrontList; private List <Integer> showFrontList;
/** 是否首页展示0：否1是排除列表 */
private List <Integer> showFrontNotList;
/** 开始 证照类型，1：普通，2：正副本 */ /** 开始 证照类型，1：普通，2：正副本 */
private Integer classifyTypeStart; private Integer classifyTypeStart;
...@@ -72,6 +86,9 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity { ...@@ -72,6 +86,9 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity {
/** 证照类型，1：普通，2：正副本列表 */ /** 证照类型，1：普通，2：正副本列表 */
private List <Integer> classifyTypeList; private List <Integer> classifyTypeList;
/** 证照类型，1：普通，2：正副本排除列表 */
private List <Integer> classifyTypeNotList;
/** 开始 创建用户 */ /** 开始 创建用户 */
private Long createUserIdStart; private Long createUserIdStart;
...@@ -84,6 +101,9 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity { ...@@ -84,6 +101,9 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity {
/** 创建用户列表 */ /** 创建用户列表 */
private List <Long> createUserIdList; private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -102,12 +122,30 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity { ...@@ -102,12 +122,30 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity {
/** 更新用户列表 */ /** 更新用户列表 */
private List <Long> updateUserIdList; private List <Long> updateUserIdList;
/** 更新用户排除列表 */
private List <Long> updateUserIdNotList;
/** 开始 更新时间 */ /** 开始 更新时间 */
private String updateTimeStart; private String updateTimeStart;
/** 结束 更新时间 */ /** 结束 更新时间 */
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;
/** 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<CertificateClassifyQuery> orConditionList; private List<CertificateClassifyQuery> orConditionList;
...@@ -180,6 +218,23 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity { ...@@ -180,6 +218,23 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity {
this.idList = idList; this.idList = idList;
} }
/**
* 获取 序号，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/** /**
* 获取 分类名称 * 获取 分类名称
* @return classifyNameList * @return classifyNameList
...@@ -195,6 +250,23 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity { ...@@ -195,6 +250,23 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity {
public void setClassifyNameList(List<String> classifyNameList){ public void setClassifyNameList(List<String> classifyNameList){
this.classifyNameList = classifyNameList; this.classifyNameList = classifyNameList;
} }
/**
* 获取 分类名称
* @return classifyNameNotList
*/
public List<String> getClassifyNameNotList(){
return this.classifyNameNotList;
}
/**
* 设置 分类名称
* @param classifyNameNotList
*/
public void setClassifyNameNotList(List<String> classifyNameNotList){
this.classifyNameNotList = classifyNameNotList;
}
/** /**
* 获取 开始 排序号 * 获取 开始 排序号
* @return sortStart * @return sortStart
...@@ -259,6 +331,23 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity { ...@@ -259,6 +331,23 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity {
this.sortList = sortList; this.sortList = sortList;
} }
/**
* 获取 排序号
* @return sortNotList
*/
public List<Integer> getSortNotList(){
return this.sortNotList;
}
/**
* 设置 排序号
* @param sortNotList
*/
public void setSortNotList(List<Integer> sortNotList){
this.sortNotList = sortNotList;
}
/** /**
* 获取 开始 打印次数 * 获取 开始 打印次数
* @return totalStart * @return totalStart
...@@ -323,6 +412,23 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity { ...@@ -323,6 +412,23 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity {
this.totalList = totalList; this.totalList = totalList;
} }
/**
* 获取 打印次数
* @return totalNotList
*/
public List<Integer> getTotalNotList(){
return this.totalNotList;
}
/**
* 设置 打印次数
* @param totalNotList
*/
public void setTotalNotList(List<Integer> totalNotList){
this.totalNotList = totalNotList;
}
/** /**
* 获取 开始 是否首页展示0：否1是 * 获取 开始 是否首页展示0：否1是
* @return showFrontStart * @return showFrontStart
...@@ -387,6 +493,23 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity { ...@@ -387,6 +493,23 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity {
this.showFrontList = showFrontList; this.showFrontList = showFrontList;
} }
/**
* 获取 是否首页展示0：否1是
* @return showFrontNotList
*/
public List<Integer> getShowFrontNotList(){
return this.showFrontNotList;
}
/**
* 设置 是否首页展示0：否1是
* @param showFrontNotList
*/
public void setShowFrontNotList(List<Integer> showFrontNotList){
this.showFrontNotList = showFrontNotList;
}
/** /**
* 获取 开始 证照类型，1：普通，2：正副本 * 获取 开始 证照类型，1：普通，2：正副本
* @return classifyTypeStart * @return classifyTypeStart
...@@ -451,6 +574,23 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity { ...@@ -451,6 +574,23 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity {
this.classifyTypeList = classifyTypeList; this.classifyTypeList = classifyTypeList;
} }
/**
* 获取 证照类型，1：普通，2：正副本
* @return classifyTypeNotList
*/
public List<Integer> getClassifyTypeNotList(){
return this.classifyTypeNotList;
}
/**
* 设置 证照类型，1：普通，2：正副本
* @param classifyTypeNotList
*/
public void setClassifyTypeNotList(List<Integer> classifyTypeNotList){
this.classifyTypeNotList = classifyTypeNotList;
}
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @return createUserIdStart * @return createUserIdStart
...@@ -515,6 +655,23 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity { ...@@ -515,6 +655,23 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity {
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
} }
/**
* 获取 创建用户
* @return createUserIdNotList
*/
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
...@@ -611,6 +768,23 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity { ...@@ -611,6 +768,23 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity {
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
} }
/**
* 获取 更新用户
* @return updateUserIdNotList
*/
public List<Long> getUpdateUserIdNotList(){
return this.updateUserIdNotList;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
}
/** /**
* 获取 开始 更新时间 * 获取 开始 更新时间
* @return updateTimeStart * @return updateTimeStart
...@@ -643,6 +817,87 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity { ...@@ -643,6 +817,87 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 开始 站点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;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -688,6 +943,15 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity { ...@@ -688,6 +943,15 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity {
return this; return this;
} }
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public CertificateClassifyQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/** /**
* 设置 分类名称 * 设置 分类名称
...@@ -752,6 +1016,15 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity { ...@@ -752,6 +1016,15 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity {
return this; return this;
} }
/**
* 设置 排序号
* @param sortNotList
*/
public CertificateClassifyQuery sortNotList(List<Integer> sortNotList){
this.sortNotList = sortNotList;
return this;
}
/** /**
* 设置 打印次数 * 设置 打印次数
* @param total * @param total
...@@ -797,6 +1070,15 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity { ...@@ -797,6 +1070,15 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity {
return this; return this;
} }
/**
* 设置 打印次数
* @param totalNotList
*/
public CertificateClassifyQuery totalNotList(List<Integer> totalNotList){
this.totalNotList = totalNotList;
return this;
}
/** /**
* 设置 是否首页展示0：否1是 * 设置 是否首页展示0：否1是
* @param showFront * @param showFront
...@@ -842,6 +1124,15 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity { ...@@ -842,6 +1124,15 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity {
return this; return this;
} }
/**
* 设置 是否首页展示0：否1是
* @param showFrontNotList
*/
public CertificateClassifyQuery showFrontNotList(List<Integer> showFrontNotList){
this.showFrontNotList = showFrontNotList;
return this;
}
/** /**
* 设置 证照类型，1：普通，2：正副本 * 设置 证照类型，1：普通，2：正副本
* @param classifyType * @param classifyType
...@@ -887,6 +1178,15 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity { ...@@ -887,6 +1178,15 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity {
return this; return this;
} }
/**
* 设置 证照类型，1：普通，2：正副本
* @param classifyTypeNotList
*/
public CertificateClassifyQuery classifyTypeNotList(List<Integer> classifyTypeNotList){
this.classifyTypeNotList = classifyTypeNotList;
return this;
}
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserId * @param createUserId
...@@ -932,6 +1232,15 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity { ...@@ -932,6 +1232,15 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity {
return this; return this;
} }
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public CertificateClassifyQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/** /**
* 设置 更新用户 * 设置 更新用户
...@@ -978,6 +1287,69 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity { ...@@ -978,6 +1287,69 @@ public class CertificateClassifyQuery extends CertificateClassifyEntity {
return this; return this;
} }
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public CertificateClassifyQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
return this;
}
/**
* 设置 站点id
* @param siteId
*/
public CertificateClassifyQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public CertificateClassifyQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public CertificateClassifyQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public CertificateClassifyQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点id
* @param siteIdList
*/
public CertificateClassifyQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public CertificateClassifyQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
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)
......
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateIndustryEntity.java
View file @ 4018c60f
...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel; ...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.certificate.model.vo.CertificateIndustryVo; import com.mortals.xhx.module.certificate.model.vo.CertificateIndustryVo;
/** /**
* 行业目录实体对象 * 行业目录实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-04 * @date 2023-05-14
*/ */
public class CertificateIndustryEntity extends CertificateIndustryVo { public class CertificateIndustryEntity extends CertificateIndustryVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -24,6 +24,10 @@ public class CertificateIndustryEntity extends CertificateIndustryVo { ...@@ -24,6 +24,10 @@ public class CertificateIndustryEntity extends CertificateIndustryVo {
* 行业名称 * 行业名称
*/ */
private String industryName; private String industryName;
/**
* 站点id
*/
private Long siteId;
...@@ -56,6 +60,20 @@ public class CertificateIndustryEntity extends CertificateIndustryVo { ...@@ -56,6 +60,20 @@ public class CertificateIndustryEntity extends CertificateIndustryVo {
public void setIndustryName(String industryName){ public void setIndustryName(String industryName){
this.industryName = industryName; this.industryName = industryName;
} }
/**
* 获取 站点id
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点id
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
...@@ -80,6 +98,7 @@ public class CertificateIndustryEntity extends CertificateIndustryVo { ...@@ -80,6 +98,7 @@ public class CertificateIndustryEntity extends CertificateIndustryVo {
StringBuilder sb = new StringBuilder(""); StringBuilder sb = new StringBuilder("");
sb.append(",parentId:").append(getParentId()); sb.append(",parentId:").append(getParentId());
sb.append(",industryName:").append(getIndustryName()); sb.append(",industryName:").append(getIndustryName());
sb.append(",siteId:").append(getSiteId());
return sb.toString(); return sb.toString();
} }
...@@ -88,5 +107,7 @@ public class CertificateIndustryEntity extends CertificateIndustryVo { ...@@ -88,5 +107,7 @@ public class CertificateIndustryEntity extends CertificateIndustryVo {
this.parentId = null; this.parentId = null;
this.industryName = ""; this.industryName = "";
this.siteId = null;
} }
} }
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateIndustryQuery.java
View file @ 4018c60f
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.certificate.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.certificate.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.certificate.model.CertificateIndustryEntity; import com.mortals.xhx.module.certificate.model.CertificateIndustryEntity;
/** /**
* 行业目录查询对象 * 行业目录查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-04 * @date 2023-05-14
*/ */
public class CertificateIndustryQuery extends CertificateIndustryEntity { public class CertificateIndustryQuery extends CertificateIndustryEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -21,6 +21,9 @@ public class CertificateIndustryQuery extends CertificateIndustryEntity { ...@@ -21,6 +21,9 @@ public class CertificateIndustryQuery extends CertificateIndustryEntity {
/** 序号，主键，自增长列表 */ /** 序号，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 父级id */ /** 开始 父级id */
private Long parentIdStart; private Long parentIdStart;
...@@ -33,9 +36,14 @@ public class CertificateIndustryQuery extends CertificateIndustryEntity { ...@@ -33,9 +36,14 @@ public class CertificateIndustryQuery extends CertificateIndustryEntity {
/** 父级id列表 */ /** 父级id列表 */
private List <Long> parentIdList; private List <Long> parentIdList;
/** 父级id排除列表 */
private List <Long> parentIdNotList;
/** 行业名称 */ /** 行业名称 */
private List<String> industryNameList; private List<String> industryNameList;
/** 行业名称排除列表 */
private List <String> industryNameNotList;
/** 开始 创建用户 */ /** 开始 创建用户 */
private Long createUserIdStart; private Long createUserIdStart;
...@@ -48,6 +56,9 @@ public class CertificateIndustryQuery extends CertificateIndustryEntity { ...@@ -48,6 +56,9 @@ public class CertificateIndustryQuery extends CertificateIndustryEntity {
/** 创建用户列表 */ /** 创建用户列表 */
private List <Long> createUserIdList; private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -66,12 +77,30 @@ public class CertificateIndustryQuery extends CertificateIndustryEntity { ...@@ -66,12 +77,30 @@ public class CertificateIndustryQuery extends CertificateIndustryEntity {
/** 更新用户列表 */ /** 更新用户列表 */
private List <Long> updateUserIdList; private List <Long> updateUserIdList;
/** 更新用户排除列表 */
private List <Long> updateUserIdNotList;
/** 开始 更新时间 */ /** 开始 更新时间 */
private String updateTimeStart; private String updateTimeStart;
/** 结束 更新时间 */ /** 结束 更新时间 */
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;
/** 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<CertificateIndustryQuery> orConditionList; private List<CertificateIndustryQuery> orConditionList;
...@@ -144,6 +173,23 @@ public class CertificateIndustryQuery extends CertificateIndustryEntity { ...@@ -144,6 +173,23 @@ public class CertificateIndustryQuery extends CertificateIndustryEntity {
this.idList = idList; this.idList = idList;
} }
/**
* 获取 序号，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/** /**
* 获取 开始 父级id * 获取 开始 父级id
* @return parentIdStart * @return parentIdStart
...@@ -208,6 +254,23 @@ public class CertificateIndustryQuery extends CertificateIndustryEntity { ...@@ -208,6 +254,23 @@ public class CertificateIndustryQuery extends CertificateIndustryEntity {
this.parentIdList = parentIdList; this.parentIdList = parentIdList;
} }
/**
* 获取 父级id
* @return parentIdNotList
*/
public List<Long> getParentIdNotList(){
return this.parentIdNotList;
}
/**
* 设置 父级id
* @param parentIdNotList
*/
public void setParentIdNotList(List<Long> parentIdNotList){
this.parentIdNotList = parentIdNotList;
}
/** /**
* 获取 行业名称 * 获取 行业名称
* @return industryNameList * @return industryNameList
...@@ -223,6 +286,23 @@ public class CertificateIndustryQuery extends CertificateIndustryEntity { ...@@ -223,6 +286,23 @@ public class CertificateIndustryQuery extends CertificateIndustryEntity {
public void setIndustryNameList(List<String> industryNameList){ public void setIndustryNameList(List<String> industryNameList){
this.industryNameList = industryNameList; this.industryNameList = industryNameList;
} }
/**
* 获取 行业名称
* @return industryNameNotList
*/
public List<String> getIndustryNameNotList(){
return this.industryNameNotList;
}
/**
* 设置 行业名称
* @param industryNameNotList
*/
public void setIndustryNameNotList(List<String> industryNameNotList){
this.industryNameNotList = industryNameNotList;
}
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @return createUserIdStart * @return createUserIdStart
...@@ -287,6 +367,23 @@ public class CertificateIndustryQuery extends CertificateIndustryEntity { ...@@ -287,6 +367,23 @@ public class CertificateIndustryQuery extends CertificateIndustryEntity {
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
} }
/**
* 获取 创建用户
* @return createUserIdNotList
*/
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
...@@ -383,6 +480,23 @@ public class CertificateIndustryQuery extends CertificateIndustryEntity { ...@@ -383,6 +480,23 @@ public class CertificateIndustryQuery extends CertificateIndustryEntity {
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
} }
/**
* 获取 更新用户
* @return updateUserIdNotList
*/
public List<Long> getUpdateUserIdNotList(){
return this.updateUserIdNotList;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
}
/** /**
* 获取 开始 更新时间 * 获取 开始 更新时间
* @return updateTimeStart * @return updateTimeStart
...@@ -415,6 +529,87 @@ public class CertificateIndustryQuery extends CertificateIndustryEntity { ...@@ -415,6 +529,87 @@ public class CertificateIndustryQuery extends CertificateIndustryEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 开始 站点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;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -460,6 +655,15 @@ public class CertificateIndustryQuery extends CertificateIndustryEntity { ...@@ -460,6 +655,15 @@ public class CertificateIndustryQuery extends CertificateIndustryEntity {
return this; return this;
} }
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public CertificateIndustryQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/** /**
* 设置 父级id * 设置 父级id
* @param parentId * @param parentId
...@@ -505,6 +709,15 @@ public class CertificateIndustryQuery extends CertificateIndustryEntity { ...@@ -505,6 +709,15 @@ public class CertificateIndustryQuery extends CertificateIndustryEntity {
return this; return this;
} }
/**
* 设置 父级id
* @param parentIdNotList
*/
public CertificateIndustryQuery parentIdNotList(List<Long> parentIdNotList){
this.parentIdNotList = parentIdNotList;
return this;
}
/** /**
* 设置 行业名称 * 设置 行业名称
...@@ -569,6 +782,15 @@ public class CertificateIndustryQuery extends CertificateIndustryEntity { ...@@ -569,6 +782,15 @@ public class CertificateIndustryQuery extends CertificateIndustryEntity {
return this; return this;
} }
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public CertificateIndustryQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/** /**
* 设置 更新用户 * 设置 更新用户
...@@ -615,6 +837,69 @@ public class CertificateIndustryQuery extends CertificateIndustryEntity { ...@@ -615,6 +837,69 @@ public class CertificateIndustryQuery extends CertificateIndustryEntity {
return this; return this;
} }
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public CertificateIndustryQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
return this;
}
/**
* 设置 站点id
* @param siteId
*/
public CertificateIndustryQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public CertificateIndustryQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public CertificateIndustryQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public CertificateIndustryQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点id
* @param siteIdList
*/
public CertificateIndustryQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public CertificateIndustryQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
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)
......
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/DeviceClassifyEntity.java
View file @ 4018c60f
...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel; ...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.certificate.model.vo.DeviceClassifyVo; import com.mortals.xhx.module.certificate.model.vo.DeviceClassifyVo;
/** /**
* 证照分类设备配置实体对象 * 证照分类设备配置实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-09 * @date 2023-05-14
*/ */
public class DeviceClassifyEntity extends DeviceClassifyVo { public class DeviceClassifyEntity extends DeviceClassifyVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -28,6 +28,10 @@ public class DeviceClassifyEntity extends DeviceClassifyVo { ...@@ -28,6 +28,10 @@ public class DeviceClassifyEntity extends DeviceClassifyVo {
* 设备允许显示的分类 * 设备允许显示的分类
*/ */
private String classifyIds; private String classifyIds;
/**
* 站点id
*/
private Long siteId;
...@@ -74,6 +78,20 @@ public class DeviceClassifyEntity extends DeviceClassifyVo { ...@@ -74,6 +78,20 @@ public class DeviceClassifyEntity extends DeviceClassifyVo {
public void setClassifyIds(String classifyIds){ public void setClassifyIds(String classifyIds){
this.classifyIds = classifyIds; this.classifyIds = classifyIds;
} }
/**
* 获取 站点id
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点id
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
...@@ -99,6 +117,7 @@ public class DeviceClassifyEntity extends DeviceClassifyVo { ...@@ -99,6 +117,7 @@ public class DeviceClassifyEntity extends DeviceClassifyVo {
sb.append(",deviceCode:").append(getDeviceCode()); sb.append(",deviceCode:").append(getDeviceCode());
sb.append(",deviceName:").append(getDeviceName()); sb.append(",deviceName:").append(getDeviceName());
sb.append(",classifyIds:").append(getClassifyIds()); sb.append(",classifyIds:").append(getClassifyIds());
sb.append(",siteId:").append(getSiteId());
return sb.toString(); return sb.toString();
} }
...@@ -109,5 +128,7 @@ public class DeviceClassifyEntity extends DeviceClassifyVo { ...@@ -109,5 +128,7 @@ public class DeviceClassifyEntity extends DeviceClassifyVo {
this.deviceName = ""; this.deviceName = "";
this.classifyIds = ""; this.classifyIds = "";
this.siteId = null;
} }
} }
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/DeviceClassifyQuery.java
View file @ 4018c60f
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.certificate.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.certificate.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.certificate.model.DeviceClassifyEntity; import com.mortals.xhx.module.certificate.model.DeviceClassifyEntity;
/** /**
* 证照分类设备配置查询对象 * 证照分类设备配置查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-09 * @date 2023-05-14
*/ */
public class DeviceClassifyQuery extends DeviceClassifyEntity { public class DeviceClassifyQuery extends DeviceClassifyEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -81,6 +81,21 @@ public class DeviceClassifyQuery extends DeviceClassifyEntity { ...@@ -81,6 +81,21 @@ public class DeviceClassifyQuery extends DeviceClassifyEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
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;
/** 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<DeviceClassifyQuery> orConditionList; private List<DeviceClassifyQuery> orConditionList;
...@@ -492,6 +507,87 @@ public class DeviceClassifyQuery extends DeviceClassifyEntity { ...@@ -492,6 +507,87 @@ public class DeviceClassifyQuery extends DeviceClassifyEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 开始 站点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;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -713,6 +809,60 @@ public class DeviceClassifyQuery extends DeviceClassifyEntity { ...@@ -713,6 +809,60 @@ public class DeviceClassifyQuery extends DeviceClassifyEntity {
} }
/**
* 设置 站点id
* @param siteId
*/
public DeviceClassifyQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public DeviceClassifyQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public DeviceClassifyQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public DeviceClassifyQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点id
* @param siteIdList
*/
public DeviceClassifyQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public DeviceClassifyQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
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/certificate/pdu/PrintListPdu.java
View file @ 4018c60f
...@@ -11,4 +11,6 @@ public class PrintListPdu { ...@@ -11,4 +11,6 @@ public class PrintListPdu {
/** 打印服务ID */ /** 打印服务ID */
private Long serviceId; private Long serviceId;
private Long siteId;
} }
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/pdu/PrintSettingPdu.java
View file @ 4018c60f
...@@ -12,4 +12,6 @@ public class PrintSettingPdu { ...@@ -12,4 +12,6 @@ public class PrintSettingPdu {
private List<Long> hideList; private List<Long> hideList;
/** 允许打印最高次数 */ /** 允许打印最高次数 */
private Integer printMax; private Integer printMax;
private Long siteId;
} }
certificate-manager/src/main/java/com/mortals/xhx/module/certificate/web/CertificatePrintController.java
View file @ 4018c60f
...@@ -54,7 +54,7 @@ public class CertificatePrintController extends BaseJsonBodyController { ...@@ -54,7 +54,7 @@ public class CertificatePrintController extends BaseJsonBodyController {
private DeviceClassifyService deviceClassifyService; private DeviceClassifyService deviceClassifyService;
@PostMapping({"setting/info"}) @PostMapping({"setting/info"})
public Rest<Object> list() { public Rest<Object> list(@RequestBody PrintSettingPdu settingPdu) {
IUser user = this.getCurUser(); IUser user = this.getCurUser();
if(user==null){ if(user==null){
throw new AppException("用户未登录"); throw new AppException("用户未登录");
...@@ -67,6 +67,7 @@ public class CertificatePrintController extends BaseJsonBodyController { ...@@ -67,6 +67,7 @@ public class CertificatePrintController extends BaseJsonBodyController {
try { try {
CertificateClassifyEntity query = new CertificateClassifyEntity(); CertificateClassifyEntity query = new CertificateClassifyEntity();
query.setShowFront(YesNoEnum.YES.getValue()); query.setShowFront(YesNoEnum.YES.getValue());
query.setSiteId(settingPdu.getSiteId());
List<CertificateClassifyEntity> showList = certificateClassifyService.find(query); List<CertificateClassifyEntity> showList = certificateClassifyService.find(query);
query.setShowFront(YesNoEnum.NO.getValue()); query.setShowFront(YesNoEnum.NO.getValue());
List<CertificateClassifyEntity> hideList = certificateClassifyService.find(query); List<CertificateClassifyEntity> hideList = certificateClassifyService.find(query);
...@@ -156,8 +157,10 @@ public class CertificatePrintController extends BaseJsonBodyController { ...@@ -156,8 +157,10 @@ public class CertificatePrintController extends BaseJsonBodyController {
PrintWaitQueueQuery query = new PrintWaitQueueQuery(); PrintWaitQueueQuery query = new PrintWaitQueueQuery();
query.setPrintStatus(YesNoEnum.NO.getValue()); query.setPrintStatus(YesNoEnum.NO.getValue());
query.setPickerIDCardNo(pdu.getIdCard()); query.setPickerIDCardNo(pdu.getIdCard());
query.setSiteId(pdu.getSiteId());
CertificateCatalogEntity catalogEntity = new CertificateCatalogEntity(); CertificateCatalogEntity catalogEntity = new CertificateCatalogEntity();
catalogEntity.setClassifyId(pdu.getClassifyId()); catalogEntity.setClassifyId(pdu.getClassifyId());
catalogEntity.setSiteId(pdu.getSiteId());
List<CertificateCatalogEntity> clist = certificateCatalogService.find(catalogEntity); List<CertificateCatalogEntity> clist = certificateCatalogService.find(catalogEntity);
List<Long> cIdList = new ArrayList<>(); List<Long> cIdList = new ArrayList<>();
if(CollectionUtils.isNotEmpty(clist)){ if(CollectionUtils.isNotEmpty(clist)){
...@@ -194,6 +197,7 @@ public class CertificatePrintController extends BaseJsonBodyController { ...@@ -194,6 +197,7 @@ public class CertificatePrintController extends BaseJsonBodyController {
try { try {
CertificateClassifyQuery query = new CertificateClassifyQuery(); CertificateClassifyQuery query = new CertificateClassifyQuery();
query.setShowFront(YesNoEnum.YES.getValue()); query.setShowFront(YesNoEnum.YES.getValue());
query.setSiteId(deviceClassifyEntity.getSiteId());
if(deviceClassifyEntity!=null && StringUtils.isNotEmpty(deviceClassifyEntity.getDeviceCode())){ if(deviceClassifyEntity!=null && StringUtils.isNotEmpty(deviceClassifyEntity.getDeviceCode())){
List<Long> classifyIdList = deviceClassifyService.getClassifyByDevice(deviceClassifyEntity.getDeviceCode()); List<Long> classifyIdList = deviceClassifyService.getClassifyByDevice(deviceClassifyEntity.getDeviceCode());
if(CollectionUtils.isNotEmpty(classifyIdList)){ if(CollectionUtils.isNotEmpty(classifyIdList)){
......
certificate-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceEntity.java
View file @ 4018c60f
...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel; ...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.device.model.vo.DeviceVo; import com.mortals.xhx.module.device.model.vo.DeviceVo;
/** /**
* 证照柜设备实体对象 * 证照柜设备实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-04 * @date 2023-05-14
*/ */
public class DeviceEntity extends DeviceVo { public class DeviceEntity extends DeviceVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -88,6 +88,10 @@ public class DeviceEntity extends DeviceVo { ...@@ -88,6 +88,10 @@ public class DeviceEntity extends DeviceVo {
* 启停状态，0：停用,1：启用 * 启停状态，0：停用,1：启用
*/ */
private Integer enabled; private Integer enabled;
/**
* 站点id
*/
private Long siteId;
...@@ -344,6 +348,20 @@ public class DeviceEntity extends DeviceVo { ...@@ -344,6 +348,20 @@ public class DeviceEntity extends DeviceVo {
public void setEnabled(Integer enabled){ public void setEnabled(Integer enabled){
this.enabled = enabled; this.enabled = enabled;
} }
/**
* 获取 站点id
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点id
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
...@@ -384,6 +402,7 @@ public class DeviceEntity extends DeviceVo { ...@@ -384,6 +402,7 @@ public class DeviceEntity extends DeviceVo {
sb.append(",remark:").append(getRemark()); sb.append(",remark:").append(getRemark());
sb.append(",status:").append(getStatus()); sb.append(",status:").append(getStatus());
sb.append(",enabled:").append(getEnabled()); sb.append(",enabled:").append(getEnabled());
sb.append(",siteId:").append(getSiteId());
return sb.toString(); return sb.toString();
} }
...@@ -424,5 +443,7 @@ public class DeviceEntity extends DeviceVo { ...@@ -424,5 +443,7 @@ public class DeviceEntity extends DeviceVo {
this.status = 0; this.status = 0;
this.enabled = 0; this.enabled = 0;
this.siteId = null;
} }
} }
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceModuleEntity.java
View file @ 4018c60f
...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel; ...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.device.model.vo.DeviceModuleVo; import com.mortals.xhx.module.device.model.vo.DeviceModuleVo;
/** /**
* 证照柜设备实体对象 * 证照柜设备实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-04 * @date 2023-05-14
*/ */
public class DeviceModuleEntity extends DeviceModuleVo { public class DeviceModuleEntity extends DeviceModuleVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -40,6 +40,10 @@ public class DeviceModuleEntity extends DeviceModuleVo { ...@@ -40,6 +40,10 @@ public class DeviceModuleEntity extends DeviceModuleVo {
* 纸盒 * 纸盒
*/ */
private String cartonType; private String cartonType;
/**
* 站点id
*/
private Long siteId;
...@@ -128,6 +132,20 @@ public class DeviceModuleEntity extends DeviceModuleVo { ...@@ -128,6 +132,20 @@ public class DeviceModuleEntity extends DeviceModuleVo {
public void setCartonType(String cartonType){ public void setCartonType(String cartonType){
this.cartonType = cartonType; this.cartonType = cartonType;
} }
/**
* 获取 站点id
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点id
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
...@@ -156,6 +174,7 @@ public class DeviceModuleEntity extends DeviceModuleVo { ...@@ -156,6 +174,7 @@ public class DeviceModuleEntity extends DeviceModuleVo {
sb.append(",productName:").append(getProductName()); sb.append(",productName:").append(getProductName());
sb.append(",networkAddress:").append(getNetworkAddress()); sb.append(",networkAddress:").append(getNetworkAddress());
sb.append(",cartonType:").append(getCartonType()); sb.append(",cartonType:").append(getCartonType());
sb.append(",siteId:").append(getSiteId());
return sb.toString(); return sb.toString();
} }
...@@ -172,5 +191,7 @@ public class DeviceModuleEntity extends DeviceModuleVo { ...@@ -172,5 +191,7 @@ public class DeviceModuleEntity extends DeviceModuleVo {
this.networkAddress = ""; this.networkAddress = "";
this.cartonType = ""; this.cartonType = "";
this.siteId = null;
} }
} }
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceModuleQuery.java
View file @ 4018c60f
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.device.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.device.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.device.model.DeviceModuleEntity; import com.mortals.xhx.module.device.model.DeviceModuleEntity;
/** /**
* 证照柜设备查询对象 * 证照柜设备查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-04 * @date 2023-05-14
*/ */
public class DeviceModuleQuery extends DeviceModuleEntity { public class DeviceModuleQuery extends DeviceModuleEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -21,6 +21,9 @@ public class DeviceModuleQuery extends DeviceModuleEntity { ...@@ -21,6 +21,9 @@ public class DeviceModuleQuery extends DeviceModuleEntity {
/** 序号，主键，自增长列表 */ /** 序号，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 设备Id */ /** 开始 设备Id */
private Long deviceIdStart; private Long deviceIdStart;
...@@ -33,21 +36,34 @@ public class DeviceModuleQuery extends DeviceModuleEntity { ...@@ -33,21 +36,34 @@ public class DeviceModuleQuery extends DeviceModuleEntity {
/** 设备Id列表 */ /** 设备Id列表 */
private List <Long> deviceIdList; private List <Long> deviceIdList;
/** 设备Id排除列表 */
private List <Long> deviceIdNotList;
/** 设备名称 */ /** 设备名称 */
private List<String> deviceNameList; private List<String> deviceNameList;
/** 设备名称排除列表 */
private List <String> deviceNameNotList;
/** 模块名称 */ /** 模块名称 */
private List<String> moduleNameList; private List<String> moduleNameList;
/** 模块名称排除列表 */
private List <String> moduleNameNotList;
/** 产品名称 */ /** 产品名称 */
private List<String> productNameList; private List<String> productNameList;
/** 产品名称排除列表 */
private List <String> productNameNotList;
/** 网络地址 */ /** 网络地址 */
private List<String> networkAddressList; private List<String> networkAddressList;
/** 网络地址排除列表 */
private List <String> networkAddressNotList;
/** 纸盒 */ /** 纸盒 */
private List<String> cartonTypeList; private List<String> cartonTypeList;
/** 纸盒排除列表 */
private List <String> cartonTypeNotList;
/** 开始 创建用户 */ /** 开始 创建用户 */
private Long createUserIdStart; private Long createUserIdStart;
...@@ -60,6 +76,9 @@ public class DeviceModuleQuery extends DeviceModuleEntity { ...@@ -60,6 +76,9 @@ public class DeviceModuleQuery extends DeviceModuleEntity {
/** 创建用户列表 */ /** 创建用户列表 */
private List <Long> createUserIdList; private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -78,12 +97,30 @@ public class DeviceModuleQuery extends DeviceModuleEntity { ...@@ -78,12 +97,30 @@ public class DeviceModuleQuery extends DeviceModuleEntity {
/** 更新用户列表 */ /** 更新用户列表 */
private List <Long> updateUserIdList; private List <Long> updateUserIdList;
/** 更新用户排除列表 */
private List <Long> updateUserIdNotList;
/** 开始 更新时间 */ /** 开始 更新时间 */
private String updateTimeStart; private String updateTimeStart;
/** 结束 更新时间 */ /** 结束 更新时间 */
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;
/** 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<DeviceModuleQuery> orConditionList; private List<DeviceModuleQuery> orConditionList;
...@@ -156,6 +193,23 @@ public class DeviceModuleQuery extends DeviceModuleEntity { ...@@ -156,6 +193,23 @@ public class DeviceModuleQuery extends DeviceModuleEntity {
this.idList = idList; this.idList = idList;
} }
/**
* 获取 序号，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/** /**
* 获取 开始 设备Id * 获取 开始 设备Id
* @return deviceIdStart * @return deviceIdStart
...@@ -220,6 +274,23 @@ public class DeviceModuleQuery extends DeviceModuleEntity { ...@@ -220,6 +274,23 @@ public class DeviceModuleQuery extends DeviceModuleEntity {
this.deviceIdList = deviceIdList; this.deviceIdList = deviceIdList;
} }
/**
* 获取 设备Id
* @return deviceIdNotList
*/
public List<Long> getDeviceIdNotList(){
return this.deviceIdNotList;
}
/**
* 设置 设备Id
* @param deviceIdNotList
*/
public void setDeviceIdNotList(List<Long> deviceIdNotList){
this.deviceIdNotList = deviceIdNotList;
}
/** /**
* 获取 设备名称 * 获取 设备名称
* @return deviceNameList * @return deviceNameList
...@@ -235,6 +306,23 @@ public class DeviceModuleQuery extends DeviceModuleEntity { ...@@ -235,6 +306,23 @@ public class DeviceModuleQuery extends DeviceModuleEntity {
public void setDeviceNameList(List<String> deviceNameList){ public void setDeviceNameList(List<String> deviceNameList){
this.deviceNameList = deviceNameList; this.deviceNameList = deviceNameList;
} }
/**
* 获取 设备名称
* @return deviceNameNotList
*/
public List<String> getDeviceNameNotList(){
return this.deviceNameNotList;
}
/**
* 设置 设备名称
* @param deviceNameNotList
*/
public void setDeviceNameNotList(List<String> deviceNameNotList){
this.deviceNameNotList = deviceNameNotList;
}
/** /**
* 获取 模块名称 * 获取 模块名称
* @return moduleNameList * @return moduleNameList
...@@ -250,6 +338,23 @@ public class DeviceModuleQuery extends DeviceModuleEntity { ...@@ -250,6 +338,23 @@ public class DeviceModuleQuery extends DeviceModuleEntity {
public void setModuleNameList(List<String> moduleNameList){ public void setModuleNameList(List<String> moduleNameList){
this.moduleNameList = moduleNameList; this.moduleNameList = moduleNameList;
} }
/**
* 获取 模块名称
* @return moduleNameNotList
*/
public List<String> getModuleNameNotList(){
return this.moduleNameNotList;
}
/**
* 设置 模块名称
* @param moduleNameNotList
*/
public void setModuleNameNotList(List<String> moduleNameNotList){
this.moduleNameNotList = moduleNameNotList;
}
/** /**
* 获取 产品名称 * 获取 产品名称
* @return productNameList * @return productNameList
...@@ -265,6 +370,23 @@ public class DeviceModuleQuery extends DeviceModuleEntity { ...@@ -265,6 +370,23 @@ public class DeviceModuleQuery extends DeviceModuleEntity {
public void setProductNameList(List<String> productNameList){ public void setProductNameList(List<String> productNameList){
this.productNameList = productNameList; this.productNameList = productNameList;
} }
/**
* 获取 产品名称
* @return productNameNotList
*/
public List<String> getProductNameNotList(){
return this.productNameNotList;
}
/**
* 设置 产品名称
* @param productNameNotList
*/
public void setProductNameNotList(List<String> productNameNotList){
this.productNameNotList = productNameNotList;
}
/** /**
* 获取 网络地址 * 获取 网络地址
* @return networkAddressList * @return networkAddressList
...@@ -280,6 +402,23 @@ public class DeviceModuleQuery extends DeviceModuleEntity { ...@@ -280,6 +402,23 @@ public class DeviceModuleQuery extends DeviceModuleEntity {
public void setNetworkAddressList(List<String> networkAddressList){ public void setNetworkAddressList(List<String> networkAddressList){
this.networkAddressList = networkAddressList; this.networkAddressList = networkAddressList;
} }
/**
* 获取 网络地址
* @return networkAddressNotList
*/
public List<String> getNetworkAddressNotList(){
return this.networkAddressNotList;
}
/**
* 设置 网络地址
* @param networkAddressNotList
*/
public void setNetworkAddressNotList(List<String> networkAddressNotList){
this.networkAddressNotList = networkAddressNotList;
}
/** /**
* 获取 纸盒 * 获取 纸盒
* @return cartonTypeList * @return cartonTypeList
...@@ -295,6 +434,23 @@ public class DeviceModuleQuery extends DeviceModuleEntity { ...@@ -295,6 +434,23 @@ public class DeviceModuleQuery extends DeviceModuleEntity {
public void setCartonTypeList(List<String> cartonTypeList){ public void setCartonTypeList(List<String> cartonTypeList){
this.cartonTypeList = cartonTypeList; this.cartonTypeList = cartonTypeList;
} }
/**
* 获取 纸盒
* @return cartonTypeNotList
*/
public List<String> getCartonTypeNotList(){
return this.cartonTypeNotList;
}
/**
* 设置 纸盒
* @param cartonTypeNotList
*/
public void setCartonTypeNotList(List<String> cartonTypeNotList){
this.cartonTypeNotList = cartonTypeNotList;
}
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @return createUserIdStart * @return createUserIdStart
...@@ -359,6 +515,23 @@ public class DeviceModuleQuery extends DeviceModuleEntity { ...@@ -359,6 +515,23 @@ public class DeviceModuleQuery extends DeviceModuleEntity {
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
} }
/**
* 获取 创建用户
* @return createUserIdNotList
*/
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
...@@ -455,6 +628,23 @@ public class DeviceModuleQuery extends DeviceModuleEntity { ...@@ -455,6 +628,23 @@ public class DeviceModuleQuery extends DeviceModuleEntity {
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
} }
/**
* 获取 更新用户
* @return updateUserIdNotList
*/
public List<Long> getUpdateUserIdNotList(){
return this.updateUserIdNotList;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
}
/** /**
* 获取 开始 更新时间 * 获取 开始 更新时间
* @return updateTimeStart * @return updateTimeStart
...@@ -487,6 +677,87 @@ public class DeviceModuleQuery extends DeviceModuleEntity { ...@@ -487,6 +677,87 @@ public class DeviceModuleQuery extends DeviceModuleEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 开始 站点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;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -532,6 +803,15 @@ public class DeviceModuleQuery extends DeviceModuleEntity { ...@@ -532,6 +803,15 @@ public class DeviceModuleQuery extends DeviceModuleEntity {
return this; return this;
} }
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public DeviceModuleQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/** /**
* 设置 设备Id * 设置 设备Id
* @param deviceId * @param deviceId
...@@ -577,6 +857,15 @@ public class DeviceModuleQuery extends DeviceModuleEntity { ...@@ -577,6 +857,15 @@ public class DeviceModuleQuery extends DeviceModuleEntity {
return this; return this;
} }
/**
* 设置 设备Id
* @param deviceIdNotList
*/
public DeviceModuleQuery deviceIdNotList(List<Long> deviceIdNotList){
this.deviceIdNotList = deviceIdNotList;
return this;
}
/** /**
* 设置 设备名称 * 设置 设备名称
...@@ -717,6 +1006,15 @@ public class DeviceModuleQuery extends DeviceModuleEntity { ...@@ -717,6 +1006,15 @@ public class DeviceModuleQuery extends DeviceModuleEntity {
return this; return this;
} }
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public DeviceModuleQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/** /**
* 设置 更新用户 * 设置 更新用户
...@@ -763,6 +1061,69 @@ public class DeviceModuleQuery extends DeviceModuleEntity { ...@@ -763,6 +1061,69 @@ public class DeviceModuleQuery extends DeviceModuleEntity {
return this; return this;
} }
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public DeviceModuleQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
return this;
}
/**
* 设置 站点id
* @param siteId
*/
public DeviceModuleQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public DeviceModuleQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public DeviceModuleQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public DeviceModuleQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点id
* @param siteIdList
*/
public DeviceModuleQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public DeviceModuleQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
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)
......
certificate-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceQuery.java
View file @ 4018c60f
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.device.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.device.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.device.model.DeviceEntity; import com.mortals.xhx.module.device.model.DeviceEntity;
/** /**
* 证照柜设备查询对象 * 证照柜设备查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-04 * @date 2023-05-14
*/ */
public class DeviceQuery extends DeviceEntity { public class DeviceQuery extends DeviceEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -21,12 +21,19 @@ public class DeviceQuery extends DeviceEntity { ...@@ -21,12 +21,19 @@ public class DeviceQuery extends DeviceEntity {
/** 序号，主键，自增长列表 */ /** 序号，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 设备名称 */ /** 设备名称 */
private List<String> deviceNameList; private List<String> deviceNameList;
/** 设备名称排除列表 */
private List <String> deviceNameNotList;
/** 设备编码 */ /** 设备编码 */
private List<String> deviceCodeList; private List<String> deviceCodeList;
/** 设备编码排除列表 */
private List <String> deviceCodeNotList;
/** 开始 设备类型1证照柜 */ /** 开始 设备类型1证照柜 */
private Integer deviceTypeStart; private Integer deviceTypeStart;
...@@ -39,33 +46,54 @@ public class DeviceQuery extends DeviceEntity { ...@@ -39,33 +46,54 @@ public class DeviceQuery extends DeviceEntity {
/** 设备类型1证照柜列表 */ /** 设备类型1证照柜列表 */
private List <Integer> deviceTypeList; private List <Integer> deviceTypeList;
/** 设备类型1证照柜排除列表 */
private List <Integer> deviceTypeNotList;
/** Mac地址 */ /** Mac地址 */
private List<String> deviceMacList; private List<String> deviceMacList;
/** Mac地址排除列表 */
private List <String> deviceMacNotList;
/** 设备厂商 */ /** 设备厂商 */
private List<String> deviceFirmnameList; private List<String> deviceFirmnameList;
/** 设备厂商排除列表 */
private List <String> deviceFirmnameNotList;
/** 设备IP地址 */ /** 设备IP地址 */
private List<String> ipList; private List<String> ipList;
/** 设备IP地址排除列表 */
private List <String> ipNotList;
/** 端口号 */ /** 端口号 */
private List<String> portList; private List<String> portList;
/** 端口号排除列表 */
private List <String> portNotList;
/** 设备分辨率 */ /** 设备分辨率 */
private List<String> resolutionList; private List<String> resolutionList;
/** 设备分辨率排除列表 */
private List <String> resolutionNotList;
/** 负责人 */ /** 负责人 */
private List<String> leadingOfficialList; private List<String> leadingOfficialList;
/** 负责人排除列表 */
private List <String> leadingOfficialNotList;
/** 负责人电话 */ /** 负责人电话 */
private List<String> telephoneList; private List<String> telephoneList;
/** 负责人电话排除列表 */
private List <String> telephoneNotList;
/** 设备经度 */ /** 设备经度 */
private List<String> longitudeList; private List<String> longitudeList;
/** 设备经度排除列表 */
private List <String> longitudeNotList;
/** 设备纬度 */ /** 设备纬度 */
private List<String> latitudeList; private List<String> latitudeList;
/** 设备纬度排除列表 */
private List <String> latitudeNotList;
/** 开始 所在楼宇 */ /** 开始 所在楼宇 */
private Integer buildingStart; private Integer buildingStart;
...@@ -78,6 +106,9 @@ public class DeviceQuery extends DeviceEntity { ...@@ -78,6 +106,9 @@ public class DeviceQuery extends DeviceEntity {
/** 所在楼宇列表 */ /** 所在楼宇列表 */
private List <Integer> buildingList; private List <Integer> buildingList;
/** 所在楼宇排除列表 */
private List <Integer> buildingNotList;
/** 开始 所在楼层 */ /** 开始 所在楼层 */
private Integer floorStart; private Integer floorStart;
...@@ -90,12 +121,19 @@ public class DeviceQuery extends DeviceEntity { ...@@ -90,12 +121,19 @@ public class DeviceQuery extends DeviceEntity {
/** 所在楼层列表 */ /** 所在楼层列表 */
private List <Integer> floorList; private List <Integer> floorList;
/** 所在楼层排除列表 */
private List <Integer> floorNotList;
/** 管理员密码 */ /** 管理员密码 */
private List<String> managePWDList; private List<String> managePWDList;
/** 管理员密码排除列表 */
private List <String> managePWDNotList;
/** 备注 */ /** 备注 */
private List<String> remarkList; private List<String> remarkList;
/** 备注排除列表 */
private List <String> remarkNotList;
/** 开始 设备状态，0：未激活，1：离线:2：在线 */ /** 开始 设备状态，0：未激活，1：离线:2：在线 */
private Integer statusStart; private Integer statusStart;
...@@ -108,6 +146,9 @@ public class DeviceQuery extends DeviceEntity { ...@@ -108,6 +146,9 @@ public class DeviceQuery extends DeviceEntity {
/** 设备状态，0：未激活，1：离线:2：在线列表 */ /** 设备状态，0：未激活，1：离线:2：在线列表 */
private List <Integer> statusList; private List <Integer> statusList;
/** 设备状态，0：未激活，1：离线:2：在线排除列表 */
private List <Integer> statusNotList;
/** 开始 启停状态，0：停用,1：启用 */ /** 开始 启停状态，0：停用,1：启用 */
private Integer enabledStart; private Integer enabledStart;
...@@ -120,6 +161,9 @@ public class DeviceQuery extends DeviceEntity { ...@@ -120,6 +161,9 @@ public class DeviceQuery extends DeviceEntity {
/** 启停状态，0：停用,1：启用列表 */ /** 启停状态，0：停用,1：启用列表 */
private List <Integer> enabledList; private List <Integer> enabledList;
/** 启停状态，0：停用,1：启用排除列表 */
private List <Integer> enabledNotList;
/** 开始 创建用户 */ /** 开始 创建用户 */
private Long createUserIdStart; private Long createUserIdStart;
...@@ -132,6 +176,9 @@ public class DeviceQuery extends DeviceEntity { ...@@ -132,6 +176,9 @@ public class DeviceQuery extends DeviceEntity {
/** 创建用户列表 */ /** 创建用户列表 */
private List <Long> createUserIdList; private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -150,12 +197,30 @@ public class DeviceQuery extends DeviceEntity { ...@@ -150,12 +197,30 @@ public class DeviceQuery extends DeviceEntity {
/** 更新用户列表 */ /** 更新用户列表 */
private List <Long> updateUserIdList; private List <Long> updateUserIdList;
/** 更新用户排除列表 */
private List <Long> updateUserIdNotList;
/** 开始 更新时间 */ /** 开始 更新时间 */
private String updateTimeStart; private String updateTimeStart;
/** 结束 更新时间 */ /** 结束 更新时间 */
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;
/** 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<DeviceQuery> orConditionList; private List<DeviceQuery> orConditionList;
...@@ -228,6 +293,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -228,6 +293,23 @@ public class DeviceQuery extends DeviceEntity {
this.idList = idList; this.idList = idList;
} }
/**
* 获取 序号，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/** /**
* 获取 设备名称 * 获取 设备名称
* @return deviceNameList * @return deviceNameList
...@@ -243,6 +325,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -243,6 +325,23 @@ public class DeviceQuery extends DeviceEntity {
public void setDeviceNameList(List<String> deviceNameList){ public void setDeviceNameList(List<String> deviceNameList){
this.deviceNameList = deviceNameList; this.deviceNameList = deviceNameList;
} }
/**
* 获取 设备名称
* @return deviceNameNotList
*/
public List<String> getDeviceNameNotList(){
return this.deviceNameNotList;
}
/**
* 设置 设备名称
* @param deviceNameNotList
*/
public void setDeviceNameNotList(List<String> deviceNameNotList){
this.deviceNameNotList = deviceNameNotList;
}
/** /**
* 获取 设备编码 * 获取 设备编码
* @return deviceCodeList * @return deviceCodeList
...@@ -258,6 +357,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -258,6 +357,23 @@ public class DeviceQuery extends DeviceEntity {
public void setDeviceCodeList(List<String> deviceCodeList){ public void setDeviceCodeList(List<String> deviceCodeList){
this.deviceCodeList = deviceCodeList; this.deviceCodeList = deviceCodeList;
} }
/**
* 获取 设备编码
* @return deviceCodeNotList
*/
public List<String> getDeviceCodeNotList(){
return this.deviceCodeNotList;
}
/**
* 设置 设备编码
* @param deviceCodeNotList
*/
public void setDeviceCodeNotList(List<String> deviceCodeNotList){
this.deviceCodeNotList = deviceCodeNotList;
}
/** /**
* 获取 开始 设备类型1证照柜 * 获取 开始 设备类型1证照柜
* @return deviceTypeStart * @return deviceTypeStart
...@@ -322,6 +438,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -322,6 +438,23 @@ public class DeviceQuery extends DeviceEntity {
this.deviceTypeList = deviceTypeList; this.deviceTypeList = deviceTypeList;
} }
/**
* 获取 设备类型1证照柜
* @return deviceTypeNotList
*/
public List<Integer> getDeviceTypeNotList(){
return this.deviceTypeNotList;
}
/**
* 设置 设备类型1证照柜
* @param deviceTypeNotList
*/
public void setDeviceTypeNotList(List<Integer> deviceTypeNotList){
this.deviceTypeNotList = deviceTypeNotList;
}
/** /**
* 获取 Mac地址 * 获取 Mac地址
* @return deviceMacList * @return deviceMacList
...@@ -337,6 +470,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -337,6 +470,23 @@ public class DeviceQuery extends DeviceEntity {
public void setDeviceMacList(List<String> deviceMacList){ public void setDeviceMacList(List<String> deviceMacList){
this.deviceMacList = deviceMacList; this.deviceMacList = deviceMacList;
} }
/**
* 获取 Mac地址
* @return deviceMacNotList
*/
public List<String> getDeviceMacNotList(){
return this.deviceMacNotList;
}
/**
* 设置 Mac地址
* @param deviceMacNotList
*/
public void setDeviceMacNotList(List<String> deviceMacNotList){
this.deviceMacNotList = deviceMacNotList;
}
/** /**
* 获取 设备厂商 * 获取 设备厂商
* @return deviceFirmnameList * @return deviceFirmnameList
...@@ -352,6 +502,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -352,6 +502,23 @@ public class DeviceQuery extends DeviceEntity {
public void setDeviceFirmnameList(List<String> deviceFirmnameList){ public void setDeviceFirmnameList(List<String> deviceFirmnameList){
this.deviceFirmnameList = deviceFirmnameList; this.deviceFirmnameList = deviceFirmnameList;
} }
/**
* 获取 设备厂商
* @return deviceFirmnameNotList
*/
public List<String> getDeviceFirmnameNotList(){
return this.deviceFirmnameNotList;
}
/**
* 设置 设备厂商
* @param deviceFirmnameNotList
*/
public void setDeviceFirmnameNotList(List<String> deviceFirmnameNotList){
this.deviceFirmnameNotList = deviceFirmnameNotList;
}
/** /**
* 获取 设备IP地址 * 获取 设备IP地址
* @return ipList * @return ipList
...@@ -367,6 +534,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -367,6 +534,23 @@ public class DeviceQuery extends DeviceEntity {
public void setIpList(List<String> ipList){ public void setIpList(List<String> ipList){
this.ipList = ipList; this.ipList = ipList;
} }
/**
* 获取 设备IP地址
* @return ipNotList
*/
public List<String> getIpNotList(){
return this.ipNotList;
}
/**
* 设置 设备IP地址
* @param ipNotList
*/
public void setIpNotList(List<String> ipNotList){
this.ipNotList = ipNotList;
}
/** /**
* 获取 端口号 * 获取 端口号
* @return portList * @return portList
...@@ -382,6 +566,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -382,6 +566,23 @@ public class DeviceQuery extends DeviceEntity {
public void setPortList(List<String> portList){ public void setPortList(List<String> portList){
this.portList = portList; this.portList = portList;
} }
/**
* 获取 端口号
* @return portNotList
*/
public List<String> getPortNotList(){
return this.portNotList;
}
/**
* 设置 端口号
* @param portNotList
*/
public void setPortNotList(List<String> portNotList){
this.portNotList = portNotList;
}
/** /**
* 获取 设备分辨率 * 获取 设备分辨率
* @return resolutionList * @return resolutionList
...@@ -397,6 +598,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -397,6 +598,23 @@ public class DeviceQuery extends DeviceEntity {
public void setResolutionList(List<String> resolutionList){ public void setResolutionList(List<String> resolutionList){
this.resolutionList = resolutionList; this.resolutionList = resolutionList;
} }
/**
* 获取 设备分辨率
* @return resolutionNotList
*/
public List<String> getResolutionNotList(){
return this.resolutionNotList;
}
/**
* 设置 设备分辨率
* @param resolutionNotList
*/
public void setResolutionNotList(List<String> resolutionNotList){
this.resolutionNotList = resolutionNotList;
}
/** /**
* 获取 负责人 * 获取 负责人
* @return leadingOfficialList * @return leadingOfficialList
...@@ -412,6 +630,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -412,6 +630,23 @@ public class DeviceQuery extends DeviceEntity {
public void setLeadingOfficialList(List<String> leadingOfficialList){ public void setLeadingOfficialList(List<String> leadingOfficialList){
this.leadingOfficialList = leadingOfficialList; this.leadingOfficialList = leadingOfficialList;
} }
/**
* 获取 负责人
* @return leadingOfficialNotList
*/
public List<String> getLeadingOfficialNotList(){
return this.leadingOfficialNotList;
}
/**
* 设置 负责人
* @param leadingOfficialNotList
*/
public void setLeadingOfficialNotList(List<String> leadingOfficialNotList){
this.leadingOfficialNotList = leadingOfficialNotList;
}
/** /**
* 获取 负责人电话 * 获取 负责人电话
* @return telephoneList * @return telephoneList
...@@ -427,6 +662,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -427,6 +662,23 @@ public class DeviceQuery extends DeviceEntity {
public void setTelephoneList(List<String> telephoneList){ public void setTelephoneList(List<String> telephoneList){
this.telephoneList = telephoneList; this.telephoneList = telephoneList;
} }
/**
* 获取 负责人电话
* @return telephoneNotList
*/
public List<String> getTelephoneNotList(){
return this.telephoneNotList;
}
/**
* 设置 负责人电话
* @param telephoneNotList
*/
public void setTelephoneNotList(List<String> telephoneNotList){
this.telephoneNotList = telephoneNotList;
}
/** /**
* 获取 设备经度 * 获取 设备经度
* @return longitudeList * @return longitudeList
...@@ -442,6 +694,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -442,6 +694,23 @@ public class DeviceQuery extends DeviceEntity {
public void setLongitudeList(List<String> longitudeList){ public void setLongitudeList(List<String> longitudeList){
this.longitudeList = longitudeList; this.longitudeList = longitudeList;
} }
/**
* 获取 设备经度
* @return longitudeNotList
*/
public List<String> getLongitudeNotList(){
return this.longitudeNotList;
}
/**
* 设置 设备经度
* @param longitudeNotList
*/
public void setLongitudeNotList(List<String> longitudeNotList){
this.longitudeNotList = longitudeNotList;
}
/** /**
* 获取 设备纬度 * 获取 设备纬度
* @return latitudeList * @return latitudeList
...@@ -457,6 +726,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -457,6 +726,23 @@ public class DeviceQuery extends DeviceEntity {
public void setLatitudeList(List<String> latitudeList){ public void setLatitudeList(List<String> latitudeList){
this.latitudeList = latitudeList; this.latitudeList = latitudeList;
} }
/**
* 获取 设备纬度
* @return latitudeNotList
*/
public List<String> getLatitudeNotList(){
return this.latitudeNotList;
}
/**
* 设置 设备纬度
* @param latitudeNotList
*/
public void setLatitudeNotList(List<String> latitudeNotList){
this.latitudeNotList = latitudeNotList;
}
/** /**
* 获取 开始 所在楼宇 * 获取 开始 所在楼宇
* @return buildingStart * @return buildingStart
...@@ -521,6 +807,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -521,6 +807,23 @@ public class DeviceQuery extends DeviceEntity {
this.buildingList = buildingList; this.buildingList = buildingList;
} }
/**
* 获取 所在楼宇
* @return buildingNotList
*/
public List<Integer> getBuildingNotList(){
return this.buildingNotList;
}
/**
* 设置 所在楼宇
* @param buildingNotList
*/
public void setBuildingNotList(List<Integer> buildingNotList){
this.buildingNotList = buildingNotList;
}
/** /**
* 获取 开始 所在楼层 * 获取 开始 所在楼层
* @return floorStart * @return floorStart
...@@ -585,6 +888,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -585,6 +888,23 @@ public class DeviceQuery extends DeviceEntity {
this.floorList = floorList; this.floorList = floorList;
} }
/**
* 获取 所在楼层
* @return floorNotList
*/
public List<Integer> getFloorNotList(){
return this.floorNotList;
}
/**
* 设置 所在楼层
* @param floorNotList
*/
public void setFloorNotList(List<Integer> floorNotList){
this.floorNotList = floorNotList;
}
/** /**
* 获取 管理员密码 * 获取 管理员密码
* @return managePWDList * @return managePWDList
...@@ -600,6 +920,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -600,6 +920,23 @@ public class DeviceQuery extends DeviceEntity {
public void setManagePWDList(List<String> managePWDList){ public void setManagePWDList(List<String> managePWDList){
this.managePWDList = managePWDList; this.managePWDList = managePWDList;
} }
/**
* 获取 管理员密码
* @return managePWDNotList
*/
public List<String> getManagePWDNotList(){
return this.managePWDNotList;
}
/**
* 设置 管理员密码
* @param managePWDNotList
*/
public void setManagePWDNotList(List<String> managePWDNotList){
this.managePWDNotList = managePWDNotList;
}
/** /**
* 获取 备注 * 获取 备注
* @return remarkList * @return remarkList
...@@ -615,6 +952,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -615,6 +952,23 @@ public class DeviceQuery extends DeviceEntity {
public void setRemarkList(List<String> remarkList){ public void setRemarkList(List<String> remarkList){
this.remarkList = remarkList; this.remarkList = remarkList;
} }
/**
* 获取 备注
* @return remarkNotList
*/
public List<String> getRemarkNotList(){
return this.remarkNotList;
}
/**
* 设置 备注
* @param remarkNotList
*/
public void setRemarkNotList(List<String> remarkNotList){
this.remarkNotList = remarkNotList;
}
/** /**
* 获取 开始 设备状态，0：未激活，1：离线:2：在线 * 获取 开始 设备状态，0：未激活，1：离线:2：在线
* @return statusStart * @return statusStart
...@@ -679,6 +1033,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -679,6 +1033,23 @@ public class DeviceQuery extends DeviceEntity {
this.statusList = statusList; this.statusList = statusList;
} }
/**
* 获取 设备状态，0：未激活，1：离线:2：在线
* @return statusNotList
*/
public List<Integer> getStatusNotList(){
return this.statusNotList;
}
/**
* 设置 设备状态，0：未激活，1：离线:2：在线
* @param statusNotList
*/
public void setStatusNotList(List<Integer> statusNotList){
this.statusNotList = statusNotList;
}
/** /**
* 获取 开始 启停状态，0：停用,1：启用 * 获取 开始 启停状态，0：停用,1：启用
* @return enabledStart * @return enabledStart
...@@ -743,6 +1114,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -743,6 +1114,23 @@ public class DeviceQuery extends DeviceEntity {
this.enabledList = enabledList; this.enabledList = enabledList;
} }
/**
* 获取 启停状态，0：停用,1：启用
* @return enabledNotList
*/
public List<Integer> getEnabledNotList(){
return this.enabledNotList;
}
/**
* 设置 启停状态，0：停用,1：启用
* @param enabledNotList
*/
public void setEnabledNotList(List<Integer> enabledNotList){
this.enabledNotList = enabledNotList;
}
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @return createUserIdStart * @return createUserIdStart
...@@ -807,6 +1195,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -807,6 +1195,23 @@ public class DeviceQuery extends DeviceEntity {
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
} }
/**
* 获取 创建用户
* @return createUserIdNotList
*/
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
...@@ -903,6 +1308,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -903,6 +1308,23 @@ public class DeviceQuery extends DeviceEntity {
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
} }
/**
* 获取 更新用户
* @return updateUserIdNotList
*/
public List<Long> getUpdateUserIdNotList(){
return this.updateUserIdNotList;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
}
/** /**
* 获取 开始 更新时间 * 获取 开始 更新时间
* @return updateTimeStart * @return updateTimeStart
...@@ -935,6 +1357,87 @@ public class DeviceQuery extends DeviceEntity { ...@@ -935,6 +1357,87 @@ public class DeviceQuery extends DeviceEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 开始 站点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;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -980,6 +1483,15 @@ public class DeviceQuery extends DeviceEntity { ...@@ -980,6 +1483,15 @@ public class DeviceQuery extends DeviceEntity {
return this; return this;
} }
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public DeviceQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/** /**
* 设置 设备名称 * 设置 设备名称
...@@ -1063,6 +1575,15 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1063,6 +1575,15 @@ public class DeviceQuery extends DeviceEntity {
return this; return this;
} }
/**
* 设置 设备类型1证照柜
* @param deviceTypeNotList
*/
public DeviceQuery deviceTypeNotList(List<Integer> deviceTypeNotList){
this.deviceTypeNotList = deviceTypeNotList;
return this;
}
/** /**
* 设置 Mac地址 * 设置 Mac地址
...@@ -1279,6 +1800,15 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1279,6 +1800,15 @@ public class DeviceQuery extends DeviceEntity {
return this; return this;
} }
/**
* 设置 所在楼宇
* @param buildingNotList
*/
public DeviceQuery buildingNotList(List<Integer> buildingNotList){
this.buildingNotList = buildingNotList;
return this;
}
/** /**
* 设置 所在楼层 * 设置 所在楼层
* @param floor * @param floor
...@@ -1324,6 +1854,15 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1324,6 +1854,15 @@ public class DeviceQuery extends DeviceEntity {
return this; return this;
} }
/**
* 设置 所在楼层
* @param floorNotList
*/
public DeviceQuery floorNotList(List<Integer> floorNotList){
this.floorNotList = floorNotList;
return this;
}
/** /**
* 设置 管理员密码 * 设置 管理员密码
...@@ -1407,6 +1946,15 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1407,6 +1946,15 @@ public class DeviceQuery extends DeviceEntity {
return this; return this;
} }
/**
* 设置 设备状态，0：未激活，1：离线:2：在线
* @param statusNotList
*/
public DeviceQuery statusNotList(List<Integer> statusNotList){
this.statusNotList = statusNotList;
return this;
}
/** /**
* 设置 启停状态，0：停用,1：启用 * 设置 启停状态，0：停用,1：启用
* @param enabled * @param enabled
...@@ -1452,6 +2000,15 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1452,6 +2000,15 @@ public class DeviceQuery extends DeviceEntity {
return this; return this;
} }
/**
* 设置 启停状态，0：停用,1：启用
* @param enabledNotList
*/
public DeviceQuery enabledNotList(List<Integer> enabledNotList){
this.enabledNotList = enabledNotList;
return this;
}
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserId * @param createUserId
...@@ -1497,6 +2054,15 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1497,6 +2054,15 @@ public class DeviceQuery extends DeviceEntity {
return this; return this;
} }
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public DeviceQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/** /**
* 设置 更新用户 * 设置 更新用户
...@@ -1543,6 +2109,69 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1543,6 +2109,69 @@ public class DeviceQuery extends DeviceEntity {
return this; return this;
} }
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public DeviceQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
return this;
}
/**
* 设置 站点id
* @param siteId
*/
public DeviceQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public DeviceQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public DeviceQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public DeviceQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点id
* @param siteIdList
*/
public DeviceQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public DeviceQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
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)
......
certificate-manager/src/main/java/com/mortals/xhx/module/print/model/PrintCatalogEntity.java
View file @ 4018c60f
...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel; ...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.print.model.vo.PrintCatalogVo; import com.mortals.xhx.module.print.model.vo.PrintCatalogVo;
/** /**
* 证照目录打印配置实体对象 * 证照目录打印配置实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-21 * @date 2023-05-14
*/ */
public class PrintCatalogEntity extends PrintCatalogVo { public class PrintCatalogEntity extends PrintCatalogVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -44,6 +44,10 @@ public class PrintCatalogEntity extends PrintCatalogVo { ...@@ -44,6 +44,10 @@ public class PrintCatalogEntity extends PrintCatalogVo {
* 打印服务配置ID * 打印服务配置ID
*/ */
private Long serviceId; private Long serviceId;
/**
* 站点id
*/
private Long siteId;
...@@ -146,6 +150,20 @@ public class PrintCatalogEntity extends PrintCatalogVo { ...@@ -146,6 +150,20 @@ public class PrintCatalogEntity extends PrintCatalogVo {
public void setServiceId(Long serviceId){ public void setServiceId(Long serviceId){
this.serviceId = serviceId; this.serviceId = serviceId;
} }
/**
* 获取 站点id
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点id
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
...@@ -175,6 +193,7 @@ public class PrintCatalogEntity extends PrintCatalogVo { ...@@ -175,6 +193,7 @@ public class PrintCatalogEntity extends PrintCatalogVo {
sb.append(",printerIp:").append(getPrinterIp()); sb.append(",printerIp:").append(getPrinterIp());
sb.append(",paperSource:").append(getPaperSource()); sb.append(",paperSource:").append(getPaperSource());
sb.append(",serviceId:").append(getServiceId()); sb.append(",serviceId:").append(getServiceId());
sb.append(",siteId:").append(getSiteId());
return sb.toString(); return sb.toString();
} }
...@@ -193,5 +212,7 @@ public class PrintCatalogEntity extends PrintCatalogVo { ...@@ -193,5 +212,7 @@ public class PrintCatalogEntity extends PrintCatalogVo {
this.paperSource = ""; this.paperSource = "";
this.serviceId = null; this.serviceId = null;
this.siteId = null;
} }
} }
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/print/model/PrintCatalogQuery.java
View file @ 4018c60f
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.print.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.print.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.print.model.PrintCatalogEntity; import com.mortals.xhx.module.print.model.PrintCatalogEntity;
/** /**
* 证照目录打印配置查询对象 * 证照目录打印配置查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-21 * @date 2023-05-14
*/ */
public class PrintCatalogQuery extends PrintCatalogEntity { public class PrintCatalogQuery extends PrintCatalogEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -21,6 +21,9 @@ public class PrintCatalogQuery extends PrintCatalogEntity { ...@@ -21,6 +21,9 @@ public class PrintCatalogQuery extends PrintCatalogEntity {
/** 序号，主键，自增长列表 */ /** 序号，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 证照目录ID */ /** 开始 证照目录ID */
private Long catalogIdStart; private Long catalogIdStart;
...@@ -33,21 +36,34 @@ public class PrintCatalogQuery extends PrintCatalogEntity { ...@@ -33,21 +36,34 @@ public class PrintCatalogQuery extends PrintCatalogEntity {
/** 证照目录ID列表 */ /** 证照目录ID列表 */
private List <Long> catalogIdList; private List <Long> catalogIdList;
/** 证照目录ID排除列表 */
private List <Long> catalogIdNotList;
/** 证照目录编号 */ /** 证照目录编号 */
private List<String> catalogCodeList; private List<String> catalogCodeList;
/** 证照目录编号排除列表 */
private List <String> catalogCodeNotList;
/** 目录名称 */ /** 目录名称 */
private List<String> catalogNameList; private List<String> catalogNameList;
/** 目录名称排除列表 */
private List <String> catalogNameNotList;
/** 打印机名称 */ /** 打印机名称 */
private List<String> printerNameList; private List<String> printerNameList;
/** 打印机名称排除列表 */
private List <String> printerNameNotList;
/** 打印机网络地址 */ /** 打印机网络地址 */
private List<String> printerIpList; private List<String> printerIpList;
/** 打印机网络地址排除列表 */
private List <String> printerIpNotList;
/** 打印机纸盒 */ /** 打印机纸盒 */
private List<String> paperSourceList; private List<String> paperSourceList;
/** 打印机纸盒排除列表 */
private List <String> paperSourceNotList;
/** 开始 创建用户 */ /** 开始 创建用户 */
private Long createUserIdStart; private Long createUserIdStart;
...@@ -60,6 +76,9 @@ public class PrintCatalogQuery extends PrintCatalogEntity { ...@@ -60,6 +76,9 @@ public class PrintCatalogQuery extends PrintCatalogEntity {
/** 创建用户列表 */ /** 创建用户列表 */
private List <Long> createUserIdList; private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -78,6 +97,9 @@ public class PrintCatalogQuery extends PrintCatalogEntity { ...@@ -78,6 +97,9 @@ public class PrintCatalogQuery extends PrintCatalogEntity {
/** 更新用户列表 */ /** 更新用户列表 */
private List <Long> updateUserIdList; private List <Long> updateUserIdList;
/** 更新用户排除列表 */
private List <Long> updateUserIdNotList;
/** 开始 更新时间 */ /** 开始 更新时间 */
private String updateTimeStart; private String updateTimeStart;
...@@ -96,6 +118,24 @@ public class PrintCatalogQuery extends PrintCatalogEntity { ...@@ -96,6 +118,24 @@ public class PrintCatalogQuery extends PrintCatalogEntity {
/** 打印服务配置ID列表 */ /** 打印服务配置ID列表 */
private List <Long> serviceIdList; private List <Long> serviceIdList;
/** 打印服务配置ID排除列表 */
private List <Long> serviceIdNotList;
/** 开始 站点id */
private Long siteIdStart;
/** 结束 站点id */
private Long siteIdEnd;
/** 增加 站点id */
private Long siteIdIncrement;
/** 站点id列表 */
private List <Long> siteIdList;
/** 站点id排除列表 */
private List <Long> siteIdNotList;
/** 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<PrintCatalogQuery> orConditionList; private List<PrintCatalogQuery> orConditionList;
...@@ -168,6 +208,23 @@ public class PrintCatalogQuery extends PrintCatalogEntity { ...@@ -168,6 +208,23 @@ public class PrintCatalogQuery extends PrintCatalogEntity {
this.idList = idList; this.idList = idList;
} }
/**
* 获取 序号，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/** /**
* 获取 开始 证照目录ID * 获取 开始 证照目录ID
* @return catalogIdStart * @return catalogIdStart
...@@ -232,6 +289,23 @@ public class PrintCatalogQuery extends PrintCatalogEntity { ...@@ -232,6 +289,23 @@ public class PrintCatalogQuery extends PrintCatalogEntity {
this.catalogIdList = catalogIdList; this.catalogIdList = catalogIdList;
} }
/**
* 获取 证照目录ID
* @return catalogIdNotList
*/
public List<Long> getCatalogIdNotList(){
return this.catalogIdNotList;
}
/**
* 设置 证照目录ID
* @param catalogIdNotList
*/
public void setCatalogIdNotList(List<Long> catalogIdNotList){
this.catalogIdNotList = catalogIdNotList;
}
/** /**
* 获取 证照目录编号 * 获取 证照目录编号
* @return catalogCodeList * @return catalogCodeList
...@@ -247,6 +321,23 @@ public class PrintCatalogQuery extends PrintCatalogEntity { ...@@ -247,6 +321,23 @@ public class PrintCatalogQuery extends PrintCatalogEntity {
public void setCatalogCodeList(List<String> catalogCodeList){ public void setCatalogCodeList(List<String> catalogCodeList){
this.catalogCodeList = catalogCodeList; this.catalogCodeList = catalogCodeList;
} }
/**
* 获取 证照目录编号
* @return catalogCodeNotList
*/
public List<String> getCatalogCodeNotList(){
return this.catalogCodeNotList;
}
/**
* 设置 证照目录编号
* @param catalogCodeNotList
*/
public void setCatalogCodeNotList(List<String> catalogCodeNotList){
this.catalogCodeNotList = catalogCodeNotList;
}
/** /**
* 获取 目录名称 * 获取 目录名称
* @return catalogNameList * @return catalogNameList
...@@ -262,6 +353,23 @@ public class PrintCatalogQuery extends PrintCatalogEntity { ...@@ -262,6 +353,23 @@ public class PrintCatalogQuery extends PrintCatalogEntity {
public void setCatalogNameList(List<String> catalogNameList){ public void setCatalogNameList(List<String> catalogNameList){
this.catalogNameList = catalogNameList; this.catalogNameList = catalogNameList;
} }
/**
* 获取 目录名称
* @return catalogNameNotList
*/
public List<String> getCatalogNameNotList(){
return this.catalogNameNotList;
}
/**
* 设置 目录名称
* @param catalogNameNotList
*/
public void setCatalogNameNotList(List<String> catalogNameNotList){
this.catalogNameNotList = catalogNameNotList;
}
/** /**
* 获取 打印机名称 * 获取 打印机名称
* @return printerNameList * @return printerNameList
...@@ -277,6 +385,23 @@ public class PrintCatalogQuery extends PrintCatalogEntity { ...@@ -277,6 +385,23 @@ public class PrintCatalogQuery extends PrintCatalogEntity {
public void setPrinterNameList(List<String> printerNameList){ public void setPrinterNameList(List<String> printerNameList){
this.printerNameList = printerNameList; this.printerNameList = printerNameList;
} }
/**
* 获取 打印机名称
* @return printerNameNotList
*/
public List<String> getPrinterNameNotList(){
return this.printerNameNotList;
}
/**
* 设置 打印机名称
* @param printerNameNotList
*/
public void setPrinterNameNotList(List<String> printerNameNotList){
this.printerNameNotList = printerNameNotList;
}
/** /**
* 获取 打印机网络地址 * 获取 打印机网络地址
* @return printerIpList * @return printerIpList
...@@ -292,6 +417,23 @@ public class PrintCatalogQuery extends PrintCatalogEntity { ...@@ -292,6 +417,23 @@ public class PrintCatalogQuery extends PrintCatalogEntity {
public void setPrinterIpList(List<String> printerIpList){ public void setPrinterIpList(List<String> printerIpList){
this.printerIpList = printerIpList; this.printerIpList = printerIpList;
} }
/**
* 获取 打印机网络地址
* @return printerIpNotList
*/
public List<String> getPrinterIpNotList(){
return this.printerIpNotList;
}
/**
* 设置 打印机网络地址
* @param printerIpNotList
*/
public void setPrinterIpNotList(List<String> printerIpNotList){
this.printerIpNotList = printerIpNotList;
}
/** /**
* 获取 打印机纸盒 * 获取 打印机纸盒
* @return paperSourceList * @return paperSourceList
...@@ -307,6 +449,23 @@ public class PrintCatalogQuery extends PrintCatalogEntity { ...@@ -307,6 +449,23 @@ public class PrintCatalogQuery extends PrintCatalogEntity {
public void setPaperSourceList(List<String> paperSourceList){ public void setPaperSourceList(List<String> paperSourceList){
this.paperSourceList = paperSourceList; this.paperSourceList = paperSourceList;
} }
/**
* 获取 打印机纸盒
* @return paperSourceNotList
*/
public List<String> getPaperSourceNotList(){
return this.paperSourceNotList;
}
/**
* 设置 打印机纸盒
* @param paperSourceNotList
*/
public void setPaperSourceNotList(List<String> paperSourceNotList){
this.paperSourceNotList = paperSourceNotList;
}
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @return createUserIdStart * @return createUserIdStart
...@@ -371,6 +530,23 @@ public class PrintCatalogQuery extends PrintCatalogEntity { ...@@ -371,6 +530,23 @@ public class PrintCatalogQuery extends PrintCatalogEntity {
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
} }
/**
* 获取 创建用户
* @return createUserIdNotList
*/
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
...@@ -467,6 +643,23 @@ public class PrintCatalogQuery extends PrintCatalogEntity { ...@@ -467,6 +643,23 @@ public class PrintCatalogQuery extends PrintCatalogEntity {
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
} }
/**
* 获取 更新用户
* @return updateUserIdNotList
*/
public List<Long> getUpdateUserIdNotList(){
return this.updateUserIdNotList;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
}
/** /**
* 获取 开始 更新时间 * 获取 开始 更新时间
* @return updateTimeStart * @return updateTimeStart
...@@ -563,6 +756,104 @@ public class PrintCatalogQuery extends PrintCatalogEntity { ...@@ -563,6 +756,104 @@ public class PrintCatalogQuery extends PrintCatalogEntity {
this.serviceIdList = serviceIdList; this.serviceIdList = serviceIdList;
} }
/**
* 获取 打印服务配置ID
* @return serviceIdNotList
*/
public List<Long> getServiceIdNotList(){
return this.serviceIdNotList;
}
/**
* 设置 打印服务配置ID
* @param serviceIdNotList
*/
public void setServiceIdNotList(List<Long> serviceIdNotList){
this.serviceIdNotList = serviceIdNotList;
}
/**
* 获取 开始 站点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;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -608,6 +899,15 @@ public class PrintCatalogQuery extends PrintCatalogEntity { ...@@ -608,6 +899,15 @@ public class PrintCatalogQuery extends PrintCatalogEntity {
return this; return this;
} }
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public PrintCatalogQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/** /**
* 设置 证照目录ID * 设置 证照目录ID
* @param catalogId * @param catalogId
...@@ -653,6 +953,15 @@ public class PrintCatalogQuery extends PrintCatalogEntity { ...@@ -653,6 +953,15 @@ public class PrintCatalogQuery extends PrintCatalogEntity {
return this; return this;
} }
/**
* 设置 证照目录ID
* @param catalogIdNotList
*/
public PrintCatalogQuery catalogIdNotList(List<Long> catalogIdNotList){
this.catalogIdNotList = catalogIdNotList;
return this;
}
/** /**
* 设置 证照目录编号 * 设置 证照目录编号
...@@ -793,6 +1102,15 @@ public class PrintCatalogQuery extends PrintCatalogEntity { ...@@ -793,6 +1102,15 @@ public class PrintCatalogQuery extends PrintCatalogEntity {
return this; return this;
} }
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public PrintCatalogQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/** /**
* 设置 更新用户 * 设置 更新用户
...@@ -839,6 +1157,15 @@ public class PrintCatalogQuery extends PrintCatalogEntity { ...@@ -839,6 +1157,15 @@ public class PrintCatalogQuery extends PrintCatalogEntity {
return this; return this;
} }
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public PrintCatalogQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
return this;
}
/** /**
* 设置 打印服务配置ID * 设置 打印服务配置ID
...@@ -885,6 +1212,69 @@ public class PrintCatalogQuery extends PrintCatalogEntity { ...@@ -885,6 +1212,69 @@ public class PrintCatalogQuery extends PrintCatalogEntity {
return this; return this;
} }
/**
* 设置 打印服务配置ID
* @param serviceIdNotList
*/
public PrintCatalogQuery serviceIdNotList(List<Long> serviceIdNotList){
this.serviceIdNotList = serviceIdNotList;
return this;
}
/**
* 设置 站点id
* @param siteId
*/
public PrintCatalogQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public PrintCatalogQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public PrintCatalogQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public PrintCatalogQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点id
* @param siteIdList
*/
public PrintCatalogQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public PrintCatalogQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
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/print/model/PrintServiceEntity.java
View file @ 4018c60f
...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel; ...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.print.model.vo.PrintServiceVo; import com.mortals.xhx.module.print.model.vo.PrintServiceVo;
/** /**
* 证照打印服务配置实体对象 * 证照打印服务配置实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-21 * @date 2023-05-14
*/ */
public class PrintServiceEntity extends PrintServiceVo { public class PrintServiceEntity extends PrintServiceVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -24,6 +24,10 @@ public class PrintServiceEntity extends PrintServiceVo { ...@@ -24,6 +24,10 @@ public class PrintServiceEntity extends PrintServiceVo {
* 服务访问地址 * 服务访问地址
*/ */
private String serviceUrl; private String serviceUrl;
/**
* 站点id
*/
private Long siteId;
...@@ -56,6 +60,20 @@ public class PrintServiceEntity extends PrintServiceVo { ...@@ -56,6 +60,20 @@ public class PrintServiceEntity extends PrintServiceVo {
public void setServiceUrl(String serviceUrl){ public void setServiceUrl(String serviceUrl){
this.serviceUrl = serviceUrl; this.serviceUrl = serviceUrl;
} }
/**
* 获取 站点id
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点id
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
...@@ -80,6 +98,7 @@ public class PrintServiceEntity extends PrintServiceVo { ...@@ -80,6 +98,7 @@ public class PrintServiceEntity extends PrintServiceVo {
StringBuilder sb = new StringBuilder(""); StringBuilder sb = new StringBuilder("");
sb.append(",serviceName:").append(getServiceName()); sb.append(",serviceName:").append(getServiceName());
sb.append(",serviceUrl:").append(getServiceUrl()); sb.append(",serviceUrl:").append(getServiceUrl());
sb.append(",siteId:").append(getSiteId());
return sb.toString(); return sb.toString();
} }
...@@ -88,5 +107,7 @@ public class PrintServiceEntity extends PrintServiceVo { ...@@ -88,5 +107,7 @@ public class PrintServiceEntity extends PrintServiceVo {
this.serviceName = ""; this.serviceName = "";
this.serviceUrl = ""; this.serviceUrl = "";
this.siteId = null;
} }
} }
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/print/model/PrintServiceQuery.java
View file @ 4018c60f
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.print.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.print.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.print.model.PrintServiceEntity; import com.mortals.xhx.module.print.model.PrintServiceEntity;
/** /**
* 证照打印服务配置查询对象 * 证照打印服务配置查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-21 * @date 2023-05-14
*/ */
public class PrintServiceQuery extends PrintServiceEntity { public class PrintServiceQuery extends PrintServiceEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -21,12 +21,19 @@ public class PrintServiceQuery extends PrintServiceEntity { ...@@ -21,12 +21,19 @@ public class PrintServiceQuery extends PrintServiceEntity {
/** 序号，主键，自增长列表 */ /** 序号，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 配置名称 */ /** 配置名称 */
private List<String> serviceNameList; private List<String> serviceNameList;
/** 配置名称排除列表 */
private List <String> serviceNameNotList;
/** 服务访问地址 */ /** 服务访问地址 */
private List<String> serviceUrlList; private List<String> serviceUrlList;
/** 服务访问地址排除列表 */
private List <String> serviceUrlNotList;
/** 开始 创建用户 */ /** 开始 创建用户 */
private Long createUserIdStart; private Long createUserIdStart;
...@@ -39,6 +46,9 @@ public class PrintServiceQuery extends PrintServiceEntity { ...@@ -39,6 +46,9 @@ public class PrintServiceQuery extends PrintServiceEntity {
/** 创建用户列表 */ /** 创建用户列表 */
private List <Long> createUserIdList; private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -57,12 +67,30 @@ public class PrintServiceQuery extends PrintServiceEntity { ...@@ -57,12 +67,30 @@ public class PrintServiceQuery extends PrintServiceEntity {
/** 更新用户列表 */ /** 更新用户列表 */
private List <Long> updateUserIdList; private List <Long> updateUserIdList;
/** 更新用户排除列表 */
private List <Long> updateUserIdNotList;
/** 开始 更新时间 */ /** 开始 更新时间 */
private String updateTimeStart; private String updateTimeStart;
/** 结束 更新时间 */ /** 结束 更新时间 */
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;
/** 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<PrintServiceQuery> orConditionList; private List<PrintServiceQuery> orConditionList;
...@@ -135,6 +163,23 @@ public class PrintServiceQuery extends PrintServiceEntity { ...@@ -135,6 +163,23 @@ public class PrintServiceQuery extends PrintServiceEntity {
this.idList = idList; this.idList = idList;
} }
/**
* 获取 序号，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/** /**
* 获取 配置名称 * 获取 配置名称
* @return serviceNameList * @return serviceNameList
...@@ -150,6 +195,23 @@ public class PrintServiceQuery extends PrintServiceEntity { ...@@ -150,6 +195,23 @@ public class PrintServiceQuery extends PrintServiceEntity {
public void setServiceNameList(List<String> serviceNameList){ public void setServiceNameList(List<String> serviceNameList){
this.serviceNameList = serviceNameList; this.serviceNameList = serviceNameList;
} }
/**
* 获取 配置名称
* @return serviceNameNotList
*/
public List<String> getServiceNameNotList(){
return this.serviceNameNotList;
}
/**
* 设置 配置名称
* @param serviceNameNotList
*/
public void setServiceNameNotList(List<String> serviceNameNotList){
this.serviceNameNotList = serviceNameNotList;
}
/** /**
* 获取 服务访问地址 * 获取 服务访问地址
* @return serviceUrlList * @return serviceUrlList
...@@ -165,6 +227,23 @@ public class PrintServiceQuery extends PrintServiceEntity { ...@@ -165,6 +227,23 @@ public class PrintServiceQuery extends PrintServiceEntity {
public void setServiceUrlList(List<String> serviceUrlList){ public void setServiceUrlList(List<String> serviceUrlList){
this.serviceUrlList = serviceUrlList; this.serviceUrlList = serviceUrlList;
} }
/**
* 获取 服务访问地址
* @return serviceUrlNotList
*/
public List<String> getServiceUrlNotList(){
return this.serviceUrlNotList;
}
/**
* 设置 服务访问地址
* @param serviceUrlNotList
*/
public void setServiceUrlNotList(List<String> serviceUrlNotList){
this.serviceUrlNotList = serviceUrlNotList;
}
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @return createUserIdStart * @return createUserIdStart
...@@ -229,6 +308,23 @@ public class PrintServiceQuery extends PrintServiceEntity { ...@@ -229,6 +308,23 @@ public class PrintServiceQuery extends PrintServiceEntity {
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
} }
/**
* 获取 创建用户
* @return createUserIdNotList
*/
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
...@@ -325,6 +421,23 @@ public class PrintServiceQuery extends PrintServiceEntity { ...@@ -325,6 +421,23 @@ public class PrintServiceQuery extends PrintServiceEntity {
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
} }
/**
* 获取 更新用户
* @return updateUserIdNotList
*/
public List<Long> getUpdateUserIdNotList(){
return this.updateUserIdNotList;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
}
/** /**
* 获取 开始 更新时间 * 获取 开始 更新时间
* @return updateTimeStart * @return updateTimeStart
...@@ -357,6 +470,87 @@ public class PrintServiceQuery extends PrintServiceEntity { ...@@ -357,6 +470,87 @@ public class PrintServiceQuery extends PrintServiceEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 开始 站点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;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -402,6 +596,15 @@ public class PrintServiceQuery extends PrintServiceEntity { ...@@ -402,6 +596,15 @@ public class PrintServiceQuery extends PrintServiceEntity {
return this; return this;
} }
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public PrintServiceQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/** /**
* 设置 配置名称 * 设置 配置名称
...@@ -485,6 +688,15 @@ public class PrintServiceQuery extends PrintServiceEntity { ...@@ -485,6 +688,15 @@ public class PrintServiceQuery extends PrintServiceEntity {
return this; return this;
} }
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public PrintServiceQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/** /**
* 设置 更新用户 * 设置 更新用户
...@@ -531,6 +743,69 @@ public class PrintServiceQuery extends PrintServiceEntity { ...@@ -531,6 +743,69 @@ public class PrintServiceQuery extends PrintServiceEntity {
return this; return this;
} }
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public PrintServiceQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
return this;
}
/**
* 设置 站点id
* @param siteId
*/
public PrintServiceQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public PrintServiceQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public PrintServiceQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public PrintServiceQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点id
* @param siteIdList
*/
public PrintServiceQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public PrintServiceQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
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)
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/ApplyLogEntity.java
View file @ 4018c60f
...@@ -11,7 +11,7 @@ import com.mortals.xhx.module.record.model.vo.ApplyLogVo; ...@@ -11,7 +11,7 @@ import com.mortals.xhx.module.record.model.vo.ApplyLogVo;
* 证照申请实体对象 * 证照申请实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-07 * @date 2023-05-14
*/ */
public class ApplyLogEntity extends ApplyLogVo { public class ApplyLogEntity extends ApplyLogVo {
...@@ -113,6 +113,10 @@ public class ApplyLogEntity extends ApplyLogVo { ...@@ -113,6 +113,10 @@ public class ApplyLogEntity extends ApplyLogVo {
* 归档状态0否1是 * 归档状态0否1是
*/ */
private Integer recordStatus; private Integer recordStatus;
/**
* 站点id
*/
private Long siteId;
...@@ -453,6 +457,20 @@ public class ApplyLogEntity extends ApplyLogVo { ...@@ -453,6 +457,20 @@ public class ApplyLogEntity extends ApplyLogVo {
public void setRecordStatus(Integer recordStatus){ public void setRecordStatus(Integer recordStatus){
this.recordStatus = recordStatus; this.recordStatus = recordStatus;
} }
/**
* 获取 站点id
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点id
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
...@@ -499,6 +517,7 @@ public class ApplyLogEntity extends ApplyLogVo { ...@@ -499,6 +517,7 @@ public class ApplyLogEntity extends ApplyLogVo {
sb.append(",generateStatus:").append(getGenerateStatus()); sb.append(",generateStatus:").append(getGenerateStatus());
sb.append(",operType:").append(getOperType()); sb.append(",operType:").append(getOperType());
sb.append(",recordStatus:").append(getRecordStatus()); sb.append(",recordStatus:").append(getRecordStatus());
sb.append(",siteId:").append(getSiteId());
return sb.toString(); return sb.toString();
} }
...@@ -551,5 +570,7 @@ public class ApplyLogEntity extends ApplyLogVo { ...@@ -551,5 +570,7 @@ public class ApplyLogEntity extends ApplyLogVo {
this.operType = 1; this.operType = 1;
this.recordStatus = 0; this.recordStatus = 0;
this.siteId = null;
} }
} }
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/ApplyLogQuery.java
View file @ 4018c60f
...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.record.model.ApplyLogEntity; ...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.record.model.ApplyLogEntity;
* 证照申请查询对象 * 证照申请查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-07 * @date 2023-05-14
*/ */
public class ApplyLogQuery extends ApplyLogEntity { public class ApplyLogQuery extends ApplyLogEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -22,6 +22,9 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -22,6 +22,9 @@ public class ApplyLogQuery extends ApplyLogEntity {
/** 序号，主键，自增长列表 */ /** 序号，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 证照档案ID */ /** 开始 证照档案ID */
private Long recordIdStart; private Long recordIdStart;
...@@ -34,6 +37,9 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -34,6 +37,9 @@ public class ApplyLogQuery extends ApplyLogEntity {
/** 证照档案ID列表 */ /** 证照档案ID列表 */
private List <Long> recordIdList; private List <Long> recordIdList;
/** 证照档案ID排除列表 */
private List <Long> recordIdNotList;
/** 开始 证照目录ID */ /** 开始 证照目录ID */
private Long catalogIdStart; private Long catalogIdStart;
...@@ -46,18 +52,29 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -46,18 +52,29 @@ public class ApplyLogQuery extends ApplyLogEntity {
/** 证照目录ID列表 */ /** 证照目录ID列表 */
private List <Long> catalogIdList; private List <Long> catalogIdList;
/** 证照目录ID排除列表 */
private List <Long> catalogIdNotList;
/** 证照目录编号 */ /** 证照目录编号 */
private List<String> catalogCodeList; private List<String> catalogCodeList;
/** 证照目录编号排除列表 */
private List <String> catalogCodeNotList;
/** 目录名称 */ /** 目录名称 */
private List<String> catalogNameList; private List<String> catalogNameList;
/** 目录名称排除列表 */
private List <String> catalogNameNotList;
/** 证件编号 */ /** 证件编号 */
private List<String> certificateCodeList; private List<String> certificateCodeList;
/** 证件编号排除列表 */
private List <String> certificateCodeNotList;
/** 证件名称 */ /** 证件名称 */
private List<String> certificateNameList; private List<String> certificateNameList;
/** 证件名称排除列表 */
private List <String> certificateNameNotList;
/** 开始 颁发时间 */ /** 开始 颁发时间 */
private String issueTimeStart; private String issueTimeStart;
...@@ -67,9 +84,13 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -67,9 +84,13 @@ public class ApplyLogQuery extends ApplyLogEntity {
/** 取件人姓名 */ /** 取件人姓名 */
private List<String> pickerNameList; private List<String> pickerNameList;
/** 取件人姓名排除列表 */
private List <String> pickerNameNotList;
/** 取件人证件号码 */ /** 取件人证件号码 */
private List<String> pickerIDCardNoList; private List<String> pickerIDCardNoList;
/** 取件人证件号码排除列表 */
private List <String> pickerIDCardNoNotList;
/** 开始 持有者类型，1：自然人，2：法人，3：自然人法人 */ /** 开始 持有者类型，1：自然人，2：法人，3：自然人法人 */
private Integer holderTypeStart; private Integer holderTypeStart;
...@@ -82,6 +103,9 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -82,6 +103,9 @@ public class ApplyLogQuery extends ApplyLogEntity {
/** 持有者类型，1：自然人，2：法人，3：自然人法人列表 */ /** 持有者类型，1：自然人，2：法人，3：自然人法人列表 */
private List <Integer> holderTypeList; private List <Integer> holderTypeList;
/** 持有者类型，1：自然人，2：法人，3：自然人法人排除列表 */
private List <Integer> holderTypeNotList;
/** 开始 持有者证件类型，1：身份证，2：组织机构代码等 */ /** 开始 持有者证件类型，1：身份证，2：组织机构代码等 */
private Integer holderIdTypeStart; private Integer holderIdTypeStart;
...@@ -94,15 +118,24 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -94,15 +118,24 @@ public class ApplyLogQuery extends ApplyLogEntity {
/** 持有者证件类型，1：身份证，2：组织机构代码等列表 */ /** 持有者证件类型，1：身份证，2：组织机构代码等列表 */
private List <Integer> holderIdTypeList; private List <Integer> holderIdTypeList;
/** 持有者证件类型，1：身份证，2：组织机构代码等排除列表 */
private List <Integer> holderIdTypeNotList;
/** 持有者名称 */ /** 持有者名称 */
private List<String> holderNameList; private List<String> holderNameList;
/** 持有者名称排除列表 */
private List <String> holderNameNotList;
/** 持有者证件号码 */ /** 持有者证件号码 */
private List<String> holderIDCardNoList; private List<String> holderIDCardNoList;
/** 持有者证件号码排除列表 */
private List <String> holderIDCardNoNotList;
/** 企业名称 */ /** 企业名称 */
private List<String> enterpriseNameList; private List<String> enterpriseNameList;
/** 企业名称排除列表 */
private List <String> enterpriseNameNotList;
/** 开始 有效期起始 */ /** 开始 有效期起始 */
private String validityStartStart; private String validityStartStart;
...@@ -118,18 +151,28 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -118,18 +151,28 @@ public class ApplyLogQuery extends ApplyLogEntity {
/** 专网ID */ /** 专网ID */
private List<String> privateIDList; private List<String> privateIDList;
/** 专网ID排除列表 */
private List <String> privateIDNotList;
/** 证件附件地址 */ /** 证件附件地址 */
private List<String> certificateUrlList; private List<String> certificateUrlList;
/** 证件附件地址排除列表 */
private List <String> certificateUrlNotList;
/** 证件预览地址 */ /** 证件预览地址 */
private List<String> previewUrlList; private List<String> previewUrlList;
/** 证件预览地址排除列表 */
private List <String> previewUrlNotList;
/** 证照模板正本表单内容 */ /** 证照模板正本表单内容 */
private List<String> formContentList; private List<String> formContentList;
/** 证照模板正本表单内容排除列表 */
private List <String> formContentNotList;
/** 证照模板正本表单内容 */ /** 证照模板正本表单内容 */
private List<String> formTemplateList; private List<String> formTemplateList;
/** 证照模板正本表单内容排除列表 */
private List <String> formTemplateNotList;
/** 开始 生成状态1未生成2已生成 */ /** 开始 生成状态1未生成2已生成 */
private Integer generateStatusStart; private Integer generateStatusStart;
...@@ -142,6 +185,9 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -142,6 +185,9 @@ public class ApplyLogQuery extends ApplyLogEntity {
/** 生成状态1未生成2已生成列表 */ /** 生成状态1未生成2已生成列表 */
private List <Integer> generateStatusList; private List <Integer> generateStatusList;
/** 生成状态1未生成2已生成排除列表 */
private List <Integer> generateStatusNotList;
/** 开始 档案操作类型1新增2变更 */ /** 开始 档案操作类型1新增2变更 */
private Integer operTypeStart; private Integer operTypeStart;
...@@ -154,6 +200,9 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -154,6 +200,9 @@ public class ApplyLogQuery extends ApplyLogEntity {
/** 档案操作类型1新增2变更列表 */ /** 档案操作类型1新增2变更列表 */
private List <Integer> operTypeList; private List <Integer> operTypeList;
/** 档案操作类型1新增2变更排除列表 */
private List <Integer> operTypeNotList;
/** 开始 创建用户 */ /** 开始 创建用户 */
private Long createUserIdStart; private Long createUserIdStart;
...@@ -166,6 +215,9 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -166,6 +215,9 @@ public class ApplyLogQuery extends ApplyLogEntity {
/** 创建用户列表 */ /** 创建用户列表 */
private List <Long> createUserIdList; private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -184,6 +236,9 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -184,6 +236,9 @@ public class ApplyLogQuery extends ApplyLogEntity {
/** 更新用户列表 */ /** 更新用户列表 */
private List <Long> updateUserIdList; private List <Long> updateUserIdList;
/** 更新用户排除列表 */
private List <Long> updateUserIdNotList;
/** 开始 更新时间 */ /** 开始 更新时间 */
private String updateTimeStart; private String updateTimeStart;
...@@ -202,6 +257,24 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -202,6 +257,24 @@ public class ApplyLogQuery extends ApplyLogEntity {
/** 归档状态0否1是列表 */ /** 归档状态0否1是列表 */
private List <Integer> recordStatusList; private List <Integer> recordStatusList;
/** 归档状态0否1是排除列表 */
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;
/** 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;
...@@ -274,6 +347,23 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -274,6 +347,23 @@ public class ApplyLogQuery extends ApplyLogEntity {
this.idList = idList; this.idList = idList;
} }
/**
* 获取 序号，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/** /**
* 获取 开始 证照档案ID * 获取 开始 证照档案ID
* @return recordIdStart * @return recordIdStart
...@@ -338,6 +428,23 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -338,6 +428,23 @@ public class ApplyLogQuery extends ApplyLogEntity {
this.recordIdList = recordIdList; this.recordIdList = recordIdList;
} }
/**
* 获取 证照档案ID
* @return recordIdNotList
*/
public List<Long> getRecordIdNotList(){
return this.recordIdNotList;
}
/**
* 设置 证照档案ID
* @param recordIdNotList
*/
public void setRecordIdNotList(List<Long> recordIdNotList){
this.recordIdNotList = recordIdNotList;
}
/** /**
* 获取 开始 证照目录ID * 获取 开始 证照目录ID
* @return catalogIdStart * @return catalogIdStart
...@@ -402,6 +509,23 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -402,6 +509,23 @@ public class ApplyLogQuery extends ApplyLogEntity {
this.catalogIdList = catalogIdList; this.catalogIdList = catalogIdList;
} }
/**
* 获取 证照目录ID
* @return catalogIdNotList
*/
public List<Long> getCatalogIdNotList(){
return this.catalogIdNotList;
}
/**
* 设置 证照目录ID
* @param catalogIdNotList
*/
public void setCatalogIdNotList(List<Long> catalogIdNotList){
this.catalogIdNotList = catalogIdNotList;
}
/** /**
* 获取 证照目录编号 * 获取 证照目录编号
* @return catalogCodeList * @return catalogCodeList
...@@ -417,6 +541,23 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -417,6 +541,23 @@ public class ApplyLogQuery extends ApplyLogEntity {
public void setCatalogCodeList(List<String> catalogCodeList){ public void setCatalogCodeList(List<String> catalogCodeList){
this.catalogCodeList = catalogCodeList; this.catalogCodeList = catalogCodeList;
} }
/**
* 获取 证照目录编号
* @return catalogCodeNotList
*/
public List<String> getCatalogCodeNotList(){
return this.catalogCodeNotList;
}
/**
* 设置 证照目录编号
* @param catalogCodeNotList
*/
public void setCatalogCodeNotList(List<String> catalogCodeNotList){
this.catalogCodeNotList = catalogCodeNotList;
}
/** /**
* 获取 目录名称 * 获取 目录名称
* @return catalogNameList * @return catalogNameList
...@@ -432,6 +573,23 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -432,6 +573,23 @@ public class ApplyLogQuery extends ApplyLogEntity {
public void setCatalogNameList(List<String> catalogNameList){ public void setCatalogNameList(List<String> catalogNameList){
this.catalogNameList = catalogNameList; this.catalogNameList = catalogNameList;
} }
/**
* 获取 目录名称
* @return catalogNameNotList
*/
public List<String> getCatalogNameNotList(){
return this.catalogNameNotList;
}
/**
* 设置 目录名称
* @param catalogNameNotList
*/
public void setCatalogNameNotList(List<String> catalogNameNotList){
this.catalogNameNotList = catalogNameNotList;
}
/** /**
* 获取 证件编号 * 获取 证件编号
* @return certificateCodeList * @return certificateCodeList
...@@ -447,6 +605,23 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -447,6 +605,23 @@ public class ApplyLogQuery extends ApplyLogEntity {
public void setCertificateCodeList(List<String> certificateCodeList){ public void setCertificateCodeList(List<String> certificateCodeList){
this.certificateCodeList = 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 certificateNameList * @return certificateNameList
...@@ -462,6 +637,23 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -462,6 +637,23 @@ public class ApplyLogQuery extends ApplyLogEntity {
public void setCertificateNameList(List<String> certificateNameList){ public void setCertificateNameList(List<String> certificateNameList){
this.certificateNameList = 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 issueTimeStart * @return issueTimeStart
...@@ -509,6 +701,23 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -509,6 +701,23 @@ public class ApplyLogQuery extends ApplyLogEntity {
public void setPickerNameList(List<String> pickerNameList){ public void setPickerNameList(List<String> pickerNameList){
this.pickerNameList = pickerNameList; this.pickerNameList = pickerNameList;
} }
/**
* 获取 取件人姓名
* @return pickerNameNotList
*/
public List<String> getPickerNameNotList(){
return this.pickerNameNotList;
}
/**
* 设置 取件人姓名
* @param pickerNameNotList
*/
public void setPickerNameNotList(List<String> pickerNameNotList){
this.pickerNameNotList = pickerNameNotList;
}
/** /**
* 获取 取件人证件号码 * 获取 取件人证件号码
* @return pickerIDCardNoList * @return pickerIDCardNoList
...@@ -524,6 +733,23 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -524,6 +733,23 @@ public class ApplyLogQuery extends ApplyLogEntity {
public void setPickerIDCardNoList(List<String> pickerIDCardNoList){ public void setPickerIDCardNoList(List<String> pickerIDCardNoList){
this.pickerIDCardNoList = pickerIDCardNoList; this.pickerIDCardNoList = pickerIDCardNoList;
} }
/**
* 获取 取件人证件号码
* @return pickerIDCardNoNotList
*/
public List<String> getPickerIDCardNoNotList(){
return this.pickerIDCardNoNotList;
}
/**
* 设置 取件人证件号码
* @param pickerIDCardNoNotList
*/
public void setPickerIDCardNoNotList(List<String> pickerIDCardNoNotList){
this.pickerIDCardNoNotList = pickerIDCardNoNotList;
}
/** /**
* 获取 开始 持有者类型，1：自然人，2：法人，3：自然人法人 * 获取 开始 持有者类型，1：自然人，2：法人，3：自然人法人
* @return holderTypeStart * @return holderTypeStart
...@@ -588,6 +814,23 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -588,6 +814,23 @@ public class ApplyLogQuery extends ApplyLogEntity {
this.holderTypeList = holderTypeList; this.holderTypeList = holderTypeList;
} }
/**
* 获取 持有者类型，1：自然人，2：法人，3：自然人法人
* @return holderTypeNotList
*/
public List<Integer> getHolderTypeNotList(){
return this.holderTypeNotList;
}
/**
* 设置 持有者类型，1：自然人，2：法人，3：自然人法人
* @param holderTypeNotList
*/
public void setHolderTypeNotList(List<Integer> holderTypeNotList){
this.holderTypeNotList = holderTypeNotList;
}
/** /**
* 获取 开始 持有者证件类型，1：身份证，2：组织机构代码等 * 获取 开始 持有者证件类型，1：身份证，2：组织机构代码等
* @return holderIdTypeStart * @return holderIdTypeStart
...@@ -652,6 +895,23 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -652,6 +895,23 @@ public class ApplyLogQuery extends ApplyLogEntity {
this.holderIdTypeList = holderIdTypeList; this.holderIdTypeList = holderIdTypeList;
} }
/**
* 获取 持有者证件类型，1：身份证，2：组织机构代码等
* @return holderIdTypeNotList
*/
public List<Integer> getHolderIdTypeNotList(){
return this.holderIdTypeNotList;
}
/**
* 设置 持有者证件类型，1：身份证，2：组织机构代码等
* @param holderIdTypeNotList
*/
public void setHolderIdTypeNotList(List<Integer> holderIdTypeNotList){
this.holderIdTypeNotList = holderIdTypeNotList;
}
/** /**
* 获取 持有者名称 * 获取 持有者名称
* @return holderNameList * @return holderNameList
...@@ -667,6 +927,23 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -667,6 +927,23 @@ public class ApplyLogQuery extends ApplyLogEntity {
public void setHolderNameList(List<String> holderNameList){ public void setHolderNameList(List<String> holderNameList){
this.holderNameList = 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 * @return holderIDCardNoList
...@@ -682,6 +959,23 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -682,6 +959,23 @@ public class ApplyLogQuery extends ApplyLogEntity {
public void setHolderIDCardNoList(List<String> holderIDCardNoList){ public void setHolderIDCardNoList(List<String> holderIDCardNoList){
this.holderIDCardNoList = 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 enterpriseNameList * @return enterpriseNameList
...@@ -697,6 +991,23 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -697,6 +991,23 @@ public class ApplyLogQuery extends ApplyLogEntity {
public void setEnterpriseNameList(List<String> enterpriseNameList){ public void setEnterpriseNameList(List<String> enterpriseNameList){
this.enterpriseNameList = 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 validityStartStart * @return validityStartStart
...@@ -776,6 +1087,23 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -776,6 +1087,23 @@ public class ApplyLogQuery extends ApplyLogEntity {
public void setPrivateIDList(List<String> privateIDList){ public void setPrivateIDList(List<String> privateIDList){
this.privateIDList = privateIDList; this.privateIDList = privateIDList;
} }
/**
* 获取 专网ID
* @return privateIDNotList
*/
public List<String> getPrivateIDNotList(){
return this.privateIDNotList;
}
/**
* 设置 专网ID
* @param privateIDNotList
*/
public void setPrivateIDNotList(List<String> privateIDNotList){
this.privateIDNotList = privateIDNotList;
}
/** /**
* 获取 证件附件地址 * 获取 证件附件地址
* @return certificateUrlList * @return certificateUrlList
...@@ -791,6 +1119,23 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -791,6 +1119,23 @@ public class ApplyLogQuery extends ApplyLogEntity {
public void setCertificateUrlList(List<String> certificateUrlList){ public void setCertificateUrlList(List<String> certificateUrlList){
this.certificateUrlList = certificateUrlList; this.certificateUrlList = certificateUrlList;
} }
/**
* 获取 证件附件地址
* @return certificateUrlNotList
*/
public List<String> getCertificateUrlNotList(){
return this.certificateUrlNotList;
}
/**
* 设置 证件附件地址
* @param certificateUrlNotList
*/
public void setCertificateUrlNotList(List<String> certificateUrlNotList){
this.certificateUrlNotList = certificateUrlNotList;
}
/** /**
* 获取 证件预览地址 * 获取 证件预览地址
* @return previewUrlList * @return previewUrlList
...@@ -806,6 +1151,23 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -806,6 +1151,23 @@ public class ApplyLogQuery extends ApplyLogEntity {
public void setPreviewUrlList(List<String> previewUrlList){ public void setPreviewUrlList(List<String> previewUrlList){
this.previewUrlList = previewUrlList; this.previewUrlList = previewUrlList;
} }
/**
* 获取 证件预览地址
* @return previewUrlNotList
*/
public List<String> getPreviewUrlNotList(){
return this.previewUrlNotList;
}
/**
* 设置 证件预览地址
* @param previewUrlNotList
*/
public void setPreviewUrlNotList(List<String> previewUrlNotList){
this.previewUrlNotList = previewUrlNotList;
}
/** /**
* 获取 证照模板正本表单内容 * 获取 证照模板正本表单内容
* @return formContentList * @return formContentList
...@@ -821,6 +1183,23 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -821,6 +1183,23 @@ public class ApplyLogQuery extends ApplyLogEntity {
public void setFormContentList(List<String> formContentList){ public void setFormContentList(List<String> formContentList){
this.formContentList = formContentList; this.formContentList = formContentList;
} }
/**
* 获取 证照模板正本表单内容
* @return formContentNotList
*/
public List<String> getFormContentNotList(){
return this.formContentNotList;
}
/**
* 设置 证照模板正本表单内容
* @param formContentNotList
*/
public void setFormContentNotList(List<String> formContentNotList){
this.formContentNotList = formContentNotList;
}
/** /**
* 获取 证照模板正本表单内容 * 获取 证照模板正本表单内容
* @return formTemplateList * @return formTemplateList
...@@ -836,6 +1215,23 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -836,6 +1215,23 @@ public class ApplyLogQuery extends ApplyLogEntity {
public void setFormTemplateList(List<String> formTemplateList){ public void setFormTemplateList(List<String> formTemplateList){
this.formTemplateList = formTemplateList; this.formTemplateList = formTemplateList;
} }
/**
* 获取 证照模板正本表单内容
* @return formTemplateNotList
*/
public List<String> getFormTemplateNotList(){
return this.formTemplateNotList;
}
/**
* 设置 证照模板正本表单内容
* @param formTemplateNotList
*/
public void setFormTemplateNotList(List<String> formTemplateNotList){
this.formTemplateNotList = formTemplateNotList;
}
/** /**
* 获取 开始 生成状态1未生成2已生成 * 获取 开始 生成状态1未生成2已生成
* @return generateStatusStart * @return generateStatusStart
...@@ -900,6 +1296,23 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -900,6 +1296,23 @@ public class ApplyLogQuery extends ApplyLogEntity {
this.generateStatusList = generateStatusList; this.generateStatusList = generateStatusList;
} }
/**
* 获取 生成状态1未生成2已生成
* @return generateStatusNotList
*/
public List<Integer> getGenerateStatusNotList(){
return this.generateStatusNotList;
}
/**
* 设置 生成状态1未生成2已生成
* @param generateStatusNotList
*/
public void setGenerateStatusNotList(List<Integer> generateStatusNotList){
this.generateStatusNotList = generateStatusNotList;
}
/** /**
* 获取 开始 档案操作类型1新增2变更 * 获取 开始 档案操作类型1新增2变更
* @return operTypeStart * @return operTypeStart
...@@ -964,6 +1377,23 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -964,6 +1377,23 @@ public class ApplyLogQuery extends ApplyLogEntity {
this.operTypeList = operTypeList; this.operTypeList = operTypeList;
} }
/**
* 获取 档案操作类型1新增2变更
* @return operTypeNotList
*/
public List<Integer> getOperTypeNotList(){
return this.operTypeNotList;
}
/**
* 设置 档案操作类型1新增2变更
* @param operTypeNotList
*/
public void setOperTypeNotList(List<Integer> operTypeNotList){
this.operTypeNotList = operTypeNotList;
}
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @return createUserIdStart * @return createUserIdStart
...@@ -1028,6 +1458,23 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -1028,6 +1458,23 @@ public class ApplyLogQuery extends ApplyLogEntity {
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
} }
/**
* 获取 创建用户
* @return createUserIdNotList
*/
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
...@@ -1124,6 +1571,23 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -1124,6 +1571,23 @@ public class ApplyLogQuery extends ApplyLogEntity {
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
} }
/**
* 获取 更新用户
* @return updateUserIdNotList
*/
public List<Long> getUpdateUserIdNotList(){
return this.updateUserIdNotList;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
}
/** /**
* 获取 开始 更新时间 * 获取 开始 更新时间
* @return updateTimeStart * @return updateTimeStart
...@@ -1220,6 +1684,104 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -1220,6 +1684,104 @@ public class ApplyLogQuery extends ApplyLogEntity {
this.recordStatusList = recordStatusList; this.recordStatusList = recordStatusList;
} }
/**
* 获取 归档状态0否1是
* @return recordStatusNotList
*/
public List<Integer> getRecordStatusNotList(){
return this.recordStatusNotList;
}
/**
* 设置 归档状态0否1是
* @param recordStatusNotList
*/
public void setRecordStatusNotList(List<Integer> recordStatusNotList){
this.recordStatusNotList = recordStatusNotList;
}
/**
* 获取 开始 站点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;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -1265,6 +1827,15 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -1265,6 +1827,15 @@ public class ApplyLogQuery extends ApplyLogEntity {
return this; return this;
} }
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public ApplyLogQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/** /**
* 设置 证照档案ID * 设置 证照档案ID
* @param recordId * @param recordId
...@@ -1310,6 +1881,15 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -1310,6 +1881,15 @@ public class ApplyLogQuery extends ApplyLogEntity {
return this; return this;
} }
/**
* 设置 证照档案ID
* @param recordIdNotList
*/
public ApplyLogQuery recordIdNotList(List<Long> recordIdNotList){
this.recordIdNotList = recordIdNotList;
return this;
}
/** /**
* 设置 证照目录ID * 设置 证照目录ID
* @param catalogId * @param catalogId
...@@ -1355,6 +1935,15 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -1355,6 +1935,15 @@ public class ApplyLogQuery extends ApplyLogEntity {
return this; return this;
} }
/**
* 设置 证照目录ID
* @param catalogIdNotList
*/
public ApplyLogQuery catalogIdNotList(List<Long> catalogIdNotList){
this.catalogIdNotList = catalogIdNotList;
return this;
}
/** /**
* 设置 证照目录编号 * 设置 证照目录编号
...@@ -1515,6 +2104,15 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -1515,6 +2104,15 @@ public class ApplyLogQuery extends ApplyLogEntity {
return this; return this;
} }
/**
* 设置 持有者类型，1：自然人，2：法人，3：自然人法人
* @param holderTypeNotList
*/
public ApplyLogQuery holderTypeNotList(List<Integer> holderTypeNotList){
this.holderTypeNotList = holderTypeNotList;
return this;
}
/** /**
* 设置 持有者证件类型，1：身份证，2：组织机构代码等 * 设置 持有者证件类型，1：身份证，2：组织机构代码等
* @param holderIdType * @param holderIdType
...@@ -1560,6 +2158,15 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -1560,6 +2158,15 @@ public class ApplyLogQuery extends ApplyLogEntity {
return this; return this;
} }
/**
* 设置 持有者证件类型，1：身份证，2：组织机构代码等
* @param holderIdTypeNotList
*/
public ApplyLogQuery holderIdTypeNotList(List<Integer> holderIdTypeNotList){
this.holderIdTypeNotList = holderIdTypeNotList;
return this;
}
/** /**
* 设置 持有者名称 * 设置 持有者名称
...@@ -1759,6 +2366,15 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -1759,6 +2366,15 @@ public class ApplyLogQuery extends ApplyLogEntity {
return this; return this;
} }
/**
* 设置 生成状态1未生成2已生成
* @param generateStatusNotList
*/
public ApplyLogQuery generateStatusNotList(List<Integer> generateStatusNotList){
this.generateStatusNotList = generateStatusNotList;
return this;
}
/** /**
* 设置 档案操作类型1新增2变更 * 设置 档案操作类型1新增2变更
* @param operType * @param operType
...@@ -1804,6 +2420,15 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -1804,6 +2420,15 @@ public class ApplyLogQuery extends ApplyLogEntity {
return this; return this;
} }
/**
* 设置 档案操作类型1新增2变更
* @param operTypeNotList
*/
public ApplyLogQuery operTypeNotList(List<Integer> operTypeNotList){
this.operTypeNotList = operTypeNotList;
return this;
}
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserId * @param createUserId
...@@ -1849,6 +2474,15 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -1849,6 +2474,15 @@ public class ApplyLogQuery extends ApplyLogEntity {
return this; return this;
} }
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public ApplyLogQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/** /**
* 设置 更新用户 * 设置 更新用户
...@@ -1895,6 +2529,15 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -1895,6 +2529,15 @@ public class ApplyLogQuery extends ApplyLogEntity {
return this; return this;
} }
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public ApplyLogQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
return this;
}
/** /**
* 设置 归档状态0否1是 * 设置 归档状态0否1是
...@@ -1941,6 +2584,69 @@ public class ApplyLogQuery extends ApplyLogEntity { ...@@ -1941,6 +2584,69 @@ public class ApplyLogQuery extends ApplyLogEntity {
return this; return this;
} }
/**
* 设置 归档状态0否1是
* @param recordStatusNotList
*/
public ApplyLogQuery recordStatusNotList(List<Integer> recordStatusNotList){
this.recordStatusNotList = recordStatusNotList;
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;
}
/** /**
* 获取 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 @ 4018c60f
...@@ -8,11 +8,11 @@ import com.mortals.framework.annotation.Excel; ...@@ -8,11 +8,11 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.record.model.vo.PrintLogVo; import com.mortals.xhx.module.record.model.vo.PrintLogVo;
/** /**
* 证照打印记录实体对象 * 证照打印记录实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-04 * @date 2023-05-14
*/ */
public class PrintLogEntity extends PrintLogVo { public class PrintLogEntity extends PrintLogVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -58,7 +58,7 @@ public class PrintLogEntity extends PrintLogVo { ...@@ -58,7 +58,7 @@ public class PrintLogEntity extends PrintLogVo {
*/ */
private String pickerIDCardNo; private String pickerIDCardNo;
/** /**
* 打印状态1打印成功2失败 * 打印状态1打印成功0失败
*/ */
private Integer printStatus; private Integer printStatus;
/** /**
...@@ -73,6 +73,10 @@ public class PrintLogEntity extends PrintLogVo { ...@@ -73,6 +73,10 @@ public class PrintLogEntity extends PrintLogVo {
* 打印设备 * 打印设备
*/ */
private Long deviceId; private Long deviceId;
/**
* 站点id
*/
private Long siteId;
...@@ -218,14 +222,14 @@ public class PrintLogEntity extends PrintLogVo { ...@@ -218,14 +222,14 @@ public class PrintLogEntity extends PrintLogVo {
this.pickerIDCardNo = pickerIDCardNo; this.pickerIDCardNo = pickerIDCardNo;
} }
/** /**
* 获取 打印状态1打印成功2失败 * 获取 打印状态1打印成功0失败
* @return Integer * @return Integer
*/ */
public Integer getPrintStatus(){ public Integer getPrintStatus(){
return printStatus; return printStatus;
} }
/** /**
* 设置 打印状态1打印成功2失败 * 设置 打印状态1打印成功0失败
* @param printStatus * @param printStatus
*/ */
public void setPrintStatus(Integer printStatus){ public void setPrintStatus(Integer printStatus){
...@@ -273,6 +277,20 @@ public class PrintLogEntity extends PrintLogVo { ...@@ -273,6 +277,20 @@ public class PrintLogEntity extends PrintLogVo {
public void setDeviceId(Long deviceId){ public void setDeviceId(Long deviceId){
this.deviceId = deviceId; this.deviceId = deviceId;
} }
/**
* 获取 站点id
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点id
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
...@@ -309,6 +327,7 @@ public class PrintLogEntity extends PrintLogVo { ...@@ -309,6 +327,7 @@ public class PrintLogEntity extends PrintLogVo {
sb.append(",printDate:").append(getPrintDate()); sb.append(",printDate:").append(getPrintDate());
sb.append(",statusRemark:").append(getStatusRemark()); sb.append(",statusRemark:").append(getStatusRemark());
sb.append(",deviceId:").append(getDeviceId()); sb.append(",deviceId:").append(getDeviceId());
sb.append(",siteId:").append(getSiteId());
return sb.toString(); return sb.toString();
} }
...@@ -341,5 +360,7 @@ public class PrintLogEntity extends PrintLogVo { ...@@ -341,5 +360,7 @@ public class PrintLogEntity extends PrintLogVo {
this.statusRemark = ""; this.statusRemark = "";
this.deviceId = null; this.deviceId = null;
this.siteId = null;
} }
} }
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintLogQuery.java
View file @ 4018c60f
...@@ -4,11 +4,11 @@ import java.util.Date; ...@@ -4,11 +4,11 @@ import java.util.Date;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.record.model.PrintLogEntity; import com.mortals.xhx.module.record.model.PrintLogEntity;
/** /**
* 证照打印记录查询对象 * 证照打印记录查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-04 * @date 2023-05-14
*/ */
public class PrintLogQuery extends PrintLogEntity { public class PrintLogQuery extends PrintLogEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -22,6 +22,9 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -22,6 +22,9 @@ public class PrintLogQuery extends PrintLogEntity {
/** 序号，主键，自增长列表 */ /** 序号，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 证照目录ID */ /** 开始 证照目录ID */
private Long catalogIdStart; private Long catalogIdStart;
...@@ -34,45 +37,69 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -34,45 +37,69 @@ public class PrintLogQuery extends PrintLogEntity {
/** 证照目录ID列表 */ /** 证照目录ID列表 */
private List <Long> catalogIdList; private List <Long> catalogIdList;
/** 证照目录ID排除列表 */
private List <Long> catalogIdNotList;
/** 证照目录编号 */ /** 证照目录编号 */
private List<String> catalogCodeList; private List<String> catalogCodeList;
/** 证照目录编号排除列表 */
private List <String> catalogCodeNotList;
/** 目录名称 */ /** 目录名称 */
private List<String> catalogNameList; private List<String> catalogNameList;
/** 目录名称排除列表 */
private List <String> catalogNameNotList;
/** 证照名称 */ /** 证照名称 */
private List<String> certificateNameList; private List<String> certificateNameList;
/** 证照名称排除列表 */
private List <String> certificateNameNotList;
/** 证照编号 */ /** 证照编号 */
private List<String> certificateCodeList; private List<String> certificateCodeList;
/** 证照编号排除列表 */
private List <String> certificateCodeNotList;
/** 企业名称 */ /** 企业名称 */
private List<String> enterpriseNameList; private List<String> enterpriseNameList;
/** 企业名称排除列表 */
private List <String> enterpriseNameNotList;
/** 持有者姓名 */ /** 持有者姓名 */
private List<String> holderNameList; private List<String> holderNameList;
/** 持有者姓名排除列表 */
private List <String> holderNameNotList;
/** 持有者证件号码 */ /** 持有者证件号码 */
private List<String> holderIDCardNoList; private List<String> holderIDCardNoList;
/** 持有者证件号码排除列表 */
private List <String> holderIDCardNoNotList;
/** 取件人姓名 */ /** 取件人姓名 */
private List<String> pickerNameList; private List<String> pickerNameList;
/** 取件人姓名排除列表 */
private List <String> pickerNameNotList;
/** 取件人证件号码 */ /** 取件人证件号码 */
private List<String> pickerIDCardNoList; private List<String> pickerIDCardNoList;
/** 开始 打印状态1打印成功2失败 */ /** 取件人证件号码排除列表 */
private List <String> pickerIDCardNoNotList;
/** 开始 打印状态1打印成功0失败 */
private Integer printStatusStart; private Integer printStatusStart;
/** 结束 打印状态1打印成功2失败 */ /** 结束 打印状态1打印成功0失败 */
private Integer printStatusEnd; private Integer printStatusEnd;
/** 增加 打印状态1打印成功2失败 */ /** 增加 打印状态1打印成功0失败 */
private Integer printStatusIncrement; private Integer printStatusIncrement;
/** 打印状态1打印成功2失败列表 */ /** 打印状态1打印成功0失败列表 */
private List <Integer> printStatusList; private List <Integer> printStatusList;
/** 打印状态1打印成功0失败排除列表 */
private List <Integer> printStatusNotList;
/** 开始 打印时间 */ /** 开始 打印时间 */
private String printDateStart; private String printDateStart;
...@@ -82,6 +109,8 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -82,6 +109,8 @@ public class PrintLogQuery extends PrintLogEntity {
/** 打印结果描述 */ /** 打印结果描述 */
private List<String> statusRemarkList; private List<String> statusRemarkList;
/** 打印结果描述排除列表 */
private List <String> statusRemarkNotList;
/** 开始 打印设备 */ /** 开始 打印设备 */
private Long deviceIdStart; private Long deviceIdStart;
...@@ -94,6 +123,9 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -94,6 +123,9 @@ public class PrintLogQuery extends PrintLogEntity {
/** 打印设备列表 */ /** 打印设备列表 */
private List <Long> deviceIdList; private List <Long> deviceIdList;
/** 打印设备排除列表 */
private List <Long> deviceIdNotList;
/** 开始 创建用户 */ /** 开始 创建用户 */
private Long createUserIdStart; private Long createUserIdStart;
...@@ -106,6 +138,9 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -106,6 +138,9 @@ public class PrintLogQuery extends PrintLogEntity {
/** 创建用户列表 */ /** 创建用户列表 */
private List <Long> createUserIdList; private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -124,12 +159,30 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -124,12 +159,30 @@ public class PrintLogQuery extends PrintLogEntity {
/** 更新用户列表 */ /** 更新用户列表 */
private List <Long> updateUserIdList; private List <Long> updateUserIdList;
/** 更新用户排除列表 */
private List <Long> updateUserIdNotList;
/** 开始 更新时间 */ /** 开始 更新时间 */
private String updateTimeStart; private String updateTimeStart;
/** 结束 更新时间 */ /** 结束 更新时间 */
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;
/** 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;
...@@ -202,6 +255,23 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -202,6 +255,23 @@ public class PrintLogQuery extends PrintLogEntity {
this.idList = idList; this.idList = idList;
} }
/**
* 获取 序号，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/** /**
* 获取 开始 证照目录ID * 获取 开始 证照目录ID
* @return catalogIdStart * @return catalogIdStart
...@@ -266,6 +336,23 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -266,6 +336,23 @@ public class PrintLogQuery extends PrintLogEntity {
this.catalogIdList = catalogIdList; this.catalogIdList = catalogIdList;
} }
/**
* 获取 证照目录ID
* @return catalogIdNotList
*/
public List<Long> getCatalogIdNotList(){
return this.catalogIdNotList;
}
/**
* 设置 证照目录ID
* @param catalogIdNotList
*/
public void setCatalogIdNotList(List<Long> catalogIdNotList){
this.catalogIdNotList = catalogIdNotList;
}
/** /**
* 获取 证照目录编号 * 获取 证照目录编号
* @return catalogCodeList * @return catalogCodeList
...@@ -281,6 +368,23 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -281,6 +368,23 @@ public class PrintLogQuery extends PrintLogEntity {
public void setCatalogCodeList(List<String> catalogCodeList){ public void setCatalogCodeList(List<String> catalogCodeList){
this.catalogCodeList = catalogCodeList; this.catalogCodeList = catalogCodeList;
} }
/**
* 获取 证照目录编号
* @return catalogCodeNotList
*/
public List<String> getCatalogCodeNotList(){
return this.catalogCodeNotList;
}
/**
* 设置 证照目录编号
* @param catalogCodeNotList
*/
public void setCatalogCodeNotList(List<String> catalogCodeNotList){
this.catalogCodeNotList = catalogCodeNotList;
}
/** /**
* 获取 目录名称 * 获取 目录名称
* @return catalogNameList * @return catalogNameList
...@@ -296,6 +400,23 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -296,6 +400,23 @@ public class PrintLogQuery extends PrintLogEntity {
public void setCatalogNameList(List<String> catalogNameList){ public void setCatalogNameList(List<String> catalogNameList){
this.catalogNameList = catalogNameList; this.catalogNameList = catalogNameList;
} }
/**
* 获取 目录名称
* @return catalogNameNotList
*/
public List<String> getCatalogNameNotList(){
return this.catalogNameNotList;
}
/**
* 设置 目录名称
* @param catalogNameNotList
*/
public void setCatalogNameNotList(List<String> catalogNameNotList){
this.catalogNameNotList = catalogNameNotList;
}
/** /**
* 获取 证照名称 * 获取 证照名称
* @return certificateNameList * @return certificateNameList
...@@ -311,6 +432,23 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -311,6 +432,23 @@ public class PrintLogQuery extends PrintLogEntity {
public void setCertificateNameList(List<String> certificateNameList){ public void setCertificateNameList(List<String> certificateNameList){
this.certificateNameList = 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 * @return certificateCodeList
...@@ -326,6 +464,23 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -326,6 +464,23 @@ public class PrintLogQuery extends PrintLogEntity {
public void setCertificateCodeList(List<String> certificateCodeList){ public void setCertificateCodeList(List<String> certificateCodeList){
this.certificateCodeList = 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 * @return enterpriseNameList
...@@ -341,6 +496,23 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -341,6 +496,23 @@ public class PrintLogQuery extends PrintLogEntity {
public void setEnterpriseNameList(List<String> enterpriseNameList){ public void setEnterpriseNameList(List<String> enterpriseNameList){
this.enterpriseNameList = 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 * @return holderNameList
...@@ -356,6 +528,23 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -356,6 +528,23 @@ public class PrintLogQuery extends PrintLogEntity {
public void setHolderNameList(List<String> holderNameList){ public void setHolderNameList(List<String> holderNameList){
this.holderNameList = 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 * @return holderIDCardNoList
...@@ -371,6 +560,23 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -371,6 +560,23 @@ public class PrintLogQuery extends PrintLogEntity {
public void setHolderIDCardNoList(List<String> holderIDCardNoList){ public void setHolderIDCardNoList(List<String> holderIDCardNoList){
this.holderIDCardNoList = 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 * @return pickerNameList
...@@ -386,6 +592,23 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -386,6 +592,23 @@ public class PrintLogQuery extends PrintLogEntity {
public void setPickerNameList(List<String> pickerNameList){ public void setPickerNameList(List<String> pickerNameList){
this.pickerNameList = pickerNameList; this.pickerNameList = pickerNameList;
} }
/**
* 获取 取件人姓名
* @return pickerNameNotList
*/
public List<String> getPickerNameNotList(){
return this.pickerNameNotList;
}
/**
* 设置 取件人姓名
* @param pickerNameNotList
*/
public void setPickerNameNotList(List<String> pickerNameNotList){
this.pickerNameNotList = pickerNameNotList;
}
/** /**
* 获取 取件人证件号码 * 获取 取件人证件号码
* @return pickerIDCardNoList * @return pickerIDCardNoList
...@@ -401,8 +624,25 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -401,8 +624,25 @@ public class PrintLogQuery extends PrintLogEntity {
public void setPickerIDCardNoList(List<String> pickerIDCardNoList){ public void setPickerIDCardNoList(List<String> pickerIDCardNoList){
this.pickerIDCardNoList = pickerIDCardNoList; this.pickerIDCardNoList = pickerIDCardNoList;
} }
/**
* 获取 取件人证件号码
* @return pickerIDCardNoNotList
*/
public List<String> getPickerIDCardNoNotList(){
return this.pickerIDCardNoNotList;
}
/**
* 设置 取件人证件号码
* @param pickerIDCardNoNotList
*/
public void setPickerIDCardNoNotList(List<String> pickerIDCardNoNotList){
this.pickerIDCardNoNotList = pickerIDCardNoNotList;
}
/** /**
* 获取 开始 打印状态1打印成功2失败 * 获取 开始 打印状态1打印成功0失败
* @return printStatusStart * @return printStatusStart
*/ */
public Integer getPrintStatusStart(){ public Integer getPrintStatusStart(){
...@@ -410,7 +650,7 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -410,7 +650,7 @@ public class PrintLogQuery extends PrintLogEntity {
} }
/** /**
* 设置 开始 打印状态1打印成功2失败 * 设置 开始 打印状态1打印成功0失败
* @param printStatusStart * @param printStatusStart
*/ */
public void setPrintStatusStart(Integer printStatusStart){ public void setPrintStatusStart(Integer printStatusStart){
...@@ -418,7 +658,7 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -418,7 +658,7 @@ public class PrintLogQuery extends PrintLogEntity {
} }
/** /**
* 获取 结束 打印状态1打印成功2失败 * 获取 结束 打印状态1打印成功0失败
* @return $printStatusEnd * @return $printStatusEnd
*/ */
public Integer getPrintStatusEnd(){ public Integer getPrintStatusEnd(){
...@@ -426,7 +666,7 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -426,7 +666,7 @@ public class PrintLogQuery extends PrintLogEntity {
} }
/** /**
* 设置 结束 打印状态1打印成功2失败 * 设置 结束 打印状态1打印成功0失败
* @param printStatusEnd * @param printStatusEnd
*/ */
public void setPrintStatusEnd(Integer printStatusEnd){ public void setPrintStatusEnd(Integer printStatusEnd){
...@@ -434,7 +674,7 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -434,7 +674,7 @@ public class PrintLogQuery extends PrintLogEntity {
} }
/** /**
* 获取 增加 打印状态1打印成功2失败 * 获取 增加 打印状态1打印成功0失败
* @return printStatusIncrement * @return printStatusIncrement
*/ */
public Integer getPrintStatusIncrement(){ public Integer getPrintStatusIncrement(){
...@@ -442,7 +682,7 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -442,7 +682,7 @@ public class PrintLogQuery extends PrintLogEntity {
} }
/** /**
* 设置 增加 打印状态1打印成功2失败 * 设置 增加 打印状态1打印成功0失败
* @param printStatusIncrement * @param printStatusIncrement
*/ */
public void setPrintStatusIncrement(Integer printStatusIncrement){ public void setPrintStatusIncrement(Integer printStatusIncrement){
...@@ -450,7 +690,7 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -450,7 +690,7 @@ public class PrintLogQuery extends PrintLogEntity {
} }
/** /**
* 获取 打印状态1打印成功2失败 * 获取 打印状态1打印成功0失败
* @return printStatusList * @return printStatusList
*/ */
public List<Integer> getPrintStatusList(){ public List<Integer> getPrintStatusList(){
...@@ -458,13 +698,30 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -458,13 +698,30 @@ public class PrintLogQuery extends PrintLogEntity {
} }
/** /**
* 设置 打印状态1打印成功2失败 * 设置 打印状态1打印成功0失败
* @param printStatusList * @param printStatusList
*/ */
public void setPrintStatusList(List<Integer> printStatusList){ public void setPrintStatusList(List<Integer> printStatusList){
this.printStatusList = printStatusList; this.printStatusList = printStatusList;
} }
/**
* 获取 打印状态1打印成功0失败
* @return printStatusNotList
*/
public List<Integer> getPrintStatusNotList(){
return this.printStatusNotList;
}
/**
* 设置 打印状态1打印成功0失败
* @param printStatusNotList
*/
public void setPrintStatusNotList(List<Integer> printStatusNotList){
this.printStatusNotList = printStatusNotList;
}
/** /**
* 获取 开始 打印时间 * 获取 开始 打印时间
* @return printDateStart * @return printDateStart
...@@ -512,6 +769,23 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -512,6 +769,23 @@ public class PrintLogQuery extends PrintLogEntity {
public void setStatusRemarkList(List<String> statusRemarkList){ public void setStatusRemarkList(List<String> statusRemarkList){
this.statusRemarkList = statusRemarkList; this.statusRemarkList = statusRemarkList;
} }
/**
* 获取 打印结果描述
* @return statusRemarkNotList
*/
public List<String> getStatusRemarkNotList(){
return this.statusRemarkNotList;
}
/**
* 设置 打印结果描述
* @param statusRemarkNotList
*/
public void setStatusRemarkNotList(List<String> statusRemarkNotList){
this.statusRemarkNotList = statusRemarkNotList;
}
/** /**
* 获取 开始 打印设备 * 获取 开始 打印设备
* @return deviceIdStart * @return deviceIdStart
...@@ -576,6 +850,23 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -576,6 +850,23 @@ public class PrintLogQuery extends PrintLogEntity {
this.deviceIdList = deviceIdList; this.deviceIdList = deviceIdList;
} }
/**
* 获取 打印设备
* @return deviceIdNotList
*/
public List<Long> getDeviceIdNotList(){
return this.deviceIdNotList;
}
/**
* 设置 打印设备
* @param deviceIdNotList
*/
public void setDeviceIdNotList(List<Long> deviceIdNotList){
this.deviceIdNotList = deviceIdNotList;
}
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @return createUserIdStart * @return createUserIdStart
...@@ -640,6 +931,23 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -640,6 +931,23 @@ public class PrintLogQuery extends PrintLogEntity {
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
} }
/**
* 获取 创建用户
* @return createUserIdNotList
*/
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
...@@ -736,6 +1044,23 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -736,6 +1044,23 @@ public class PrintLogQuery extends PrintLogEntity {
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
} }
/**
* 获取 更新用户
* @return updateUserIdNotList
*/
public List<Long> getUpdateUserIdNotList(){
return this.updateUserIdNotList;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
}
/** /**
* 获取 开始 更新时间 * 获取 开始 更新时间
* @return updateTimeStart * @return updateTimeStart
...@@ -768,6 +1093,87 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -768,6 +1093,87 @@ public class PrintLogQuery extends PrintLogEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 开始 站点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;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -813,6 +1219,15 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -813,6 +1219,15 @@ public class PrintLogQuery extends PrintLogEntity {
return this; return this;
} }
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public PrintLogQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/** /**
* 设置 证照目录ID * 设置 证照目录ID
* @param catalogId * @param catalogId
...@@ -858,6 +1273,15 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -858,6 +1273,15 @@ public class PrintLogQuery extends PrintLogEntity {
return this; return this;
} }
/**
* 设置 证照目录ID
* @param catalogIdNotList
*/
public PrintLogQuery catalogIdNotList(List<Long> catalogIdNotList){
this.catalogIdNotList = catalogIdNotList;
return this;
}
/** /**
* 设置 证照目录编号 * 设置 证照目录编号
...@@ -1030,7 +1454,7 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -1030,7 +1454,7 @@ public class PrintLogQuery extends PrintLogEntity {
} }
/** /**
* 设置 打印状态1打印成功2失败 * 设置 打印状态1打印成功0失败
* @param printStatus * @param printStatus
*/ */
public PrintLogQuery printStatus(Integer printStatus){ public PrintLogQuery printStatus(Integer printStatus){
...@@ -1039,7 +1463,7 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -1039,7 +1463,7 @@ public class PrintLogQuery extends PrintLogEntity {
} }
/** /**
* 设置 开始 打印状态1打印成功2失败 * 设置 开始 打印状态1打印成功0失败
* @param printStatusStart * @param printStatusStart
*/ */
public PrintLogQuery printStatusStart(Integer printStatusStart){ public PrintLogQuery printStatusStart(Integer printStatusStart){
...@@ -1048,7 +1472,7 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -1048,7 +1472,7 @@ public class PrintLogQuery extends PrintLogEntity {
} }
/** /**
* 设置 结束 打印状态1打印成功2失败 * 设置 结束 打印状态1打印成功0失败
* @param printStatusEnd * @param printStatusEnd
*/ */
public PrintLogQuery printStatusEnd(Integer printStatusEnd){ public PrintLogQuery printStatusEnd(Integer printStatusEnd){
...@@ -1057,7 +1481,7 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -1057,7 +1481,7 @@ public class PrintLogQuery extends PrintLogEntity {
} }
/** /**
* 设置 增加 打印状态1打印成功2失败 * 设置 增加 打印状态1打印成功0失败
* @param printStatusIncrement * @param printStatusIncrement
*/ */
public PrintLogQuery printStatusIncrement(Integer printStatusIncrement){ public PrintLogQuery printStatusIncrement(Integer printStatusIncrement){
...@@ -1066,7 +1490,7 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -1066,7 +1490,7 @@ public class PrintLogQuery extends PrintLogEntity {
} }
/** /**
* 设置 打印状态1打印成功2失败 * 设置 打印状态1打印成功0失败
* @param printStatusList * @param printStatusList
*/ */
public PrintLogQuery printStatusList(List<Integer> printStatusList){ public PrintLogQuery printStatusList(List<Integer> printStatusList){
...@@ -1074,6 +1498,15 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -1074,6 +1498,15 @@ public class PrintLogQuery extends PrintLogEntity {
return this; return this;
} }
/**
* 设置 打印状态1打印成功0失败
* @param printStatusNotList
*/
public PrintLogQuery printStatusNotList(List<Integer> printStatusNotList){
this.printStatusNotList = printStatusNotList;
return this;
}
/** /**
...@@ -1139,6 +1572,15 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -1139,6 +1572,15 @@ public class PrintLogQuery extends PrintLogEntity {
return this; return this;
} }
/**
* 设置 打印设备
* @param deviceIdNotList
*/
public PrintLogQuery deviceIdNotList(List<Long> deviceIdNotList){
this.deviceIdNotList = deviceIdNotList;
return this;
}
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserId * @param createUserId
...@@ -1184,6 +1626,15 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -1184,6 +1626,15 @@ public class PrintLogQuery extends PrintLogEntity {
return this; return this;
} }
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public PrintLogQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/** /**
* 设置 更新用户 * 设置 更新用户
...@@ -1230,6 +1681,69 @@ public class PrintLogQuery extends PrintLogEntity { ...@@ -1230,6 +1681,69 @@ public class PrintLogQuery extends PrintLogEntity {
return this; return this;
} }
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public PrintLogQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
return this;
}
/**
* 设置 站点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;
}
/** /**
* 获取 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)
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintWaitQueueEntity.java
View file @ 4018c60f
...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel; ...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.record.model.vo.PrintWaitQueueVo; import com.mortals.xhx.module.record.model.vo.PrintWaitQueueVo;
/** /**
* 证照打印记录实体对象 * 证照打印记录实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-04 * @date 2023-05-14
*/ */
public class PrintWaitQueueEntity extends PrintWaitQueueVo { public class PrintWaitQueueEntity extends PrintWaitQueueVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -80,6 +80,10 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo { ...@@ -80,6 +80,10 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
* 允许打印次数 * 允许打印次数
*/ */
private Integer total; private Integer total;
/**
* 站点id
*/
private Long siteId;
...@@ -308,6 +312,20 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo { ...@@ -308,6 +312,20 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
public void setTotal(Integer total){ public void setTotal(Integer total){
this.total = total; this.total = total;
} }
/**
* 获取 站点id
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点id
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
...@@ -346,6 +364,7 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo { ...@@ -346,6 +364,7 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
sb.append(",certificateUrl:").append(getCertificateUrl()); sb.append(",certificateUrl:").append(getCertificateUrl());
sb.append(",printStatus:").append(getPrintStatus()); sb.append(",printStatus:").append(getPrintStatus());
sb.append(",total:").append(getTotal()); sb.append(",total:").append(getTotal());
sb.append(",siteId:").append(getSiteId());
return sb.toString(); return sb.toString();
} }
...@@ -382,5 +401,7 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo { ...@@ -382,5 +401,7 @@ public class PrintWaitQueueEntity extends PrintWaitQueueVo {
this.printStatus = 0; this.printStatus = 0;
this.total = 1; this.total = 1;
this.siteId = null;
} }
} }
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/PrintWaitQueueQuery.java
View file @ 4018c60f
...@@ -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.PrintWaitQueueEntity; import com.mortals.xhx.module.record.model.PrintWaitQueueEntity;
/** /**
* 证照打印记录查询对象 * 证照打印记录查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-04 * @date 2023-05-14
*/ */
public class PrintWaitQueueQuery extends PrintWaitQueueEntity { public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -21,6 +21,9 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -21,6 +21,9 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
/** 序号，主键，自增长列表 */ /** 序号，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 证照档案ID */ /** 开始 证照档案ID */
private Long recordIdStart; private Long recordIdStart;
...@@ -33,6 +36,9 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -33,6 +36,9 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
/** 证照档案ID列表 */ /** 证照档案ID列表 */
private List <Long> recordIdList; private List <Long> recordIdList;
/** 证照档案ID排除列表 */
private List <Long> recordIdNotList;
/** 开始 申请ID */ /** 开始 申请ID */
private Long applyIdStart; private Long applyIdStart;
...@@ -45,6 +51,9 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -45,6 +51,9 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
/** 申请ID列表 */ /** 申请ID列表 */
private List <Long> applyIdList; private List <Long> applyIdList;
/** 申请ID排除列表 */
private List <Long> applyIdNotList;
/** 开始 证照目录ID */ /** 开始 证照目录ID */
private Long catalogIdStart; private Long catalogIdStart;
...@@ -57,39 +66,64 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -57,39 +66,64 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
/** 证照目录ID列表 */ /** 证照目录ID列表 */
private List <Long> catalogIdList; private List <Long> catalogIdList;
/** 证照目录ID排除列表 */
private List <Long> catalogIdNotList;
/** 证照目录编号 */ /** 证照目录编号 */
private List<String> catalogCodeList; private List<String> catalogCodeList;
/** 证照目录编号排除列表 */
private List <String> catalogCodeNotList;
/** 目录名称 */ /** 目录名称 */
private List<String> catalogNameList; private List<String> catalogNameList;
/** 目录名称排除列表 */
private List <String> catalogNameNotList;
/** 证照名称 */ /** 证照名称 */
private List<String> certificateNameList; private List<String> certificateNameList;
/** 证照名称排除列表 */
private List <String> certificateNameNotList;
/** 证照编号 */ /** 证照编号 */
private List<String> certificateCodeList; private List<String> certificateCodeList;
/** 证照编号排除列表 */
private List <String> certificateCodeNotList;
/** 企业名称 */ /** 企业名称 */
private List<String> enterpriseNameList; private List<String> enterpriseNameList;
/** 企业名称排除列表 */
private List <String> enterpriseNameNotList;
/** 持有者姓名 */ /** 持有者姓名 */
private List<String> holderNameList; private List<String> holderNameList;
/** 持有者姓名排除列表 */
private List <String> holderNameNotList;
/** 持有者证件号码 */ /** 持有者证件号码 */
private List<String> holderIDCardNoList; private List<String> holderIDCardNoList;
/** 持有者证件号码排除列表 */
private List <String> holderIDCardNoNotList;
/** 取件人姓名 */ /** 取件人姓名 */
private List<String> pickerNameList; private List<String> pickerNameList;
/** 取件人姓名排除列表 */
private List <String> pickerNameNotList;
/** 取件人证件号码 */ /** 取件人证件号码 */
private List<String> pickerIDCardNoList; private List<String> pickerIDCardNoList;
/** 取件人证件号码排除列表 */
private List <String> pickerIDCardNoNotList;
/** 证件预览地址 */ /** 证件预览地址 */
private List<String> previewUrlList; private List<String> previewUrlList;
/** 证件预览地址排除列表 */
private List <String> previewUrlNotList;
/** 证件附件地址 */ /** 证件附件地址 */
private List<String> certificateUrlList; private List<String> certificateUrlList;
/** 证件附件地址排除列表 */
private List <String> certificateUrlNotList;
/** 开始 是否完成打印0否1是 */ /** 开始 是否完成打印0否1是 */
private Integer printStatusStart; private Integer printStatusStart;
...@@ -102,6 +136,9 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -102,6 +136,9 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
/** 是否完成打印0否1是列表 */ /** 是否完成打印0否1是列表 */
private List <Integer> printStatusList; private List <Integer> printStatusList;
/** 是否完成打印0否1是排除列表 */
private List <Integer> printStatusNotList;
/** 开始 允许打印次数 */ /** 开始 允许打印次数 */
private Integer totalStart; private Integer totalStart;
...@@ -114,6 +151,9 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -114,6 +151,9 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
/** 允许打印次数列表 */ /** 允许打印次数列表 */
private List <Integer> totalList; private List <Integer> totalList;
/** 允许打印次数排除列表 */
private List <Integer> totalNotList;
/** 开始 创建用户 */ /** 开始 创建用户 */
private Long createUserIdStart; private Long createUserIdStart;
...@@ -126,6 +166,9 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -126,6 +166,9 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
/** 创建用户列表 */ /** 创建用户列表 */
private List <Long> createUserIdList; private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -144,12 +187,30 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -144,12 +187,30 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
/** 更新用户列表 */ /** 更新用户列表 */
private List <Long> updateUserIdList; private List <Long> updateUserIdList;
/** 更新用户排除列表 */
private List <Long> updateUserIdNotList;
/** 开始 更新时间 */ /** 开始 更新时间 */
private String updateTimeStart; private String updateTimeStart;
/** 结束 更新时间 */ /** 结束 更新时间 */
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;
/** 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<PrintWaitQueueQuery> orConditionList; private List<PrintWaitQueueQuery> orConditionList;
...@@ -222,6 +283,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -222,6 +283,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
this.idList = idList; this.idList = idList;
} }
/**
* 获取 序号，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/** /**
* 获取 开始 证照档案ID * 获取 开始 证照档案ID
* @return recordIdStart * @return recordIdStart
...@@ -286,6 +364,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -286,6 +364,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
this.recordIdList = recordIdList; this.recordIdList = recordIdList;
} }
/**
* 获取 证照档案ID
* @return recordIdNotList
*/
public List<Long> getRecordIdNotList(){
return this.recordIdNotList;
}
/**
* 设置 证照档案ID
* @param recordIdNotList
*/
public void setRecordIdNotList(List<Long> recordIdNotList){
this.recordIdNotList = recordIdNotList;
}
/** /**
* 获取 开始 申请ID * 获取 开始 申请ID
* @return applyIdStart * @return applyIdStart
...@@ -350,6 +445,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -350,6 +445,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
this.applyIdList = applyIdList; this.applyIdList = applyIdList;
} }
/**
* 获取 申请ID
* @return applyIdNotList
*/
public List<Long> getApplyIdNotList(){
return this.applyIdNotList;
}
/**
* 设置 申请ID
* @param applyIdNotList
*/
public void setApplyIdNotList(List<Long> applyIdNotList){
this.applyIdNotList = applyIdNotList;
}
/** /**
* 获取 开始 证照目录ID * 获取 开始 证照目录ID
* @return catalogIdStart * @return catalogIdStart
...@@ -414,6 +526,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -414,6 +526,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
this.catalogIdList = catalogIdList; this.catalogIdList = catalogIdList;
} }
/**
* 获取 证照目录ID
* @return catalogIdNotList
*/
public List<Long> getCatalogIdNotList(){
return this.catalogIdNotList;
}
/**
* 设置 证照目录ID
* @param catalogIdNotList
*/
public void setCatalogIdNotList(List<Long> catalogIdNotList){
this.catalogIdNotList = catalogIdNotList;
}
/** /**
* 获取 证照目录编号 * 获取 证照目录编号
* @return catalogCodeList * @return catalogCodeList
...@@ -429,6 +558,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -429,6 +558,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
public void setCatalogCodeList(List<String> catalogCodeList){ public void setCatalogCodeList(List<String> catalogCodeList){
this.catalogCodeList = catalogCodeList; this.catalogCodeList = catalogCodeList;
} }
/**
* 获取 证照目录编号
* @return catalogCodeNotList
*/
public List<String> getCatalogCodeNotList(){
return this.catalogCodeNotList;
}
/**
* 设置 证照目录编号
* @param catalogCodeNotList
*/
public void setCatalogCodeNotList(List<String> catalogCodeNotList){
this.catalogCodeNotList = catalogCodeNotList;
}
/** /**
* 获取 目录名称 * 获取 目录名称
* @return catalogNameList * @return catalogNameList
...@@ -444,6 +590,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -444,6 +590,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
public void setCatalogNameList(List<String> catalogNameList){ public void setCatalogNameList(List<String> catalogNameList){
this.catalogNameList = catalogNameList; this.catalogNameList = catalogNameList;
} }
/**
* 获取 目录名称
* @return catalogNameNotList
*/
public List<String> getCatalogNameNotList(){
return this.catalogNameNotList;
}
/**
* 设置 目录名称
* @param catalogNameNotList
*/
public void setCatalogNameNotList(List<String> catalogNameNotList){
this.catalogNameNotList = catalogNameNotList;
}
/** /**
* 获取 证照名称 * 获取 证照名称
* @return certificateNameList * @return certificateNameList
...@@ -459,6 +622,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -459,6 +622,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
public void setCertificateNameList(List<String> certificateNameList){ public void setCertificateNameList(List<String> certificateNameList){
this.certificateNameList = 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 * @return certificateCodeList
...@@ -474,6 +654,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -474,6 +654,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
public void setCertificateCodeList(List<String> certificateCodeList){ public void setCertificateCodeList(List<String> certificateCodeList){
this.certificateCodeList = 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 * @return enterpriseNameList
...@@ -489,6 +686,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -489,6 +686,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
public void setEnterpriseNameList(List<String> enterpriseNameList){ public void setEnterpriseNameList(List<String> enterpriseNameList){
this.enterpriseNameList = 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 * @return holderNameList
...@@ -504,6 +718,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -504,6 +718,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
public void setHolderNameList(List<String> holderNameList){ public void setHolderNameList(List<String> holderNameList){
this.holderNameList = 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 * @return holderIDCardNoList
...@@ -519,6 +750,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -519,6 +750,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
public void setHolderIDCardNoList(List<String> holderIDCardNoList){ public void setHolderIDCardNoList(List<String> holderIDCardNoList){
this.holderIDCardNoList = 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 * @return pickerNameList
...@@ -534,6 +782,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -534,6 +782,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
public void setPickerNameList(List<String> pickerNameList){ public void setPickerNameList(List<String> pickerNameList){
this.pickerNameList = pickerNameList; this.pickerNameList = pickerNameList;
} }
/**
* 获取 取件人姓名
* @return pickerNameNotList
*/
public List<String> getPickerNameNotList(){
return this.pickerNameNotList;
}
/**
* 设置 取件人姓名
* @param pickerNameNotList
*/
public void setPickerNameNotList(List<String> pickerNameNotList){
this.pickerNameNotList = pickerNameNotList;
}
/** /**
* 获取 取件人证件号码 * 获取 取件人证件号码
* @return pickerIDCardNoList * @return pickerIDCardNoList
...@@ -549,6 +814,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -549,6 +814,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
public void setPickerIDCardNoList(List<String> pickerIDCardNoList){ public void setPickerIDCardNoList(List<String> pickerIDCardNoList){
this.pickerIDCardNoList = pickerIDCardNoList; this.pickerIDCardNoList = pickerIDCardNoList;
} }
/**
* 获取 取件人证件号码
* @return pickerIDCardNoNotList
*/
public List<String> getPickerIDCardNoNotList(){
return this.pickerIDCardNoNotList;
}
/**
* 设置 取件人证件号码
* @param pickerIDCardNoNotList
*/
public void setPickerIDCardNoNotList(List<String> pickerIDCardNoNotList){
this.pickerIDCardNoNotList = pickerIDCardNoNotList;
}
/** /**
* 获取 证件预览地址 * 获取 证件预览地址
* @return previewUrlList * @return previewUrlList
...@@ -564,6 +846,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -564,6 +846,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
public void setPreviewUrlList(List<String> previewUrlList){ public void setPreviewUrlList(List<String> previewUrlList){
this.previewUrlList = previewUrlList; this.previewUrlList = previewUrlList;
} }
/**
* 获取 证件预览地址
* @return previewUrlNotList
*/
public List<String> getPreviewUrlNotList(){
return this.previewUrlNotList;
}
/**
* 设置 证件预览地址
* @param previewUrlNotList
*/
public void setPreviewUrlNotList(List<String> previewUrlNotList){
this.previewUrlNotList = previewUrlNotList;
}
/** /**
* 获取 证件附件地址 * 获取 证件附件地址
* @return certificateUrlList * @return certificateUrlList
...@@ -579,6 +878,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -579,6 +878,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
public void setCertificateUrlList(List<String> certificateUrlList){ public void setCertificateUrlList(List<String> certificateUrlList){
this.certificateUrlList = certificateUrlList; this.certificateUrlList = certificateUrlList;
} }
/**
* 获取 证件附件地址
* @return certificateUrlNotList
*/
public List<String> getCertificateUrlNotList(){
return this.certificateUrlNotList;
}
/**
* 设置 证件附件地址
* @param certificateUrlNotList
*/
public void setCertificateUrlNotList(List<String> certificateUrlNotList){
this.certificateUrlNotList = certificateUrlNotList;
}
/** /**
* 获取 开始 是否完成打印0否1是 * 获取 开始 是否完成打印0否1是
* @return printStatusStart * @return printStatusStart
...@@ -643,6 +959,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -643,6 +959,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
this.printStatusList = printStatusList; this.printStatusList = printStatusList;
} }
/**
* 获取 是否完成打印0否1是
* @return printStatusNotList
*/
public List<Integer> getPrintStatusNotList(){
return this.printStatusNotList;
}
/**
* 设置 是否完成打印0否1是
* @param printStatusNotList
*/
public void setPrintStatusNotList(List<Integer> printStatusNotList){
this.printStatusNotList = printStatusNotList;
}
/** /**
* 获取 开始 允许打印次数 * 获取 开始 允许打印次数
* @return totalStart * @return totalStart
...@@ -707,6 +1040,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -707,6 +1040,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
this.totalList = totalList; this.totalList = totalList;
} }
/**
* 获取 允许打印次数
* @return totalNotList
*/
public List<Integer> getTotalNotList(){
return this.totalNotList;
}
/**
* 设置 允许打印次数
* @param totalNotList
*/
public void setTotalNotList(List<Integer> totalNotList){
this.totalNotList = totalNotList;
}
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @return createUserIdStart * @return createUserIdStart
...@@ -771,6 +1121,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -771,6 +1121,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
} }
/**
* 获取 创建用户
* @return createUserIdNotList
*/
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
...@@ -867,6 +1234,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -867,6 +1234,23 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
} }
/**
* 获取 更新用户
* @return updateUserIdNotList
*/
public List<Long> getUpdateUserIdNotList(){
return this.updateUserIdNotList;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
}
/** /**
* 获取 开始 更新时间 * 获取 开始 更新时间
* @return updateTimeStart * @return updateTimeStart
...@@ -899,6 +1283,87 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -899,6 +1283,87 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 开始 站点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;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -944,6 +1409,15 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -944,6 +1409,15 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
return this; return this;
} }
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public PrintWaitQueueQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/** /**
* 设置 证照档案ID * 设置 证照档案ID
* @param recordId * @param recordId
...@@ -989,6 +1463,15 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -989,6 +1463,15 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
return this; return this;
} }
/**
* 设置 证照档案ID
* @param recordIdNotList
*/
public PrintWaitQueueQuery recordIdNotList(List<Long> recordIdNotList){
this.recordIdNotList = recordIdNotList;
return this;
}
/** /**
* 设置 申请ID * 设置 申请ID
* @param applyId * @param applyId
...@@ -1034,6 +1517,15 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -1034,6 +1517,15 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
return this; return this;
} }
/**
* 设置 申请ID
* @param applyIdNotList
*/
public PrintWaitQueueQuery applyIdNotList(List<Long> applyIdNotList){
this.applyIdNotList = applyIdNotList;
return this;
}
/** /**
* 设置 证照目录ID * 设置 证照目录ID
* @param catalogId * @param catalogId
...@@ -1079,6 +1571,15 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -1079,6 +1571,15 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
return this; return this;
} }
/**
* 设置 证照目录ID
* @param catalogIdNotList
*/
public PrintWaitQueueQuery catalogIdNotList(List<Long> catalogIdNotList){
this.catalogIdNotList = catalogIdNotList;
return this;
}
/** /**
* 设置 证照目录编号 * 设置 证照目录编号
...@@ -1333,6 +1834,15 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -1333,6 +1834,15 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
return this; return this;
} }
/**
* 设置 是否完成打印0否1是
* @param printStatusNotList
*/
public PrintWaitQueueQuery printStatusNotList(List<Integer> printStatusNotList){
this.printStatusNotList = printStatusNotList;
return this;
}
/** /**
* 设置 允许打印次数 * 设置 允许打印次数
* @param total * @param total
...@@ -1378,6 +1888,15 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -1378,6 +1888,15 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
return this; return this;
} }
/**
* 设置 允许打印次数
* @param totalNotList
*/
public PrintWaitQueueQuery totalNotList(List<Integer> totalNotList){
this.totalNotList = totalNotList;
return this;
}
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserId * @param createUserId
...@@ -1423,6 +1942,15 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -1423,6 +1942,15 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
return this; return this;
} }
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public PrintWaitQueueQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/** /**
* 设置 更新用户 * 设置 更新用户
...@@ -1469,6 +1997,69 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity { ...@@ -1469,6 +1997,69 @@ public class PrintWaitQueueQuery extends PrintWaitQueueEntity {
return this; return this;
} }
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public PrintWaitQueueQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
return this;
}
/**
* 设置 站点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;
}
/** /**
* 获取 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)
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/RecordEntity.java
View file @ 4018c60f
...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel; ...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.record.model.vo.RecordVo; import com.mortals.xhx.module.record.model.vo.RecordVo;
/** /**
* 证照申请实体对象 * 证照申请实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-04 * @date 2023-05-14
*/ */
public class RecordEntity extends RecordVo { public class RecordEntity extends RecordVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -32,6 +32,10 @@ public class RecordEntity extends RecordVo { ...@@ -32,6 +32,10 @@ public class RecordEntity extends RecordVo {
* 档案状态 * 档案状态
*/ */
private Integer recordStatus; private Integer recordStatus;
/**
* 站点id
*/
private Long siteId;
...@@ -92,6 +96,20 @@ public class RecordEntity extends RecordVo { ...@@ -92,6 +96,20 @@ public class RecordEntity extends RecordVo {
public void setRecordStatus(Integer recordStatus){ public void setRecordStatus(Integer recordStatus){
this.recordStatus = recordStatus; this.recordStatus = recordStatus;
} }
/**
* 获取 站点id
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点id
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
...@@ -118,6 +136,7 @@ public class RecordEntity extends RecordVo { ...@@ -118,6 +136,7 @@ public class RecordEntity extends RecordVo {
sb.append(",catalogName:").append(getCatalogName()); sb.append(",catalogName:").append(getCatalogName());
sb.append(",catalogCode:").append(getCatalogCode()); sb.append(",catalogCode:").append(getCatalogCode());
sb.append(",recordStatus:").append(getRecordStatus()); sb.append(",recordStatus:").append(getRecordStatus());
sb.append(",siteId:").append(getSiteId());
return sb.toString(); return sb.toString();
} }
...@@ -130,5 +149,7 @@ public class RecordEntity extends RecordVo { ...@@ -130,5 +149,7 @@ public class RecordEntity extends RecordVo {
this.catalogCode = ""; this.catalogCode = "";
this.recordStatus = 1; this.recordStatus = 1;
this.siteId = null;
} }
} }
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/RecordQuery.java
View file @ 4018c60f
...@@ -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.RecordEntity; import com.mortals.xhx.module.record.model.RecordEntity;
/** /**
* 证照申请查询对象 * 证照申请查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-04 * @date 2023-05-14
*/ */
public class RecordQuery extends RecordEntity { public class RecordQuery extends RecordEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -21,6 +21,9 @@ public class RecordQuery extends RecordEntity { ...@@ -21,6 +21,9 @@ public class RecordQuery extends RecordEntity {
/** 序号，主键，自增长列表 */ /** 序号，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 证照目录ID */ /** 开始 证照目录ID */
private Long catalogIdStart; private Long catalogIdStart;
...@@ -33,12 +36,19 @@ public class RecordQuery extends RecordEntity { ...@@ -33,12 +36,19 @@ public class RecordQuery extends RecordEntity {
/** 证照目录ID列表 */ /** 证照目录ID列表 */
private List <Long> catalogIdList; private List <Long> catalogIdList;
/** 证照目录ID排除列表 */
private List <Long> catalogIdNotList;
/** 目录名称 */ /** 目录名称 */
private List<String> catalogNameList; private List<String> catalogNameList;
/** 目录名称排除列表 */
private List <String> catalogNameNotList;
/** 目录编号 */ /** 目录编号 */
private List<String> catalogCodeList; private List<String> catalogCodeList;
/** 目录编号排除列表 */
private List <String> catalogCodeNotList;
/** 开始 档案状态 */ /** 开始 档案状态 */
private Integer recordStatusStart; private Integer recordStatusStart;
...@@ -51,6 +61,9 @@ public class RecordQuery extends RecordEntity { ...@@ -51,6 +61,9 @@ public class RecordQuery extends RecordEntity {
/** 档案状态列表 */ /** 档案状态列表 */
private List <Integer> recordStatusList; private List <Integer> recordStatusList;
/** 档案状态排除列表 */
private List <Integer> recordStatusNotList;
/** 开始 创建用户 */ /** 开始 创建用户 */
private Long createUserIdStart; private Long createUserIdStart;
...@@ -63,6 +76,9 @@ public class RecordQuery extends RecordEntity { ...@@ -63,6 +76,9 @@ public class RecordQuery extends RecordEntity {
/** 创建用户列表 */ /** 创建用户列表 */
private List <Long> createUserIdList; private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -81,12 +97,30 @@ public class RecordQuery extends RecordEntity { ...@@ -81,12 +97,30 @@ public class RecordQuery extends RecordEntity {
/** 更新用户列表 */ /** 更新用户列表 */
private List <Long> updateUserIdList; private List <Long> updateUserIdList;
/** 更新用户排除列表 */
private List <Long> updateUserIdNotList;
/** 开始 更新时间 */ /** 开始 更新时间 */
private String updateTimeStart; private String updateTimeStart;
/** 结束 更新时间 */ /** 结束 更新时间 */
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;
/** 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<RecordQuery> orConditionList; private List<RecordQuery> orConditionList;
...@@ -159,6 +193,23 @@ public class RecordQuery extends RecordEntity { ...@@ -159,6 +193,23 @@ public class RecordQuery extends RecordEntity {
this.idList = idList; this.idList = idList;
} }
/**
* 获取 序号，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/** /**
* 获取 开始 证照目录ID * 获取 开始 证照目录ID
* @return catalogIdStart * @return catalogIdStart
...@@ -223,6 +274,23 @@ public class RecordQuery extends RecordEntity { ...@@ -223,6 +274,23 @@ public class RecordQuery extends RecordEntity {
this.catalogIdList = catalogIdList; this.catalogIdList = catalogIdList;
} }
/**
* 获取 证照目录ID
* @return catalogIdNotList
*/
public List<Long> getCatalogIdNotList(){
return this.catalogIdNotList;
}
/**
* 设置 证照目录ID
* @param catalogIdNotList
*/
public void setCatalogIdNotList(List<Long> catalogIdNotList){
this.catalogIdNotList = catalogIdNotList;
}
/** /**
* 获取 目录名称 * 获取 目录名称
* @return catalogNameList * @return catalogNameList
...@@ -238,6 +306,23 @@ public class RecordQuery extends RecordEntity { ...@@ -238,6 +306,23 @@ public class RecordQuery extends RecordEntity {
public void setCatalogNameList(List<String> catalogNameList){ public void setCatalogNameList(List<String> catalogNameList){
this.catalogNameList = catalogNameList; this.catalogNameList = catalogNameList;
} }
/**
* 获取 目录名称
* @return catalogNameNotList
*/
public List<String> getCatalogNameNotList(){
return this.catalogNameNotList;
}
/**
* 设置 目录名称
* @param catalogNameNotList
*/
public void setCatalogNameNotList(List<String> catalogNameNotList){
this.catalogNameNotList = catalogNameNotList;
}
/** /**
* 获取 目录编号 * 获取 目录编号
* @return catalogCodeList * @return catalogCodeList
...@@ -253,6 +338,23 @@ public class RecordQuery extends RecordEntity { ...@@ -253,6 +338,23 @@ public class RecordQuery extends RecordEntity {
public void setCatalogCodeList(List<String> catalogCodeList){ public void setCatalogCodeList(List<String> catalogCodeList){
this.catalogCodeList = catalogCodeList; this.catalogCodeList = catalogCodeList;
} }
/**
* 获取 目录编号
* @return catalogCodeNotList
*/
public List<String> getCatalogCodeNotList(){
return this.catalogCodeNotList;
}
/**
* 设置 目录编号
* @param catalogCodeNotList
*/
public void setCatalogCodeNotList(List<String> catalogCodeNotList){
this.catalogCodeNotList = catalogCodeNotList;
}
/** /**
* 获取 开始 档案状态 * 获取 开始 档案状态
* @return recordStatusStart * @return recordStatusStart
...@@ -317,6 +419,23 @@ public class RecordQuery extends RecordEntity { ...@@ -317,6 +419,23 @@ public class RecordQuery extends RecordEntity {
this.recordStatusList = recordStatusList; this.recordStatusList = recordStatusList;
} }
/**
* 获取 档案状态
* @return recordStatusNotList
*/
public List<Integer> getRecordStatusNotList(){
return this.recordStatusNotList;
}
/**
* 设置 档案状态
* @param recordStatusNotList
*/
public void setRecordStatusNotList(List<Integer> recordStatusNotList){
this.recordStatusNotList = recordStatusNotList;
}
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @return createUserIdStart * @return createUserIdStart
...@@ -381,6 +500,23 @@ public class RecordQuery extends RecordEntity { ...@@ -381,6 +500,23 @@ public class RecordQuery extends RecordEntity {
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
} }
/**
* 获取 创建用户
* @return createUserIdNotList
*/
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
...@@ -477,6 +613,23 @@ public class RecordQuery extends RecordEntity { ...@@ -477,6 +613,23 @@ public class RecordQuery extends RecordEntity {
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
} }
/**
* 获取 更新用户
* @return updateUserIdNotList
*/
public List<Long> getUpdateUserIdNotList(){
return this.updateUserIdNotList;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
}
/** /**
* 获取 开始 更新时间 * 获取 开始 更新时间
* @return updateTimeStart * @return updateTimeStart
...@@ -509,6 +662,87 @@ public class RecordQuery extends RecordEntity { ...@@ -509,6 +662,87 @@ public class RecordQuery extends RecordEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 开始 站点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;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -554,6 +788,15 @@ public class RecordQuery extends RecordEntity { ...@@ -554,6 +788,15 @@ public class RecordQuery extends RecordEntity {
return this; return this;
} }
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public RecordQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/** /**
* 设置 证照目录ID * 设置 证照目录ID
* @param catalogId * @param catalogId
...@@ -599,6 +842,15 @@ public class RecordQuery extends RecordEntity { ...@@ -599,6 +842,15 @@ public class RecordQuery extends RecordEntity {
return this; return this;
} }
/**
* 设置 证照目录ID
* @param catalogIdNotList
*/
public RecordQuery catalogIdNotList(List<Long> catalogIdNotList){
this.catalogIdNotList = catalogIdNotList;
return this;
}
/** /**
* 设置 目录名称 * 设置 目录名称
...@@ -682,6 +934,15 @@ public class RecordQuery extends RecordEntity { ...@@ -682,6 +934,15 @@ public class RecordQuery extends RecordEntity {
return this; return this;
} }
/**
* 设置 档案状态
* @param recordStatusNotList
*/
public RecordQuery recordStatusNotList(List<Integer> recordStatusNotList){
this.recordStatusNotList = recordStatusNotList;
return this;
}
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserId * @param createUserId
...@@ -727,6 +988,15 @@ public class RecordQuery extends RecordEntity { ...@@ -727,6 +988,15 @@ public class RecordQuery extends RecordEntity {
return this; return this;
} }
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public RecordQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/** /**
* 设置 更新用户 * 设置 更新用户
...@@ -773,6 +1043,69 @@ public class RecordQuery extends RecordEntity { ...@@ -773,6 +1043,69 @@ public class RecordQuery extends RecordEntity {
return this; return this;
} }
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public RecordQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
return this;
}
/**
* 设置 站点id
* @param siteId
*/
public RecordQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public RecordQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public RecordQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public RecordQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点id
* @param siteIdList
*/
public RecordQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public RecordQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
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)
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/RetainLogEntity.java
View file @ 4018c60f
...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel; ...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.record.model.vo.RetainLogVo; import com.mortals.xhx.module.record.model.vo.RetainLogVo;
/** /**
* 证照持有实体对象 * 证照持有实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-04 * @date 2023-05-14
*/ */
public class RetainLogEntity extends RetainLogVo { public class RetainLogEntity extends RetainLogVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -64,6 +64,10 @@ public class RetainLogEntity extends RetainLogVo { ...@@ -64,6 +64,10 @@ public class RetainLogEntity extends RetainLogVo {
* 证件预览地址 * 证件预览地址
*/ */
private String previewUrl; private String previewUrl;
/**
* 站点id
*/
private Long siteId;
...@@ -236,6 +240,20 @@ public class RetainLogEntity extends RetainLogVo { ...@@ -236,6 +240,20 @@ public class RetainLogEntity extends RetainLogVo {
public void setPreviewUrl(String previewUrl){ public void setPreviewUrl(String previewUrl){
this.previewUrl = previewUrl; this.previewUrl = previewUrl;
} }
/**
* 获取 站点id
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点id
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
...@@ -270,6 +288,7 @@ public class RetainLogEntity extends RetainLogVo { ...@@ -270,6 +288,7 @@ public class RetainLogEntity extends RetainLogVo {
sb.append(",certificateStatus:").append(getCertificateStatus()); sb.append(",certificateStatus:").append(getCertificateStatus());
sb.append(",certificateUrl:").append(getCertificateUrl()); sb.append(",certificateUrl:").append(getCertificateUrl());
sb.append(",previewUrl:").append(getPreviewUrl()); sb.append(",previewUrl:").append(getPreviewUrl());
sb.append(",siteId:").append(getSiteId());
return sb.toString(); return sb.toString();
} }
...@@ -298,5 +317,7 @@ public class RetainLogEntity extends RetainLogVo { ...@@ -298,5 +317,7 @@ public class RetainLogEntity extends RetainLogVo {
this.certificateUrl = ""; this.certificateUrl = "";
this.previewUrl = ""; this.previewUrl = "";
this.siteId = null;
} }
} }
\ No newline at end of file
certificate-manager/src/main/java/com/mortals/xhx/module/record/model/RetainLogQuery.java
View file @ 4018c60f
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.record.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.record.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.record.model.RetainLogEntity; import com.mortals.xhx.module.record.model.RetainLogEntity;
/** /**
* 证照持有查询对象 * 证照持有查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-04 * @date 2023-05-14
*/ */
public class RetainLogQuery extends RetainLogEntity { public class RetainLogQuery extends RetainLogEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -21,6 +21,9 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -21,6 +21,9 @@ public class RetainLogQuery extends RetainLogEntity {
/** 序号，主键，自增长列表 */ /** 序号，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 证照档案ID */ /** 开始 证照档案ID */
private Long recordIdStart; private Long recordIdStart;
...@@ -33,6 +36,9 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -33,6 +36,9 @@ public class RetainLogQuery extends RetainLogEntity {
/** 证照档案ID列表 */ /** 证照档案ID列表 */
private List <Long> recordIdList; private List <Long> recordIdList;
/** 证照档案ID排除列表 */
private List <Long> recordIdNotList;
/** 开始 证照目录ID */ /** 开始 证照目录ID */
private Long catalogIdStart; private Long catalogIdStart;
...@@ -45,27 +51,44 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -45,27 +51,44 @@ public class RetainLogQuery extends RetainLogEntity {
/** 证照目录ID列表 */ /** 证照目录ID列表 */
private List <Long> catalogIdList; private List <Long> catalogIdList;
/** 证照目录ID排除列表 */
private List <Long> catalogIdNotList;
/** 证照目录编号 */ /** 证照目录编号 */
private List<String> catalogCodeList; private List<String> catalogCodeList;
/** 证照目录编号排除列表 */
private List <String> catalogCodeNotList;
/** 目录名称 */ /** 目录名称 */
private List<String> catalogNameList; private List<String> catalogNameList;
/** 目录名称排除列表 */
private List <String> catalogNameNotList;
/** 证照名称 */ /** 证照名称 */
private List<String> certificateNameList; private List<String> certificateNameList;
/** 证照名称排除列表 */
private List <String> certificateNameNotList;
/** 证照编号 */ /** 证照编号 */
private List<String> certificateCodeList; private List<String> certificateCodeList;
/** 证照编号排除列表 */
private List <String> certificateCodeNotList;
/** 企业名称 */ /** 企业名称 */
private List<String> enterpriseNameList; private List<String> enterpriseNameList;
/** 企业名称排除列表 */
private List <String> enterpriseNameNotList;
/** 持有者姓名 */ /** 持有者姓名 */
private List<String> holderNameList; private List<String> holderNameList;
/** 持有者姓名排除列表 */
private List <String> holderNameNotList;
/** 持有者证件号码 */ /** 持有者证件号码 */
private List<String> holderIDCardNoList; private List<String> holderIDCardNoList;
/** 持有者证件号码排除列表 */
private List <String> holderIDCardNoNotList;
/** 开始 证照状态，1正常2注销 */ /** 开始 证照状态，1正常2注销 */
private Integer certificateStatusStart; private Integer certificateStatusStart;
...@@ -78,12 +101,19 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -78,12 +101,19 @@ public class RetainLogQuery extends RetainLogEntity {
/** 证照状态，1正常2注销列表 */ /** 证照状态，1正常2注销列表 */
private List <Integer> certificateStatusList; private List <Integer> certificateStatusList;
/** 证照状态，1正常2注销排除列表 */
private List <Integer> certificateStatusNotList;
/** 证件附件地址 */ /** 证件附件地址 */
private List<String> certificateUrlList; private List<String> certificateUrlList;
/** 证件附件地址排除列表 */
private List <String> certificateUrlNotList;
/** 证件预览地址 */ /** 证件预览地址 */
private List<String> previewUrlList; private List<String> previewUrlList;
/** 证件预览地址排除列表 */
private List <String> previewUrlNotList;
/** 开始 创建用户 */ /** 开始 创建用户 */
private Long createUserIdStart; private Long createUserIdStart;
...@@ -96,6 +126,9 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -96,6 +126,9 @@ public class RetainLogQuery extends RetainLogEntity {
/** 创建用户列表 */ /** 创建用户列表 */
private List <Long> createUserIdList; private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -114,12 +147,30 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -114,12 +147,30 @@ public class RetainLogQuery extends RetainLogEntity {
/** 更新用户列表 */ /** 更新用户列表 */
private List <Long> updateUserIdList; private List <Long> updateUserIdList;
/** 更新用户排除列表 */
private List <Long> updateUserIdNotList;
/** 开始 更新时间 */ /** 开始 更新时间 */
private String updateTimeStart; private String updateTimeStart;
/** 结束 更新时间 */ /** 结束 更新时间 */
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;
/** 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;
...@@ -192,6 +243,23 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -192,6 +243,23 @@ public class RetainLogQuery extends RetainLogEntity {
this.idList = idList; this.idList = idList;
} }
/**
* 获取 序号，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/** /**
* 获取 开始 证照档案ID * 获取 开始 证照档案ID
* @return recordIdStart * @return recordIdStart
...@@ -256,6 +324,23 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -256,6 +324,23 @@ public class RetainLogQuery extends RetainLogEntity {
this.recordIdList = recordIdList; this.recordIdList = recordIdList;
} }
/**
* 获取 证照档案ID
* @return recordIdNotList
*/
public List<Long> getRecordIdNotList(){
return this.recordIdNotList;
}
/**
* 设置 证照档案ID
* @param recordIdNotList
*/
public void setRecordIdNotList(List<Long> recordIdNotList){
this.recordIdNotList = recordIdNotList;
}
/** /**
* 获取 开始 证照目录ID * 获取 开始 证照目录ID
* @return catalogIdStart * @return catalogIdStart
...@@ -320,6 +405,23 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -320,6 +405,23 @@ public class RetainLogQuery extends RetainLogEntity {
this.catalogIdList = catalogIdList; this.catalogIdList = catalogIdList;
} }
/**
* 获取 证照目录ID
* @return catalogIdNotList
*/
public List<Long> getCatalogIdNotList(){
return this.catalogIdNotList;
}
/**
* 设置 证照目录ID
* @param catalogIdNotList
*/
public void setCatalogIdNotList(List<Long> catalogIdNotList){
this.catalogIdNotList = catalogIdNotList;
}
/** /**
* 获取 证照目录编号 * 获取 证照目录编号
* @return catalogCodeList * @return catalogCodeList
...@@ -335,6 +437,23 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -335,6 +437,23 @@ public class RetainLogQuery extends RetainLogEntity {
public void setCatalogCodeList(List<String> catalogCodeList){ public void setCatalogCodeList(List<String> catalogCodeList){
this.catalogCodeList = catalogCodeList; this.catalogCodeList = catalogCodeList;
} }
/**
* 获取 证照目录编号
* @return catalogCodeNotList
*/
public List<String> getCatalogCodeNotList(){
return this.catalogCodeNotList;
}
/**
* 设置 证照目录编号
* @param catalogCodeNotList
*/
public void setCatalogCodeNotList(List<String> catalogCodeNotList){
this.catalogCodeNotList = catalogCodeNotList;
}
/** /**
* 获取 目录名称 * 获取 目录名称
* @return catalogNameList * @return catalogNameList
...@@ -350,6 +469,23 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -350,6 +469,23 @@ public class RetainLogQuery extends RetainLogEntity {
public void setCatalogNameList(List<String> catalogNameList){ public void setCatalogNameList(List<String> catalogNameList){
this.catalogNameList = catalogNameList; this.catalogNameList = catalogNameList;
} }
/**
* 获取 目录名称
* @return catalogNameNotList
*/
public List<String> getCatalogNameNotList(){
return this.catalogNameNotList;
}
/**
* 设置 目录名称
* @param catalogNameNotList
*/
public void setCatalogNameNotList(List<String> catalogNameNotList){
this.catalogNameNotList = catalogNameNotList;
}
/** /**
* 获取 证照名称 * 获取 证照名称
* @return certificateNameList * @return certificateNameList
...@@ -365,6 +501,23 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -365,6 +501,23 @@ public class RetainLogQuery extends RetainLogEntity {
public void setCertificateNameList(List<String> certificateNameList){ public void setCertificateNameList(List<String> certificateNameList){
this.certificateNameList = 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 * @return certificateCodeList
...@@ -380,6 +533,23 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -380,6 +533,23 @@ public class RetainLogQuery extends RetainLogEntity {
public void setCertificateCodeList(List<String> certificateCodeList){ public void setCertificateCodeList(List<String> certificateCodeList){
this.certificateCodeList = 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 * @return enterpriseNameList
...@@ -395,6 +565,23 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -395,6 +565,23 @@ public class RetainLogQuery extends RetainLogEntity {
public void setEnterpriseNameList(List<String> enterpriseNameList){ public void setEnterpriseNameList(List<String> enterpriseNameList){
this.enterpriseNameList = 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 * @return holderNameList
...@@ -410,6 +597,23 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -410,6 +597,23 @@ public class RetainLogQuery extends RetainLogEntity {
public void setHolderNameList(List<String> holderNameList){ public void setHolderNameList(List<String> holderNameList){
this.holderNameList = 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 * @return holderIDCardNoList
...@@ -425,6 +629,23 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -425,6 +629,23 @@ public class RetainLogQuery extends RetainLogEntity {
public void setHolderIDCardNoList(List<String> holderIDCardNoList){ public void setHolderIDCardNoList(List<String> holderIDCardNoList){
this.holderIDCardNoList = holderIDCardNoList; this.holderIDCardNoList = holderIDCardNoList;
} }
/**
* 获取 持有者证件号码
* @return holderIDCardNoNotList
*/
public List<String> getHolderIDCardNoNotList(){
return this.holderIDCardNoNotList;
}
/**
* 设置 持有者证件号码
* @param holderIDCardNoNotList
*/
public void setHolderIDCardNoNotList(List<String> holderIDCardNoNotList){
this.holderIDCardNoNotList = holderIDCardNoNotList;
}
/** /**
* 获取 开始 证照状态，1正常2注销 * 获取 开始 证照状态，1正常2注销
* @return certificateStatusStart * @return certificateStatusStart
...@@ -489,6 +710,23 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -489,6 +710,23 @@ public class RetainLogQuery extends RetainLogEntity {
this.certificateStatusList = certificateStatusList; this.certificateStatusList = certificateStatusList;
} }
/**
* 获取 证照状态，1正常2注销
* @return certificateStatusNotList
*/
public List<Integer> getCertificateStatusNotList(){
return this.certificateStatusNotList;
}
/**
* 设置 证照状态，1正常2注销
* @param certificateStatusNotList
*/
public void setCertificateStatusNotList(List<Integer> certificateStatusNotList){
this.certificateStatusNotList = certificateStatusNotList;
}
/** /**
* 获取 证件附件地址 * 获取 证件附件地址
* @return certificateUrlList * @return certificateUrlList
...@@ -504,6 +742,23 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -504,6 +742,23 @@ public class RetainLogQuery extends RetainLogEntity {
public void setCertificateUrlList(List<String> certificateUrlList){ public void setCertificateUrlList(List<String> certificateUrlList){
this.certificateUrlList = certificateUrlList; this.certificateUrlList = certificateUrlList;
} }
/**
* 获取 证件附件地址
* @return certificateUrlNotList
*/
public List<String> getCertificateUrlNotList(){
return this.certificateUrlNotList;
}
/**
* 设置 证件附件地址
* @param certificateUrlNotList
*/
public void setCertificateUrlNotList(List<String> certificateUrlNotList){
this.certificateUrlNotList = certificateUrlNotList;
}
/** /**
* 获取 证件预览地址 * 获取 证件预览地址
* @return previewUrlList * @return previewUrlList
...@@ -519,6 +774,23 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -519,6 +774,23 @@ public class RetainLogQuery extends RetainLogEntity {
public void setPreviewUrlList(List<String> previewUrlList){ public void setPreviewUrlList(List<String> previewUrlList){
this.previewUrlList = previewUrlList; this.previewUrlList = previewUrlList;
} }
/**
* 获取 证件预览地址
* @return previewUrlNotList
*/
public List<String> getPreviewUrlNotList(){
return this.previewUrlNotList;
}
/**
* 设置 证件预览地址
* @param previewUrlNotList
*/
public void setPreviewUrlNotList(List<String> previewUrlNotList){
this.previewUrlNotList = previewUrlNotList;
}
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @return createUserIdStart * @return createUserIdStart
...@@ -583,6 +855,23 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -583,6 +855,23 @@ public class RetainLogQuery extends RetainLogEntity {
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
} }
/**
* 获取 创建用户
* @return createUserIdNotList
*/
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
...@@ -679,6 +968,23 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -679,6 +968,23 @@ public class RetainLogQuery extends RetainLogEntity {
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
} }
/**
* 获取 更新用户
* @return updateUserIdNotList
*/
public List<Long> getUpdateUserIdNotList(){
return this.updateUserIdNotList;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
}
/** /**
* 获取 开始 更新时间 * 获取 开始 更新时间
* @return updateTimeStart * @return updateTimeStart
...@@ -711,6 +1017,87 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -711,6 +1017,87 @@ public class RetainLogQuery extends RetainLogEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 开始 站点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;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -756,6 +1143,15 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -756,6 +1143,15 @@ public class RetainLogQuery extends RetainLogEntity {
return this; return this;
} }
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public RetainLogQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/** /**
* 设置 证照档案ID * 设置 证照档案ID
* @param recordId * @param recordId
...@@ -801,6 +1197,15 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -801,6 +1197,15 @@ public class RetainLogQuery extends RetainLogEntity {
return this; return this;
} }
/**
* 设置 证照档案ID
* @param recordIdNotList
*/
public RetainLogQuery recordIdNotList(List<Long> recordIdNotList){
this.recordIdNotList = recordIdNotList;
return this;
}
/** /**
* 设置 证照目录ID * 设置 证照目录ID
* @param catalogId * @param catalogId
...@@ -846,6 +1251,15 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -846,6 +1251,15 @@ public class RetainLogQuery extends RetainLogEntity {
return this; return this;
} }
/**
* 设置 证照目录ID
* @param catalogIdNotList
*/
public RetainLogQuery catalogIdNotList(List<Long> catalogIdNotList){
this.catalogIdNotList = catalogIdNotList;
return this;
}
/** /**
* 设置 证照目录编号 * 设置 证照目录编号
...@@ -1024,6 +1438,15 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -1024,6 +1438,15 @@ public class RetainLogQuery extends RetainLogEntity {
return this; return this;
} }
/**
* 设置 证照状态，1正常2注销
* @param certificateStatusNotList
*/
public RetainLogQuery certificateStatusNotList(List<Integer> certificateStatusNotList){
this.certificateStatusNotList = certificateStatusNotList;
return this;
}
/** /**
* 设置 证件附件地址 * 设置 证件附件地址
...@@ -1107,6 +1530,15 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -1107,6 +1530,15 @@ public class RetainLogQuery extends RetainLogEntity {
return this; return this;
} }
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public RetainLogQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/** /**
* 设置 更新用户 * 设置 更新用户
...@@ -1153,6 +1585,69 @@ public class RetainLogQuery extends RetainLogEntity { ...@@ -1153,6 +1585,69 @@ public class RetainLogQuery extends RetainLogEntity {
return this; return this;
} }
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public RetainLogQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
return this;
}
/**
* 设置 站点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;
}
/** /**
* 获取 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)
......
certificate-manager/src/main/java/com/mortals/xhx/module/record/service/impl/PrintWaitQueueServiceImpl.java
View file @ 4018c60f
...@@ -166,6 +166,7 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait ...@@ -166,6 +166,7 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
private void doPrintFail(PrintWaitQueueEntity waitQueueEntity,String statusRemark){ private void doPrintFail(PrintWaitQueueEntity waitQueueEntity,String statusRemark){
Date now = new Date(); Date now = new Date();
PrintLogEntity printLogEntity = new PrintLogEntity(); PrintLogEntity printLogEntity = new PrintLogEntity();
printLogEntity.setSiteId(waitQueueEntity.getSiteId());
printLogEntity.setCatalogId(waitQueueEntity.getCatalogId()); printLogEntity.setCatalogId(waitQueueEntity.getCatalogId());
printLogEntity.setCatalogCode(waitQueueEntity.getCatalogCode()); printLogEntity.setCatalogCode(waitQueueEntity.getCatalogCode());
printLogEntity.setCatalogName(waitQueueEntity.getCatalogName()); printLogEntity.setCatalogName(waitQueueEntity.getCatalogName());
...@@ -188,6 +189,7 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait ...@@ -188,6 +189,7 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
private void doPrintSuccess(PrintWaitQueueEntity waitQueueEntity){ private void doPrintSuccess(PrintWaitQueueEntity waitQueueEntity){
RetainLogEntity retainLogEntity = new RetainLogEntity(); RetainLogEntity retainLogEntity = new RetainLogEntity();
Date now = new Date(); Date now = new Date();
retainLogEntity.setSiteId(waitQueueEntity.getSiteId());
retainLogEntity.setCatalogId(waitQueueEntity.getCatalogId()); retainLogEntity.setCatalogId(waitQueueEntity.getCatalogId());
retainLogEntity.setCatalogCode(waitQueueEntity.getCatalogCode()); retainLogEntity.setCatalogCode(waitQueueEntity.getCatalogCode());
retainLogEntity.setCatalogName(waitQueueEntity.getCatalogName()); retainLogEntity.setCatalogName(waitQueueEntity.getCatalogName());
...@@ -201,6 +203,7 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait ...@@ -201,6 +203,7 @@ public class PrintWaitQueueServiceImpl extends AbstractCRUDServiceImpl<PrintWait
retainLogEntity.setCreateTime(now); retainLogEntity.setCreateTime(now);
PrintLogEntity printLogEntity = new PrintLogEntity(); PrintLogEntity printLogEntity = new PrintLogEntity();
printLogEntity.setSiteId(waitQueueEntity.getSiteId());
printLogEntity.setCatalogId(waitQueueEntity.getCatalogId()); printLogEntity.setCatalogId(waitQueueEntity.getCatalogId());
printLogEntity.setCatalogCode(waitQueueEntity.getCatalogCode()); printLogEntity.setCatalogCode(waitQueueEntity.getCatalogCode());
printLogEntity.setCatalogName(waitQueueEntity.getCatalogName()); printLogEntity.setCatalogName(waitQueueEntity.getCatalogName());
......
certificate-manager/src/main/resources/sqlmap/module/business/BusinessLicenseMapper.xml
View file @ 4018c60f
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="status" column="status" /> <result property="status" column="status" />
<result property="siteId" column="siteId" />
</resultMap> </resultMap>
...@@ -108,23 +109,26 @@ ...@@ -108,23 +109,26 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))">
a.status, a.status,
</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>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="BusinessLicenseEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="BusinessLicenseEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_business_license insert into mortals_xhx_business_license
(ProprietorName,BusinessLicense,TypeSizeName,StartDate,ComposingForm,ManageLocation,ManageRange,RegCode,CredentialsCode,CredentialsType,ProprietorMobile,QrCodeOriginalBase64,QrCodeDuplicateBase64,RegisteredCapital,PaidupCapital,EndDate,dy_zb,dy_fb,createUserId,createTime,updateUserId,updateTime,status) (ProprietorName,BusinessLicense,TypeSizeName,StartDate,ComposingForm,ManageLocation,ManageRange,RegCode,CredentialsCode,CredentialsType,ProprietorMobile,QrCodeOriginalBase64,QrCodeDuplicateBase64,RegisteredCapital,PaidupCapital,EndDate,dy_zb,dy_fb,createUserId,createTime,updateUserId,updateTime,status,siteId)
VALUES VALUES
(#{ProprietorName},#{BusinessLicense},#{TypeSizeName},#{StartDate},#{ComposingForm},#{ManageLocation},#{ManageRange},#{RegCode},#{CredentialsCode},#{CredentialsType},#{ProprietorMobile},#{QrCodeOriginalBase64},#{QrCodeDuplicateBase64},#{RegisteredCapital},#{PaidupCapital},#{EndDate},#{dyZb},#{dyFb},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{status}) (#{ProprietorName},#{BusinessLicense},#{TypeSizeName},#{StartDate},#{ComposingForm},#{ManageLocation},#{ManageRange},#{RegCode},#{CredentialsCode},#{CredentialsType},#{ProprietorMobile},#{QrCodeOriginalBase64},#{QrCodeDuplicateBase64},#{RegisteredCapital},#{PaidupCapital},#{EndDate},#{dyZb},#{dyFb},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{status},#{siteId})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_business_license insert into mortals_xhx_business_license
(ProprietorName,BusinessLicense,TypeSizeName,StartDate,ComposingForm,ManageLocation,ManageRange,RegCode,CredentialsCode,CredentialsType,ProprietorMobile,QrCodeOriginalBase64,QrCodeDuplicateBase64,RegisteredCapital,PaidupCapital,EndDate,dy_zb,dy_fb,createUserId,createTime,updateUserId,updateTime,status) (ProprietorName,BusinessLicense,TypeSizeName,StartDate,ComposingForm,ManageLocation,ManageRange,RegCode,CredentialsCode,CredentialsType,ProprietorMobile,QrCodeOriginalBase64,QrCodeDuplicateBase64,RegisteredCapital,PaidupCapital,EndDate,dy_zb,dy_fb,createUserId,createTime,updateUserId,updateTime,status,siteId)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.ProprietorName},#{item.BusinessLicense},#{item.TypeSizeName},#{item.StartDate},#{item.ComposingForm},#{item.ManageLocation},#{item.ManageRange},#{item.RegCode},#{item.CredentialsCode},#{item.CredentialsType},#{item.ProprietorMobile},#{item.QrCodeOriginalBase64},#{item.QrCodeDuplicateBase64},#{item.RegisteredCapital},#{item.PaidupCapital},#{item.EndDate},#{item.dyZb},#{item.dyFb},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.status}) (#{item.ProprietorName},#{item.BusinessLicense},#{item.TypeSizeName},#{item.StartDate},#{item.ComposingForm},#{item.ManageLocation},#{item.ManageRange},#{item.RegCode},#{item.CredentialsCode},#{item.CredentialsType},#{item.ProprietorMobile},#{item.QrCodeOriginalBase64},#{item.QrCodeDuplicateBase64},#{item.RegisteredCapital},#{item.PaidupCapital},#{item.EndDate},#{item.dyZb},#{item.dyFb},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.status},#{item.siteId})
</foreach> </foreach>
</insert> </insert>
...@@ -218,6 +222,12 @@ ...@@ -218,6 +222,12 @@
<if test="(colPickMode==0 and data.containsKey('statusIncrement')) or (colPickMode==1 and !data.containsKey('statusIncrement'))"> <if test="(colPickMode==0 and data.containsKey('statusIncrement')) or (colPickMode==1 and !data.containsKey('statusIncrement'))">
a.status=ifnull(a.status,0) + #{data.statusIncrement}, a.status=ifnull(a.status,0) + #{data.statusIncrement},
</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>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -416,6 +426,18 @@ ...@@ -416,6 +426,18 @@
</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> </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=")">
...@@ -540,12 +562,18 @@ ...@@ -540,12 +562,18 @@
${_conditionType_} a.id is null ${_conditionType_} a.id is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in ${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart} ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
...@@ -562,12 +590,18 @@ ...@@ -562,12 +590,18 @@
${_conditionType_} a.ProprietorName is null ${_conditionType_} a.ProprietorName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('ProprietorNameList')"> <if test="conditionParamRef.containsKey('ProprietorNameList') and conditionParamRef.ProprietorNameList.size() > 0">
${_conditionType_} a.ProprietorName in ${_conditionType_} a.ProprietorName in
<foreach collection="conditionParamRef.ProprietorNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.ProprietorNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('ProprietorNameNotList') and conditionParamRef.ProprietorNameNotList.size() > 0">
${_conditionType_} a.ProprietorName not in
<foreach collection="conditionParamRef.ProprietorNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('BusinessLicense')"> <if test="conditionParamRef.containsKey('BusinessLicense')">
<if test="conditionParamRef.BusinessLicense != null and conditionParamRef.BusinessLicense != ''"> <if test="conditionParamRef.BusinessLicense != null and conditionParamRef.BusinessLicense != ''">
...@@ -577,12 +611,18 @@ ...@@ -577,12 +611,18 @@
${_conditionType_} a.BusinessLicense is null ${_conditionType_} a.BusinessLicense is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('BusinessLicenseList')"> <if test="conditionParamRef.containsKey('BusinessLicenseList') and conditionParamRef.BusinessLicenseList.size() > 0">
${_conditionType_} a.BusinessLicense in ${_conditionType_} a.BusinessLicense in
<foreach collection="conditionParamRef.BusinessLicenseList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.BusinessLicenseList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('BusinessLicenseNotList') and conditionParamRef.BusinessLicenseNotList.size() > 0">
${_conditionType_} a.BusinessLicense not in
<foreach collection="conditionParamRef.BusinessLicenseNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('TypeSizeName')"> <if test="conditionParamRef.containsKey('TypeSizeName')">
<if test="conditionParamRef.TypeSizeName != null and conditionParamRef.TypeSizeName != ''"> <if test="conditionParamRef.TypeSizeName != null and conditionParamRef.TypeSizeName != ''">
...@@ -592,12 +632,18 @@ ...@@ -592,12 +632,18 @@
${_conditionType_} a.TypeSizeName is null ${_conditionType_} a.TypeSizeName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('TypeSizeNameList')"> <if test="conditionParamRef.containsKey('TypeSizeNameList') and conditionParamRef.TypeSizeNameList.size() > 0">
${_conditionType_} a.TypeSizeName in ${_conditionType_} a.TypeSizeName in
<foreach collection="conditionParamRef.TypeSizeNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.TypeSizeNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('TypeSizeNameNotList') and conditionParamRef.TypeSizeNameNotList.size() > 0">
${_conditionType_} a.TypeSizeName not in
<foreach collection="conditionParamRef.TypeSizeNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('StartDate')"> <if test="conditionParamRef.containsKey('StartDate')">
<if test="conditionParamRef.StartDate != null and conditionParamRef.StartDate != ''"> <if test="conditionParamRef.StartDate != null and conditionParamRef.StartDate != ''">
...@@ -607,12 +653,18 @@ ...@@ -607,12 +653,18 @@
${_conditionType_} a.StartDate is null ${_conditionType_} a.StartDate is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('StartDateList')"> <if test="conditionParamRef.containsKey('StartDateList') and conditionParamRef.StartDateList.size() > 0">
${_conditionType_} a.StartDate in ${_conditionType_} a.StartDate in
<foreach collection="conditionParamRef.StartDateList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.StartDateList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('StartDateNotList') and conditionParamRef.StartDateNotList.size() > 0">
${_conditionType_} a.StartDate not in
<foreach collection="conditionParamRef.StartDateNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('ComposingForm')"> <if test="conditionParamRef.containsKey('ComposingForm')">
<if test="conditionParamRef.ComposingForm != null and conditionParamRef.ComposingForm != ''"> <if test="conditionParamRef.ComposingForm != null and conditionParamRef.ComposingForm != ''">
...@@ -622,12 +674,18 @@ ...@@ -622,12 +674,18 @@
${_conditionType_} a.ComposingForm is null ${_conditionType_} a.ComposingForm is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('ComposingFormList')"> <if test="conditionParamRef.containsKey('ComposingFormList') and conditionParamRef.ComposingFormList.size() > 0">
${_conditionType_} a.ComposingForm in ${_conditionType_} a.ComposingForm in
<foreach collection="conditionParamRef.ComposingFormList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.ComposingFormList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('ComposingFormNotList') and conditionParamRef.ComposingFormNotList.size() > 0">
${_conditionType_} a.ComposingForm not in
<foreach collection="conditionParamRef.ComposingFormNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('ManageLocation')"> <if test="conditionParamRef.containsKey('ManageLocation')">
<if test="conditionParamRef.ManageLocation != null and conditionParamRef.ManageLocation != ''"> <if test="conditionParamRef.ManageLocation != null and conditionParamRef.ManageLocation != ''">
...@@ -637,12 +695,18 @@ ...@@ -637,12 +695,18 @@
${_conditionType_} a.ManageLocation is null ${_conditionType_} a.ManageLocation is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('ManageLocationList')"> <if test="conditionParamRef.containsKey('ManageLocationList') and conditionParamRef.ManageLocationList.size() > 0">
${_conditionType_} a.ManageLocation in ${_conditionType_} a.ManageLocation in
<foreach collection="conditionParamRef.ManageLocationList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.ManageLocationList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('ManageLocationNotList') and conditionParamRef.ManageLocationNotList.size() > 0">
${_conditionType_} a.ManageLocation not in
<foreach collection="conditionParamRef.ManageLocationNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('ManageRange')"> <if test="conditionParamRef.containsKey('ManageRange')">
<if test="conditionParamRef.ManageRange != null and conditionParamRef.ManageRange != ''"> <if test="conditionParamRef.ManageRange != null and conditionParamRef.ManageRange != ''">
...@@ -652,12 +716,18 @@ ...@@ -652,12 +716,18 @@
${_conditionType_} a.ManageRange is null ${_conditionType_} a.ManageRange is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('ManageRangeList')"> <if test="conditionParamRef.containsKey('ManageRangeList') and conditionParamRef.ManageRangeList.size() > 0">
${_conditionType_} a.ManageRange in ${_conditionType_} a.ManageRange in
<foreach collection="conditionParamRef.ManageRangeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.ManageRangeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('ManageRangeNotList') and conditionParamRef.ManageRangeNotList.size() > 0">
${_conditionType_} a.ManageRange not in
<foreach collection="conditionParamRef.ManageRangeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('RegCode')"> <if test="conditionParamRef.containsKey('RegCode')">
<if test="conditionParamRef.RegCode != null and conditionParamRef.RegCode != ''"> <if test="conditionParamRef.RegCode != null and conditionParamRef.RegCode != ''">
...@@ -667,12 +737,18 @@ ...@@ -667,12 +737,18 @@
${_conditionType_} a.RegCode is null ${_conditionType_} a.RegCode is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('RegCodeList')"> <if test="conditionParamRef.containsKey('RegCodeList') and conditionParamRef.RegCodeList.size() > 0">
${_conditionType_} a.RegCode in ${_conditionType_} a.RegCode in
<foreach collection="conditionParamRef.RegCodeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.RegCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('RegCodeNotList') and conditionParamRef.RegCodeNotList.size() > 0">
${_conditionType_} a.RegCode not in
<foreach collection="conditionParamRef.RegCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('CredentialsCode')"> <if test="conditionParamRef.containsKey('CredentialsCode')">
<if test="conditionParamRef.CredentialsCode != null and conditionParamRef.CredentialsCode != ''"> <if test="conditionParamRef.CredentialsCode != null and conditionParamRef.CredentialsCode != ''">
...@@ -682,12 +758,18 @@ ...@@ -682,12 +758,18 @@
${_conditionType_} a.CredentialsCode is null ${_conditionType_} a.CredentialsCode is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('CredentialsCodeList')"> <if test="conditionParamRef.containsKey('CredentialsCodeList') and conditionParamRef.CredentialsCodeList.size() > 0">
${_conditionType_} a.CredentialsCode in ${_conditionType_} a.CredentialsCode in
<foreach collection="conditionParamRef.CredentialsCodeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.CredentialsCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('CredentialsCodeNotList') and conditionParamRef.CredentialsCodeNotList.size() > 0">
${_conditionType_} a.CredentialsCode not in
<foreach collection="conditionParamRef.CredentialsCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('CredentialsType')"> <if test="conditionParamRef.containsKey('CredentialsType')">
<if test="conditionParamRef.CredentialsType != null and conditionParamRef.CredentialsType != ''"> <if test="conditionParamRef.CredentialsType != null and conditionParamRef.CredentialsType != ''">
...@@ -697,12 +779,18 @@ ...@@ -697,12 +779,18 @@
${_conditionType_} a.CredentialsType is null ${_conditionType_} a.CredentialsType is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('CredentialsTypeList')"> <if test="conditionParamRef.containsKey('CredentialsTypeList') and conditionParamRef.CredentialsTypeList.size() > 0">
${_conditionType_} a.CredentialsType in ${_conditionType_} a.CredentialsType in
<foreach collection="conditionParamRef.CredentialsTypeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.CredentialsTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('CredentialsTypeNotList') and conditionParamRef.CredentialsTypeNotList.size() > 0">
${_conditionType_} a.CredentialsType not in
<foreach collection="conditionParamRef.CredentialsTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('ProprietorMobile')"> <if test="conditionParamRef.containsKey('ProprietorMobile')">
<if test="conditionParamRef.ProprietorMobile != null and conditionParamRef.ProprietorMobile != ''"> <if test="conditionParamRef.ProprietorMobile != null and conditionParamRef.ProprietorMobile != ''">
...@@ -712,12 +800,18 @@ ...@@ -712,12 +800,18 @@
${_conditionType_} a.ProprietorMobile is null ${_conditionType_} a.ProprietorMobile is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('ProprietorMobileList')"> <if test="conditionParamRef.containsKey('ProprietorMobileList') and conditionParamRef.ProprietorMobileList.size() > 0">
${_conditionType_} a.ProprietorMobile in ${_conditionType_} a.ProprietorMobile in
<foreach collection="conditionParamRef.ProprietorMobileList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.ProprietorMobileList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('ProprietorMobileNotList') and conditionParamRef.ProprietorMobileNotList.size() > 0">
${_conditionType_} a.ProprietorMobile not in
<foreach collection="conditionParamRef.ProprietorMobileNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('QrCodeOriginalBase64')"> <if test="conditionParamRef.containsKey('QrCodeOriginalBase64')">
<if test="conditionParamRef.QrCodeOriginalBase64 != null and conditionParamRef.QrCodeOriginalBase64 != ''"> <if test="conditionParamRef.QrCodeOriginalBase64 != null and conditionParamRef.QrCodeOriginalBase64 != ''">
...@@ -727,12 +821,18 @@ ...@@ -727,12 +821,18 @@
${_conditionType_} a.QrCodeOriginalBase64 is null ${_conditionType_} a.QrCodeOriginalBase64 is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('QrCodeOriginalBase64List')"> <if test="conditionParamRef.containsKey('QrCodeOriginalBase64List') and conditionParamRef.QrCodeOriginalBase64List.size() > 0">
${_conditionType_} a.QrCodeOriginalBase64 in ${_conditionType_} a.QrCodeOriginalBase64 in
<foreach collection="conditionParamRef.QrCodeOriginalBase64List" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.QrCodeOriginalBase64List" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('QrCodeOriginalBase64NotList') and conditionParamRef.QrCodeOriginalBase64NotList.size() > 0">
${_conditionType_} a.QrCodeOriginalBase64 not in
<foreach collection="conditionParamRef.QrCodeOriginalBase64NotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('QrCodeDuplicateBase64')"> <if test="conditionParamRef.containsKey('QrCodeDuplicateBase64')">
<if test="conditionParamRef.QrCodeDuplicateBase64 != null and conditionParamRef.QrCodeDuplicateBase64 != ''"> <if test="conditionParamRef.QrCodeDuplicateBase64 != null and conditionParamRef.QrCodeDuplicateBase64 != ''">
...@@ -742,12 +842,18 @@ ...@@ -742,12 +842,18 @@
${_conditionType_} a.QrCodeDuplicateBase64 is null ${_conditionType_} a.QrCodeDuplicateBase64 is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('QrCodeDuplicateBase64List')"> <if test="conditionParamRef.containsKey('QrCodeDuplicateBase64List') and conditionParamRef.QrCodeDuplicateBase64List.size() > 0">
${_conditionType_} a.QrCodeDuplicateBase64 in ${_conditionType_} a.QrCodeDuplicateBase64 in
<foreach collection="conditionParamRef.QrCodeDuplicateBase64List" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.QrCodeDuplicateBase64List" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('QrCodeDuplicateBase64NotList') and conditionParamRef.QrCodeDuplicateBase64NotList.size() > 0">
${_conditionType_} a.QrCodeDuplicateBase64 not in
<foreach collection="conditionParamRef.QrCodeDuplicateBase64NotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('RegisteredCapital')"> <if test="conditionParamRef.containsKey('RegisteredCapital')">
<if test="conditionParamRef.RegisteredCapital != null and conditionParamRef.RegisteredCapital != ''"> <if test="conditionParamRef.RegisteredCapital != null and conditionParamRef.RegisteredCapital != ''">
...@@ -757,12 +863,18 @@ ...@@ -757,12 +863,18 @@
${_conditionType_} a.RegisteredCapital is null ${_conditionType_} a.RegisteredCapital is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('RegisteredCapitalList')"> <if test="conditionParamRef.containsKey('RegisteredCapitalList') and conditionParamRef.RegisteredCapitalList.size() > 0">
${_conditionType_} a.RegisteredCapital in ${_conditionType_} a.RegisteredCapital in
<foreach collection="conditionParamRef.RegisteredCapitalList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.RegisteredCapitalList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('RegisteredCapitalNotList') and conditionParamRef.RegisteredCapitalNotList.size() > 0">
${_conditionType_} a.RegisteredCapital not in
<foreach collection="conditionParamRef.RegisteredCapitalNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('PaidupCapital')"> <if test="conditionParamRef.containsKey('PaidupCapital')">
<if test="conditionParamRef.PaidupCapital != null and conditionParamRef.PaidupCapital != ''"> <if test="conditionParamRef.PaidupCapital != null and conditionParamRef.PaidupCapital != ''">
...@@ -772,12 +884,18 @@ ...@@ -772,12 +884,18 @@
${_conditionType_} a.PaidupCapital is null ${_conditionType_} a.PaidupCapital is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('PaidupCapitalList')"> <if test="conditionParamRef.containsKey('PaidupCapitalList') and conditionParamRef.PaidupCapitalList.size() > 0">
${_conditionType_} a.PaidupCapital in ${_conditionType_} a.PaidupCapital in
<foreach collection="conditionParamRef.PaidupCapitalList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.PaidupCapitalList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('PaidupCapitalNotList') and conditionParamRef.PaidupCapitalNotList.size() > 0">
${_conditionType_} a.PaidupCapital not in
<foreach collection="conditionParamRef.PaidupCapitalNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('EndDate')"> <if test="conditionParamRef.containsKey('EndDate')">
<if test="conditionParamRef.EndDate != null and conditionParamRef.EndDate != ''"> <if test="conditionParamRef.EndDate != null and conditionParamRef.EndDate != ''">
...@@ -787,12 +905,18 @@ ...@@ -787,12 +905,18 @@
${_conditionType_} a.EndDate is null ${_conditionType_} a.EndDate is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('EndDateList')"> <if test="conditionParamRef.containsKey('EndDateList') and conditionParamRef.EndDateList.size() > 0">
${_conditionType_} a.EndDate in ${_conditionType_} a.EndDate in
<foreach collection="conditionParamRef.EndDateList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.EndDateList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('EndDateNotList') and conditionParamRef.EndDateNotList.size() > 0">
${_conditionType_} a.EndDate not in
<foreach collection="conditionParamRef.EndDateNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dyZb')"> <if test="conditionParamRef.containsKey('dyZb')">
<if test="conditionParamRef.dyZb != null "> <if test="conditionParamRef.dyZb != null ">
${_conditionType_} a.dy_zb = #{${_conditionParam_}.dyZb} ${_conditionType_} a.dy_zb = #{${_conditionParam_}.dyZb}
...@@ -801,12 +925,18 @@ ...@@ -801,12 +925,18 @@
${_conditionType_} a.dy_zb is null ${_conditionType_} a.dy_zb is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('dyZbList')"> <if test="conditionParamRef.containsKey('dyZbList') and conditionParamRef.dyZbList.size() > 0">
${_conditionType_} a.dy_zb in ${_conditionType_} a.dy_zb in
<foreach collection="conditionParamRef.dyZbList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.dyZbList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('dyZbNotList') and conditionParamRef.dyZbNotList.size() > 0">
${_conditionType_} a.dy_zb not in
<foreach collection="conditionParamRef.dyZbNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dyZbStart') and conditionParamRef.dyZbStart != null"> <if test="conditionParamRef.containsKey('dyZbStart') and conditionParamRef.dyZbStart != null">
${_conditionType_} a.dy_zb <![CDATA[ >= ]]> #{${_conditionParam_}.dyZbStart} ${_conditionType_} a.dy_zb <![CDATA[ >= ]]> #{${_conditionParam_}.dyZbStart}
</if> </if>
...@@ -822,12 +952,18 @@ ...@@ -822,12 +952,18 @@
${_conditionType_} a.dy_fb is null ${_conditionType_} a.dy_fb is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('dyFbList')"> <if test="conditionParamRef.containsKey('dyFbList') and conditionParamRef.dyFbList.size() > 0">
${_conditionType_} a.dy_fb in ${_conditionType_} a.dy_fb in
<foreach collection="conditionParamRef.dyFbList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.dyFbList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('dyFbNotList') and conditionParamRef.dyFbNotList.size() > 0">
${_conditionType_} a.dy_fb not in
<foreach collection="conditionParamRef.dyFbNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dyFbStart') and conditionParamRef.dyFbStart != null"> <if test="conditionParamRef.containsKey('dyFbStart') and conditionParamRef.dyFbStart != null">
${_conditionType_} a.dy_fb <![CDATA[ >= ]]> #{${_conditionParam_}.dyFbStart} ${_conditionType_} a.dy_fb <![CDATA[ >= ]]> #{${_conditionParam_}.dyFbStart}
</if> </if>
...@@ -843,12 +979,18 @@ ...@@ -843,12 +979,18 @@
${_conditionType_} a.createUserId is null ${_conditionType_} a.createUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in ${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if> </if>
...@@ -879,12 +1021,18 @@ ...@@ -879,12 +1021,18 @@
${_conditionType_} a.updateUserId is null ${_conditionType_} a.updateUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdList')"> <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in ${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null"> <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart} ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if> </if>
...@@ -915,12 +1063,18 @@ ...@@ -915,12 +1063,18 @@
${_conditionType_} a.status is null ${_conditionType_} a.status is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('statusList')"> <if test="conditionParamRef.containsKey('statusList') and conditionParamRef.statusList.size() > 0">
${_conditionType_} a.status in ${_conditionType_} a.status in
<foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('statusNotList') and conditionParamRef.statusNotList.size() > 0">
${_conditionType_} a.status not in
<foreach collection="conditionParamRef.statusNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('statusStart') and conditionParamRef.statusStart != null"> <if test="conditionParamRef.containsKey('statusStart') and conditionParamRef.statusStart != null">
${_conditionType_} a.status <![CDATA[ >= ]]> #{${_conditionParam_}.statusStart} ${_conditionType_} a.status <![CDATA[ >= ]]> #{${_conditionParam_}.statusStart}
</if> </if>
...@@ -928,6 +1082,33 @@ ...@@ -928,6 +1082,33 @@
${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd} ${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd}
</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>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -1061,6 +1242,11 @@ ...@@ -1061,6 +1242,11 @@
<if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if> <if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
certificate-manager/src/main/resources/sqlmap/module/certificate/CertificateCatalogMapper.xml
View file @ 4018c60f
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
<result property="deviceId" column="deviceId" /> <result property="deviceId" column="deviceId" />
<result property="excelFile" column="excelFile" /> <result property="excelFile" column="excelFile" />
<result property="isPdf" column="isPdf" /> <result property="isPdf" column="isPdf" />
<result property="siteId" column="siteId" />
</resultMap> </resultMap>
...@@ -108,23 +109,26 @@ ...@@ -108,23 +109,26 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isPdf') or colPickMode == 1 and data.containsKey('isPdf')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isPdf') or colPickMode == 1 and data.containsKey('isPdf')))">
a.isPdf, a.isPdf,
</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>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="CertificateCatalogEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="CertificateCatalogEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_certificate_catalog insert into mortals_xhx_certificate_catalog
(catalogName,catalogCode,holderType,industryId,classifyId,transverse,portrait,inspect,templateName,templateUrl,formContent,exampleUrl,status,printerName,printerIp,paperSource,createUserId,createTime,updateUserId,updateTime,deviceId,excelFile,isPdf) (catalogName,catalogCode,holderType,industryId,classifyId,transverse,portrait,inspect,templateName,templateUrl,formContent,exampleUrl,status,printerName,printerIp,paperSource,createUserId,createTime,updateUserId,updateTime,deviceId,excelFile,isPdf,siteId)
VALUES VALUES
(#{catalogName},#{catalogCode},#{holderType},#{industryId},#{classifyId},#{transverse},#{portrait},#{inspect},#{templateName},#{templateUrl},#{formContent},#{exampleUrl},#{status},#{printerName},#{printerIp},#{paperSource},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{deviceId},#{excelFile},#{isPdf}) (#{catalogName},#{catalogCode},#{holderType},#{industryId},#{classifyId},#{transverse},#{portrait},#{inspect},#{templateName},#{templateUrl},#{formContent},#{exampleUrl},#{status},#{printerName},#{printerIp},#{paperSource},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{deviceId},#{excelFile},#{isPdf},#{siteId})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_certificate_catalog insert into mortals_xhx_certificate_catalog
(catalogName,catalogCode,holderType,industryId,classifyId,transverse,portrait,inspect,templateName,templateUrl,formContent,exampleUrl,status,printerName,printerIp,paperSource,createUserId,createTime,updateUserId,updateTime,deviceId,excelFile,isPdf) (catalogName,catalogCode,holderType,industryId,classifyId,transverse,portrait,inspect,templateName,templateUrl,formContent,exampleUrl,status,printerName,printerIp,paperSource,createUserId,createTime,updateUserId,updateTime,deviceId,excelFile,isPdf,siteId)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.catalogName},#{item.catalogCode},#{item.holderType},#{item.industryId},#{item.classifyId},#{item.transverse},#{item.portrait},#{item.inspect},#{item.templateName},#{item.templateUrl},#{item.formContent},#{item.exampleUrl},#{item.status},#{item.printerName},#{item.printerIp},#{item.paperSource},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.deviceId},#{item.excelFile},#{item.isPdf}) (#{item.catalogName},#{item.catalogCode},#{item.holderType},#{item.industryId},#{item.classifyId},#{item.transverse},#{item.portrait},#{item.inspect},#{item.templateName},#{item.templateUrl},#{item.formContent},#{item.exampleUrl},#{item.status},#{item.printerName},#{item.printerIp},#{item.paperSource},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.deviceId},#{item.excelFile},#{item.isPdf},#{item.siteId})
</foreach> </foreach>
</insert> </insert>
...@@ -236,6 +240,12 @@ ...@@ -236,6 +240,12 @@
<if test="(colPickMode==0 and data.containsKey('isPdfIncrement')) or (colPickMode==1 and !data.containsKey('isPdfIncrement'))"> <if test="(colPickMode==0 and data.containsKey('isPdfIncrement')) or (colPickMode==1 and !data.containsKey('isPdfIncrement'))">
a.isPdf=ifnull(a.isPdf,0) + #{data.isPdfIncrement}, a.isPdf=ifnull(a.isPdf,0) + #{data.isPdfIncrement},
</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>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -464,6 +474,18 @@ ...@@ -464,6 +474,18 @@
</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> </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=")">
...@@ -1144,6 +1166,33 @@ ...@@ -1144,6 +1166,33 @@
${_conditionType_} a.isPdf <![CDATA[ <= ]]> #{${_conditionParam_}.isPdfEnd} ${_conditionType_} a.isPdf <![CDATA[ <= ]]> #{${_conditionParam_}.isPdfEnd}
</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>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -1277,6 +1326,11 @@ ...@@ -1277,6 +1326,11 @@
<if test='orderCol.isPdf != null and "DESC".equalsIgnoreCase(orderCol.isPdf)'>DESC</if> <if test='orderCol.isPdf != null and "DESC".equalsIgnoreCase(orderCol.isPdf)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
certificate-manager/src/main/resources/sqlmap/module/certificate/CertificateClassifyMapper.xml
View file @ 4018c60f
<?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.certificate.dao.ibatis.CertificateClassifyDaoImpl"> <mapper namespace="com.mortals.xhx.module.certificate.dao.ibatis.CertificateClassifyDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
<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" />
</resultMap> </resultMap>
...@@ -52,23 +53,26 @@ ...@@ -52,23 +53,26 @@
<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>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="CertificateClassifyEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="CertificateClassifyEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_certificate_classify insert into mortals_xhx_certificate_classify
(classifyName,sort,total,showFront,classifyType,createUserId,createTime,updateUserId,updateTime) (classifyName,sort,total,showFront,classifyType,createUserId,createTime,updateUserId,updateTime,siteId)
VALUES VALUES
(#{classifyName},#{sort},#{total},#{showFront},#{classifyType},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{classifyName},#{sort},#{total},#{showFront},#{classifyType},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{siteId})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_certificate_classify insert into mortals_xhx_certificate_classify
(classifyName,sort,total,showFront,classifyType,createUserId,createTime,updateUserId,updateTime) (classifyName,sort,total,showFront,classifyType,createUserId,createTime,updateUserId,updateTime,siteId)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.classifyName},#{item.sort},#{item.total},#{item.showFront},#{item.classifyType},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.classifyName},#{item.sort},#{item.total},#{item.showFront},#{item.classifyType},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.siteId})
</foreach> </foreach>
</insert> </insert>
...@@ -123,6 +127,12 @@ ...@@ -123,6 +127,12 @@
<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>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -228,6 +238,18 @@ ...@@ -228,6 +238,18 @@
</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> </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=")">
...@@ -251,6 +273,21 @@ ...@@ -251,6 +273,21 @@
#{item} #{item}
</foreach> </foreach>
</delete> </delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_xhx_certificate_classify where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_xhx_certificate_classify where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 --> <!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto"> <delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_certificate_classify as a delete a.* from mortals_xhx_certificate_classify as a
...@@ -337,12 +374,18 @@ ...@@ -337,12 +374,18 @@
${_conditionType_} a.id is null ${_conditionType_} a.id is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in ${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart} ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
...@@ -359,12 +402,18 @@ ...@@ -359,12 +402,18 @@
${_conditionType_} a.classifyName is null ${_conditionType_} a.classifyName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('classifyNameList')"> <if test="conditionParamRef.containsKey('classifyNameList') and conditionParamRef.classifyNameList.size() > 0">
${_conditionType_} a.classifyName in ${_conditionType_} a.classifyName in
<foreach collection="conditionParamRef.classifyNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.classifyNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('classifyNameNotList') and conditionParamRef.classifyNameNotList.size() > 0">
${_conditionType_} a.classifyName not in
<foreach collection="conditionParamRef.classifyNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sort')"> <if test="conditionParamRef.containsKey('sort')">
<if test="conditionParamRef.sort != null "> <if test="conditionParamRef.sort != null ">
${_conditionType_} a.sort = #{${_conditionParam_}.sort} ${_conditionType_} a.sort = #{${_conditionParam_}.sort}
...@@ -373,12 +422,18 @@ ...@@ -373,12 +422,18 @@
${_conditionType_} a.sort is null ${_conditionType_} a.sort is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('sortList')"> <if test="conditionParamRef.containsKey('sortList') and conditionParamRef.sortList.size() > 0">
${_conditionType_} a.sort in ${_conditionType_} a.sort in
<foreach collection="conditionParamRef.sortList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.sortList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('sortNotList') and conditionParamRef.sortNotList.size() > 0">
${_conditionType_} a.sort not in
<foreach collection="conditionParamRef.sortNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sortStart') and conditionParamRef.sortStart != null"> <if test="conditionParamRef.containsKey('sortStart') and conditionParamRef.sortStart != null">
${_conditionType_} a.sort <![CDATA[ >= ]]> #{${_conditionParam_}.sortStart} ${_conditionType_} a.sort <![CDATA[ >= ]]> #{${_conditionParam_}.sortStart}
</if> </if>
...@@ -394,12 +449,18 @@ ...@@ -394,12 +449,18 @@
${_conditionType_} a.total is null ${_conditionType_} a.total is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('totalList')"> <if test="conditionParamRef.containsKey('totalList') and conditionParamRef.totalList.size() > 0">
${_conditionType_} a.total in ${_conditionType_} a.total in
<foreach collection="conditionParamRef.totalList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.totalList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('totalNotList') and conditionParamRef.totalNotList.size() > 0">
${_conditionType_} a.total not in
<foreach collection="conditionParamRef.totalNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('totalStart') and conditionParamRef.totalStart != null"> <if test="conditionParamRef.containsKey('totalStart') and conditionParamRef.totalStart != null">
${_conditionType_} a.total <![CDATA[ >= ]]> #{${_conditionParam_}.totalStart} ${_conditionType_} a.total <![CDATA[ >= ]]> #{${_conditionParam_}.totalStart}
</if> </if>
...@@ -415,12 +476,18 @@ ...@@ -415,12 +476,18 @@
${_conditionType_} a.showFront is null ${_conditionType_} a.showFront is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('showFrontList')"> <if test="conditionParamRef.containsKey('showFrontList') and conditionParamRef.showFrontList.size() > 0">
${_conditionType_} a.showFront in ${_conditionType_} a.showFront in
<foreach collection="conditionParamRef.showFrontList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.showFrontList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('showFrontNotList') and conditionParamRef.showFrontNotList.size() > 0">
${_conditionType_} a.showFront not in
<foreach collection="conditionParamRef.showFrontNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('showFrontStart') and conditionParamRef.showFrontStart != null"> <if test="conditionParamRef.containsKey('showFrontStart') and conditionParamRef.showFrontStart != null">
${_conditionType_} a.showFront <![CDATA[ >= ]]> #{${_conditionParam_}.showFrontStart} ${_conditionType_} a.showFront <![CDATA[ >= ]]> #{${_conditionParam_}.showFrontStart}
</if> </if>
...@@ -436,12 +503,18 @@ ...@@ -436,12 +503,18 @@
${_conditionType_} a.classifyType is null ${_conditionType_} a.classifyType is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('classifyTypeList')"> <if test="conditionParamRef.containsKey('classifyTypeList') and conditionParamRef.classifyTypeList.size() > 0">
${_conditionType_} a.classifyType in ${_conditionType_} a.classifyType in
<foreach collection="conditionParamRef.classifyTypeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.classifyTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('classifyTypeNotList') and conditionParamRef.classifyTypeNotList.size() > 0">
${_conditionType_} a.classifyType not in
<foreach collection="conditionParamRef.classifyTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('classifyTypeStart') and conditionParamRef.classifyTypeStart != null"> <if test="conditionParamRef.containsKey('classifyTypeStart') and conditionParamRef.classifyTypeStart != null">
${_conditionType_} a.classifyType <![CDATA[ >= ]]> #{${_conditionParam_}.classifyTypeStart} ${_conditionType_} a.classifyType <![CDATA[ >= ]]> #{${_conditionParam_}.classifyTypeStart}
</if> </if>
...@@ -457,12 +530,18 @@ ...@@ -457,12 +530,18 @@
${_conditionType_} a.createUserId is null ${_conditionType_} a.createUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in ${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if> </if>
...@@ -493,12 +572,18 @@ ...@@ -493,12 +572,18 @@
${_conditionType_} a.updateUserId is null ${_conditionType_} a.updateUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdList')"> <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in ${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null"> <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart} ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if> </if>
...@@ -521,6 +606,33 @@ ...@@ -521,6 +606,33 @@
<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>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -584,6 +696,11 @@ ...@@ -584,6 +696,11 @@
<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>
</trim> </trim>
</if> </if>
</sql> </sql>
......
certificate-manager/src/main/resources/sqlmap/module/certificate/CertificateIndustryMapper.xml
View file @ 4018c60f
<?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.certificate.dao.ibatis.CertificateIndustryDaoImpl"> <mapper namespace="com.mortals.xhx.module.certificate.dao.ibatis.CertificateIndustryDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<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" />
</resultMap> </resultMap>
...@@ -40,23 +41,26 @@ ...@@ -40,23 +41,26 @@
<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>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="CertificateIndustryEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="CertificateIndustryEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_certificate_industry insert into mortals_xhx_certificate_industry
(parentId,industryName,createUserId,createTime,updateUserId,updateTime) (parentId,industryName,createUserId,createTime,updateUserId,updateTime,siteId)
VALUES VALUES
(#{parentId},#{industryName},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{parentId},#{industryName},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{siteId})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_certificate_industry insert into mortals_xhx_certificate_industry
(parentId,industryName,createUserId,createTime,updateUserId,updateTime) (parentId,industryName,createUserId,createTime,updateUserId,updateTime,siteId)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.parentId},#{item.industryName},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.parentId},#{item.industryName},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.siteId})
</foreach> </foreach>
</insert> </insert>
...@@ -93,6 +97,12 @@ ...@@ -93,6 +97,12 @@
<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>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -162,6 +172,18 @@ ...@@ -162,6 +172,18 @@
</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> </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=")">
...@@ -185,6 +207,21 @@ ...@@ -185,6 +207,21 @@
#{item} #{item}
</foreach> </foreach>
</delete> </delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_xhx_certificate_industry where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_xhx_certificate_industry where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 --> <!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto"> <delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_certificate_industry as a delete a.* from mortals_xhx_certificate_industry as a
...@@ -271,12 +308,18 @@ ...@@ -271,12 +308,18 @@
${_conditionType_} a.id is null ${_conditionType_} a.id is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in ${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart} ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
...@@ -292,12 +335,18 @@ ...@@ -292,12 +335,18 @@
${_conditionType_} a.parentId is null ${_conditionType_} a.parentId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('parentIdList')"> <if test="conditionParamRef.containsKey('parentIdList') and conditionParamRef.parentIdList.size() > 0">
${_conditionType_} a.parentId in ${_conditionType_} a.parentId in
<foreach collection="conditionParamRef.parentIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.parentIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('parentIdNotList') and conditionParamRef.parentIdNotList.size() > 0">
${_conditionType_} a.parentId not in
<foreach collection="conditionParamRef.parentIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('parentIdStart') and conditionParamRef.parentIdStart != null"> <if test="conditionParamRef.containsKey('parentIdStart') and conditionParamRef.parentIdStart != null">
${_conditionType_} a.parentId <![CDATA[ >= ]]> #{${_conditionParam_}.parentIdStart} ${_conditionType_} a.parentId <![CDATA[ >= ]]> #{${_conditionParam_}.parentIdStart}
</if> </if>
...@@ -314,12 +363,18 @@ ...@@ -314,12 +363,18 @@
${_conditionType_} a.industryName is null ${_conditionType_} a.industryName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('industryNameList')"> <if test="conditionParamRef.containsKey('industryNameList') and conditionParamRef.industryNameList.size() > 0">
${_conditionType_} a.industryName in ${_conditionType_} a.industryName in
<foreach collection="conditionParamRef.industryNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.industryNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('industryNameNotList') and conditionParamRef.industryNameNotList.size() > 0">
${_conditionType_} a.industryName not in
<foreach collection="conditionParamRef.industryNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserId')"> <if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null "> <if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId} ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
...@@ -328,12 +383,18 @@ ...@@ -328,12 +383,18 @@
${_conditionType_} a.createUserId is null ${_conditionType_} a.createUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in ${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if> </if>
...@@ -364,12 +425,18 @@ ...@@ -364,12 +425,18 @@
${_conditionType_} a.updateUserId is null ${_conditionType_} a.updateUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdList')"> <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in ${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null"> <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart} ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if> </if>
...@@ -392,6 +459,33 @@ ...@@ -392,6 +459,33 @@
<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>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -440,6 +534,11 @@ ...@@ -440,6 +534,11 @@
<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>
</trim> </trim>
</if> </if>
</sql> </sql>
......
certificate-manager/src/main/resources/sqlmap/module/certificate/DeviceClassifyMapper.xml
View file @ 4018c60f
<?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.certificate.dao.ibatis.DeviceClassifyDaoImpl"> <mapper namespace="com.mortals.xhx.module.certificate.dao.ibatis.DeviceClassifyDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
<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" />
</resultMap> </resultMap>
...@@ -44,23 +45,26 @@ ...@@ -44,23 +45,26 @@
<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>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="DeviceClassifyEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="DeviceClassifyEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_device_classify insert into mortals_xhx_device_classify
(deviceCode,deviceName,classifyIds,createUserId,createTime,updateUserId,updateTime) (deviceCode,deviceName,classifyIds,createUserId,createTime,updateUserId,updateTime,siteId)
VALUES VALUES
(#{deviceCode},#{deviceName},#{classifyIds},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{deviceCode},#{deviceName},#{classifyIds},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{siteId})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_device_classify insert into mortals_xhx_device_classify
(deviceCode,deviceName,classifyIds,createUserId,createTime,updateUserId,updateTime) (deviceCode,deviceName,classifyIds,createUserId,createTime,updateUserId,updateTime,siteId)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.deviceCode},#{item.deviceName},#{item.classifyIds},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.deviceCode},#{item.deviceName},#{item.classifyIds},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.siteId})
</foreach> </foreach>
</insert> </insert>
...@@ -97,6 +101,12 @@ ...@@ -97,6 +101,12 @@
<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>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -168,6 +178,18 @@ ...@@ -168,6 +178,18 @@
</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> </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=")">
...@@ -458,6 +480,33 @@ ...@@ -458,6 +480,33 @@
<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>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -511,6 +560,11 @@ ...@@ -511,6 +560,11 @@
<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>
</trim> </trim>
</if> </if>
</sql> </sql>
......
certificate-manager/src/main/resources/sqlmap/module/device/DeviceMapper.xml
View file @ 4018c60f
<?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.device.dao.ibatis.DeviceDaoImpl"> <mapper namespace="com.mortals.xhx.module.device.dao.ibatis.DeviceDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
<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" />
</resultMap> </resultMap>
...@@ -104,23 +105,26 @@ ...@@ -104,23 +105,26 @@
<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>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="DeviceEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="DeviceEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_device insert into mortals_xhx_device
(deviceName,deviceCode,deviceType,deviceMac,deviceFirmname,ip,port,resolution,leadingOfficial,telephone,longitude,latitude,building,floor,managePWD,remark,status,enabled,createUserId,createTime,updateUserId,updateTime) (deviceName,deviceCode,deviceType,deviceMac,deviceFirmname,ip,port,resolution,leadingOfficial,telephone,longitude,latitude,building,floor,managePWD,remark,status,enabled,createUserId,createTime,updateUserId,updateTime,siteId)
VALUES VALUES
(#{deviceName},#{deviceCode},#{deviceType},#{deviceMac},#{deviceFirmname},#{ip},#{port},#{resolution},#{leadingOfficial},#{telephone},#{longitude},#{latitude},#{building},#{floor},#{managePWD},#{remark},#{status},#{enabled},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{deviceName},#{deviceCode},#{deviceType},#{deviceMac},#{deviceFirmname},#{ip},#{port},#{resolution},#{leadingOfficial},#{telephone},#{longitude},#{latitude},#{building},#{floor},#{managePWD},#{remark},#{status},#{enabled},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{siteId})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_device insert into mortals_xhx_device
(deviceName,deviceCode,deviceType,deviceMac,deviceFirmname,ip,port,resolution,leadingOfficial,telephone,longitude,latitude,building,floor,managePWD,remark,status,enabled,createUserId,createTime,updateUserId,updateTime) (deviceName,deviceCode,deviceType,deviceMac,deviceFirmname,ip,port,resolution,leadingOfficial,telephone,longitude,latitude,building,floor,managePWD,remark,status,enabled,createUserId,createTime,updateUserId,updateTime,siteId)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.deviceName},#{item.deviceCode},#{item.deviceType},#{item.deviceMac},#{item.deviceFirmname},#{item.ip},#{item.port},#{item.resolution},#{item.leadingOfficial},#{item.telephone},#{item.longitude},#{item.latitude},#{item.building},#{item.floor},#{item.managePWD},#{item.remark},#{item.status},#{item.enabled},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.deviceName},#{item.deviceCode},#{item.deviceType},#{item.deviceMac},#{item.deviceFirmname},#{item.ip},#{item.port},#{item.resolution},#{item.leadingOfficial},#{item.telephone},#{item.longitude},#{item.latitude},#{item.building},#{item.floor},#{item.managePWD},#{item.remark},#{item.status},#{item.enabled},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.siteId})
</foreach> </foreach>
</insert> </insert>
...@@ -217,6 +221,12 @@ ...@@ -217,6 +221,12 @@
<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>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -418,6 +428,18 @@ ...@@ -418,6 +428,18 @@
</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> </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=")">
...@@ -441,6 +463,21 @@ ...@@ -441,6 +463,21 @@
#{item} #{item}
</foreach> </foreach>
</delete> </delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_xhx_device where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_xhx_device where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 --> <!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto"> <delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_device as a delete a.* from mortals_xhx_device as a
...@@ -527,12 +564,18 @@ ...@@ -527,12 +564,18 @@
${_conditionType_} a.id is null ${_conditionType_} a.id is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in ${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart} ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
...@@ -549,12 +592,18 @@ ...@@ -549,12 +592,18 @@
${_conditionType_} a.deviceName is null ${_conditionType_} a.deviceName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deviceNameList')"> <if test="conditionParamRef.containsKey('deviceNameList') and conditionParamRef.deviceNameList.size() > 0">
${_conditionType_} a.deviceName in ${_conditionType_} a.deviceName in
<foreach collection="conditionParamRef.deviceNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deviceNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deviceNameNotList') and conditionParamRef.deviceNameNotList.size() > 0">
${_conditionType_} a.deviceName not in
<foreach collection="conditionParamRef.deviceNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceCode')"> <if test="conditionParamRef.containsKey('deviceCode')">
<if test="conditionParamRef.deviceCode != null and conditionParamRef.deviceCode != ''"> <if test="conditionParamRef.deviceCode != null and conditionParamRef.deviceCode != ''">
...@@ -564,12 +613,18 @@ ...@@ -564,12 +613,18 @@
${_conditionType_} a.deviceCode is null ${_conditionType_} a.deviceCode is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deviceCodeList')"> <if test="conditionParamRef.containsKey('deviceCodeList') and conditionParamRef.deviceCodeList.size() > 0">
${_conditionType_} a.deviceCode in ${_conditionType_} a.deviceCode in
<foreach collection="conditionParamRef.deviceCodeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deviceCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deviceCodeNotList') and conditionParamRef.deviceCodeNotList.size() > 0">
${_conditionType_} a.deviceCode not in
<foreach collection="conditionParamRef.deviceCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceType')"> <if test="conditionParamRef.containsKey('deviceType')">
<if test="conditionParamRef.deviceType != null "> <if test="conditionParamRef.deviceType != null ">
${_conditionType_} a.deviceType = #{${_conditionParam_}.deviceType} ${_conditionType_} a.deviceType = #{${_conditionParam_}.deviceType}
...@@ -578,12 +633,18 @@ ...@@ -578,12 +633,18 @@
${_conditionType_} a.deviceType is null ${_conditionType_} a.deviceType is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deviceTypeList')"> <if test="conditionParamRef.containsKey('deviceTypeList') and conditionParamRef.deviceTypeList.size() > 0">
${_conditionType_} a.deviceType in ${_conditionType_} a.deviceType in
<foreach collection="conditionParamRef.deviceTypeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deviceTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deviceTypeNotList') and conditionParamRef.deviceTypeNotList.size() > 0">
${_conditionType_} a.deviceType not in
<foreach collection="conditionParamRef.deviceTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceTypeStart') and conditionParamRef.deviceTypeStart != null"> <if test="conditionParamRef.containsKey('deviceTypeStart') and conditionParamRef.deviceTypeStart != null">
${_conditionType_} a.deviceType <![CDATA[ >= ]]> #{${_conditionParam_}.deviceTypeStart} ${_conditionType_} a.deviceType <![CDATA[ >= ]]> #{${_conditionParam_}.deviceTypeStart}
</if> </if>
...@@ -600,12 +661,18 @@ ...@@ -600,12 +661,18 @@
${_conditionType_} a.deviceMac is null ${_conditionType_} a.deviceMac is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deviceMacList')"> <if test="conditionParamRef.containsKey('deviceMacList') and conditionParamRef.deviceMacList.size() > 0">
${_conditionType_} a.deviceMac in ${_conditionType_} a.deviceMac in
<foreach collection="conditionParamRef.deviceMacList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deviceMacList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deviceMacNotList') and conditionParamRef.deviceMacNotList.size() > 0">
${_conditionType_} a.deviceMac not in
<foreach collection="conditionParamRef.deviceMacNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceFirmname')"> <if test="conditionParamRef.containsKey('deviceFirmname')">
<if test="conditionParamRef.deviceFirmname != null and conditionParamRef.deviceFirmname != ''"> <if test="conditionParamRef.deviceFirmname != null and conditionParamRef.deviceFirmname != ''">
...@@ -615,12 +682,18 @@ ...@@ -615,12 +682,18 @@
${_conditionType_} a.deviceFirmname is null ${_conditionType_} a.deviceFirmname is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deviceFirmnameList')"> <if test="conditionParamRef.containsKey('deviceFirmnameList') and conditionParamRef.deviceFirmnameList.size() > 0">
${_conditionType_} a.deviceFirmname in ${_conditionType_} a.deviceFirmname in
<foreach collection="conditionParamRef.deviceFirmnameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deviceFirmnameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deviceFirmnameNotList') and conditionParamRef.deviceFirmnameNotList.size() > 0">
${_conditionType_} a.deviceFirmname not in
<foreach collection="conditionParamRef.deviceFirmnameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('ip')"> <if test="conditionParamRef.containsKey('ip')">
<if test="conditionParamRef.ip != null and conditionParamRef.ip != ''"> <if test="conditionParamRef.ip != null and conditionParamRef.ip != ''">
...@@ -630,12 +703,18 @@ ...@@ -630,12 +703,18 @@
${_conditionType_} a.ip is null ${_conditionType_} a.ip is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('ipList')"> <if test="conditionParamRef.containsKey('ipList') and conditionParamRef.ipList.size() > 0">
${_conditionType_} a.ip in ${_conditionType_} a.ip in
<foreach collection="conditionParamRef.ipList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.ipList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('ipNotList') and conditionParamRef.ipNotList.size() > 0">
${_conditionType_} a.ip not in
<foreach collection="conditionParamRef.ipNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('port')"> <if test="conditionParamRef.containsKey('port')">
<if test="conditionParamRef.port != null and conditionParamRef.port != ''"> <if test="conditionParamRef.port != null and conditionParamRef.port != ''">
...@@ -645,12 +724,18 @@ ...@@ -645,12 +724,18 @@
${_conditionType_} a.port is null ${_conditionType_} a.port is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('portList')"> <if test="conditionParamRef.containsKey('portList') and conditionParamRef.portList.size() > 0">
${_conditionType_} a.port in ${_conditionType_} a.port in
<foreach collection="conditionParamRef.portList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.portList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('portNotList') and conditionParamRef.portNotList.size() > 0">
${_conditionType_} a.port not in
<foreach collection="conditionParamRef.portNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('resolution')"> <if test="conditionParamRef.containsKey('resolution')">
<if test="conditionParamRef.resolution != null and conditionParamRef.resolution != ''"> <if test="conditionParamRef.resolution != null and conditionParamRef.resolution != ''">
...@@ -660,12 +745,18 @@ ...@@ -660,12 +745,18 @@
${_conditionType_} a.resolution is null ${_conditionType_} a.resolution is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('resolutionList')"> <if test="conditionParamRef.containsKey('resolutionList') and conditionParamRef.resolutionList.size() > 0">
${_conditionType_} a.resolution in ${_conditionType_} a.resolution in
<foreach collection="conditionParamRef.resolutionList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.resolutionList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('resolutionNotList') and conditionParamRef.resolutionNotList.size() > 0">
${_conditionType_} a.resolution not in
<foreach collection="conditionParamRef.resolutionNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('leadingOfficial')"> <if test="conditionParamRef.containsKey('leadingOfficial')">
<if test="conditionParamRef.leadingOfficial != null and conditionParamRef.leadingOfficial != ''"> <if test="conditionParamRef.leadingOfficial != null and conditionParamRef.leadingOfficial != ''">
...@@ -675,12 +766,18 @@ ...@@ -675,12 +766,18 @@
${_conditionType_} a.leadingOfficial is null ${_conditionType_} a.leadingOfficial is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('leadingOfficialList')"> <if test="conditionParamRef.containsKey('leadingOfficialList') and conditionParamRef.leadingOfficialList.size() > 0">
${_conditionType_} a.leadingOfficial in ${_conditionType_} a.leadingOfficial in
<foreach collection="conditionParamRef.leadingOfficialList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.leadingOfficialList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('leadingOfficialNotList') and conditionParamRef.leadingOfficialNotList.size() > 0">
${_conditionType_} a.leadingOfficial not in
<foreach collection="conditionParamRef.leadingOfficialNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('telephone')"> <if test="conditionParamRef.containsKey('telephone')">
<if test="conditionParamRef.telephone != null and conditionParamRef.telephone != ''"> <if test="conditionParamRef.telephone != null and conditionParamRef.telephone != ''">
...@@ -690,12 +787,18 @@ ...@@ -690,12 +787,18 @@
${_conditionType_} a.telephone is null ${_conditionType_} a.telephone is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('telephoneList')"> <if test="conditionParamRef.containsKey('telephoneList') and conditionParamRef.telephoneList.size() > 0">
${_conditionType_} a.telephone in ${_conditionType_} a.telephone in
<foreach collection="conditionParamRef.telephoneList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.telephoneList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('telephoneNotList') and conditionParamRef.telephoneNotList.size() > 0">
${_conditionType_} a.telephone not in
<foreach collection="conditionParamRef.telephoneNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('longitude')"> <if test="conditionParamRef.containsKey('longitude')">
<if test="conditionParamRef.longitude != null and conditionParamRef.longitude != ''"> <if test="conditionParamRef.longitude != null and conditionParamRef.longitude != ''">
...@@ -705,12 +808,18 @@ ...@@ -705,12 +808,18 @@
${_conditionType_} a.longitude is null ${_conditionType_} a.longitude is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('longitudeList')"> <if test="conditionParamRef.containsKey('longitudeList') and conditionParamRef.longitudeList.size() > 0">
${_conditionType_} a.longitude in ${_conditionType_} a.longitude in
<foreach collection="conditionParamRef.longitudeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.longitudeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('longitudeNotList') and conditionParamRef.longitudeNotList.size() > 0">
${_conditionType_} a.longitude not in
<foreach collection="conditionParamRef.longitudeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('latitude')"> <if test="conditionParamRef.containsKey('latitude')">
<if test="conditionParamRef.latitude != null and conditionParamRef.latitude != ''"> <if test="conditionParamRef.latitude != null and conditionParamRef.latitude != ''">
...@@ -720,12 +829,18 @@ ...@@ -720,12 +829,18 @@
${_conditionType_} a.latitude is null ${_conditionType_} a.latitude is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('latitudeList')"> <if test="conditionParamRef.containsKey('latitudeList') and conditionParamRef.latitudeList.size() > 0">
${_conditionType_} a.latitude in ${_conditionType_} a.latitude in
<foreach collection="conditionParamRef.latitudeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.latitudeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('latitudeNotList') and conditionParamRef.latitudeNotList.size() > 0">
${_conditionType_} a.latitude not in
<foreach collection="conditionParamRef.latitudeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('building')"> <if test="conditionParamRef.containsKey('building')">
<if test="conditionParamRef.building != null "> <if test="conditionParamRef.building != null ">
${_conditionType_} a.building = #{${_conditionParam_}.building} ${_conditionType_} a.building = #{${_conditionParam_}.building}
...@@ -734,12 +849,18 @@ ...@@ -734,12 +849,18 @@
${_conditionType_} a.building is null ${_conditionType_} a.building is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('buildingList')"> <if test="conditionParamRef.containsKey('buildingList') and conditionParamRef.buildingList.size() > 0">
${_conditionType_} a.building in ${_conditionType_} a.building in
<foreach collection="conditionParamRef.buildingList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.buildingList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('buildingNotList') and conditionParamRef.buildingNotList.size() > 0">
${_conditionType_} a.building not in
<foreach collection="conditionParamRef.buildingNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('buildingStart') and conditionParamRef.buildingStart != null"> <if test="conditionParamRef.containsKey('buildingStart') and conditionParamRef.buildingStart != null">
${_conditionType_} a.building <![CDATA[ >= ]]> #{${_conditionParam_}.buildingStart} ${_conditionType_} a.building <![CDATA[ >= ]]> #{${_conditionParam_}.buildingStart}
</if> </if>
...@@ -755,12 +876,18 @@ ...@@ -755,12 +876,18 @@
${_conditionType_} a.floor is null ${_conditionType_} a.floor is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('floorList')"> <if test="conditionParamRef.containsKey('floorList') and conditionParamRef.floorList.size() > 0">
${_conditionType_} a.floor in ${_conditionType_} a.floor in
<foreach collection="conditionParamRef.floorList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.floorList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('floorNotList') and conditionParamRef.floorNotList.size() > 0">
${_conditionType_} a.floor not in
<foreach collection="conditionParamRef.floorNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('floorStart') and conditionParamRef.floorStart != null"> <if test="conditionParamRef.containsKey('floorStart') and conditionParamRef.floorStart != null">
${_conditionType_} a.floor <![CDATA[ >= ]]> #{${_conditionParam_}.floorStart} ${_conditionType_} a.floor <![CDATA[ >= ]]> #{${_conditionParam_}.floorStart}
</if> </if>
...@@ -777,12 +904,18 @@ ...@@ -777,12 +904,18 @@
${_conditionType_} a.managePWD is null ${_conditionType_} a.managePWD is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('managePWDList')"> <if test="conditionParamRef.containsKey('managePWDList') and conditionParamRef.managePWDList.size() > 0">
${_conditionType_} a.managePWD in ${_conditionType_} a.managePWD in
<foreach collection="conditionParamRef.managePWDList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.managePWDList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('managePWDNotList') and conditionParamRef.managePWDNotList.size() > 0">
${_conditionType_} a.managePWD not in
<foreach collection="conditionParamRef.managePWDNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('remark')"> <if test="conditionParamRef.containsKey('remark')">
<if test="conditionParamRef.remark != null and conditionParamRef.remark != ''"> <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
...@@ -792,12 +925,18 @@ ...@@ -792,12 +925,18 @@
${_conditionType_} a.remark is null ${_conditionType_} a.remark is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('remarkList')"> <if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
${_conditionType_} a.remark in ${_conditionType_} a.remark in
<foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
${_conditionType_} a.remark not in
<foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('status')"> <if test="conditionParamRef.containsKey('status')">
<if test="conditionParamRef.status != null "> <if test="conditionParamRef.status != null ">
${_conditionType_} a.status = #{${_conditionParam_}.status} ${_conditionType_} a.status = #{${_conditionParam_}.status}
...@@ -806,12 +945,18 @@ ...@@ -806,12 +945,18 @@
${_conditionType_} a.status is null ${_conditionType_} a.status is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('statusList')"> <if test="conditionParamRef.containsKey('statusList') and conditionParamRef.statusList.size() > 0">
${_conditionType_} a.status in ${_conditionType_} a.status in
<foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('statusNotList') and conditionParamRef.statusNotList.size() > 0">
${_conditionType_} a.status not in
<foreach collection="conditionParamRef.statusNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('statusStart') and conditionParamRef.statusStart != null"> <if test="conditionParamRef.containsKey('statusStart') and conditionParamRef.statusStart != null">
${_conditionType_} a.status <![CDATA[ >= ]]> #{${_conditionParam_}.statusStart} ${_conditionType_} a.status <![CDATA[ >= ]]> #{${_conditionParam_}.statusStart}
</if> </if>
...@@ -827,12 +972,18 @@ ...@@ -827,12 +972,18 @@
${_conditionType_} a.enabled is null ${_conditionType_} a.enabled is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('enabledList')"> <if test="conditionParamRef.containsKey('enabledList') and conditionParamRef.enabledList.size() > 0">
${_conditionType_} a.enabled in ${_conditionType_} a.enabled in
<foreach collection="conditionParamRef.enabledList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.enabledList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('enabledNotList') and conditionParamRef.enabledNotList.size() > 0">
${_conditionType_} a.enabled not in
<foreach collection="conditionParamRef.enabledNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('enabledStart') and conditionParamRef.enabledStart != null"> <if test="conditionParamRef.containsKey('enabledStart') and conditionParamRef.enabledStart != null">
${_conditionType_} a.enabled <![CDATA[ >= ]]> #{${_conditionParam_}.enabledStart} ${_conditionType_} a.enabled <![CDATA[ >= ]]> #{${_conditionParam_}.enabledStart}
</if> </if>
...@@ -848,12 +999,18 @@ ...@@ -848,12 +999,18 @@
${_conditionType_} a.createUserId is null ${_conditionType_} a.createUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in ${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if> </if>
...@@ -884,12 +1041,18 @@ ...@@ -884,12 +1041,18 @@
${_conditionType_} a.updateUserId is null ${_conditionType_} a.updateUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdList')"> <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in ${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null"> <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart} ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if> </if>
...@@ -912,6 +1075,33 @@ ...@@ -912,6 +1075,33 @@
<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>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -1040,6 +1230,11 @@ ...@@ -1040,6 +1230,11 @@
<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>
</trim> </trim>
</if> </if>
</sql> </sql>
......
certificate-manager/src/main/resources/sqlmap/module/device/DeviceModuleMapper.xml
View file @ 4018c60f
<?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.device.dao.ibatis.DeviceModuleDaoImpl"> <mapper namespace="com.mortals.xhx.module.device.dao.ibatis.DeviceModuleDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
<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" />
</resultMap> </resultMap>
...@@ -56,23 +57,26 @@ ...@@ -56,23 +57,26 @@
<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>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="DeviceModuleEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="DeviceModuleEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_device_module insert into mortals_xhx_device_module
(deviceId,deviceName,moduleName,productName,networkAddress,cartonType,createUserId,createTime,updateUserId,updateTime) (deviceId,deviceName,moduleName,productName,networkAddress,cartonType,createUserId,createTime,updateUserId,updateTime,siteId)
VALUES VALUES
(#{deviceId},#{deviceName},#{moduleName},#{productName},#{networkAddress},#{cartonType},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{deviceId},#{deviceName},#{moduleName},#{productName},#{networkAddress},#{cartonType},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{siteId})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_device_module insert into mortals_xhx_device_module
(deviceId,deviceName,moduleName,productName,networkAddress,cartonType,createUserId,createTime,updateUserId,updateTime) (deviceId,deviceName,moduleName,productName,networkAddress,cartonType,createUserId,createTime,updateUserId,updateTime,siteId)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.deviceId},#{item.deviceName},#{item.moduleName},#{item.productName},#{item.networkAddress},#{item.cartonType},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.deviceId},#{item.deviceName},#{item.moduleName},#{item.productName},#{item.networkAddress},#{item.cartonType},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.siteId})
</foreach> </foreach>
</insert> </insert>
...@@ -121,6 +125,12 @@ ...@@ -121,6 +125,12 @@
<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>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -218,6 +228,18 @@ ...@@ -218,6 +228,18 @@
</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> </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=")">
...@@ -241,6 +263,21 @@ ...@@ -241,6 +263,21 @@
#{item} #{item}
</foreach> </foreach>
</delete> </delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_xhx_device_module where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_xhx_device_module where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 --> <!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto"> <delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_device_module as a delete a.* from mortals_xhx_device_module as a
...@@ -327,12 +364,18 @@ ...@@ -327,12 +364,18 @@
${_conditionType_} a.id is null ${_conditionType_} a.id is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in ${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart} ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
...@@ -348,12 +391,18 @@ ...@@ -348,12 +391,18 @@
${_conditionType_} a.deviceId is null ${_conditionType_} a.deviceId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deviceIdList')"> <if test="conditionParamRef.containsKey('deviceIdList') and conditionParamRef.deviceIdList.size() > 0">
${_conditionType_} a.deviceId in ${_conditionType_} a.deviceId in
<foreach collection="conditionParamRef.deviceIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deviceIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deviceIdNotList') and conditionParamRef.deviceIdNotList.size() > 0">
${_conditionType_} a.deviceId not in
<foreach collection="conditionParamRef.deviceIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceIdStart') and conditionParamRef.deviceIdStart != null"> <if test="conditionParamRef.containsKey('deviceIdStart') and conditionParamRef.deviceIdStart != null">
${_conditionType_} a.deviceId <![CDATA[ >= ]]> #{${_conditionParam_}.deviceIdStart} ${_conditionType_} a.deviceId <![CDATA[ >= ]]> #{${_conditionParam_}.deviceIdStart}
</if> </if>
...@@ -370,12 +419,18 @@ ...@@ -370,12 +419,18 @@
${_conditionType_} a.deviceName is null ${_conditionType_} a.deviceName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deviceNameList')"> <if test="conditionParamRef.containsKey('deviceNameList') and conditionParamRef.deviceNameList.size() > 0">
${_conditionType_} a.deviceName in ${_conditionType_} a.deviceName in
<foreach collection="conditionParamRef.deviceNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deviceNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deviceNameNotList') and conditionParamRef.deviceNameNotList.size() > 0">
${_conditionType_} a.deviceName not in
<foreach collection="conditionParamRef.deviceNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('moduleName')"> <if test="conditionParamRef.containsKey('moduleName')">
<if test="conditionParamRef.moduleName != null and conditionParamRef.moduleName != ''"> <if test="conditionParamRef.moduleName != null and conditionParamRef.moduleName != ''">
...@@ -385,12 +440,18 @@ ...@@ -385,12 +440,18 @@
${_conditionType_} a.moduleName is null ${_conditionType_} a.moduleName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('moduleNameList')"> <if test="conditionParamRef.containsKey('moduleNameList') and conditionParamRef.moduleNameList.size() > 0">
${_conditionType_} a.moduleName in ${_conditionType_} a.moduleName in
<foreach collection="conditionParamRef.moduleNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.moduleNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('moduleNameNotList') and conditionParamRef.moduleNameNotList.size() > 0">
${_conditionType_} a.moduleName not in
<foreach collection="conditionParamRef.moduleNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('productName')"> <if test="conditionParamRef.containsKey('productName')">
<if test="conditionParamRef.productName != null and conditionParamRef.productName != ''"> <if test="conditionParamRef.productName != null and conditionParamRef.productName != ''">
...@@ -400,12 +461,18 @@ ...@@ -400,12 +461,18 @@
${_conditionType_} a.productName is null ${_conditionType_} a.productName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('productNameList')"> <if test="conditionParamRef.containsKey('productNameList') and conditionParamRef.productNameList.size() > 0">
${_conditionType_} a.productName in ${_conditionType_} a.productName in
<foreach collection="conditionParamRef.productNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.productNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('productNameNotList') and conditionParamRef.productNameNotList.size() > 0">
${_conditionType_} a.productName not in
<foreach collection="conditionParamRef.productNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('networkAddress')"> <if test="conditionParamRef.containsKey('networkAddress')">
<if test="conditionParamRef.networkAddress != null and conditionParamRef.networkAddress != ''"> <if test="conditionParamRef.networkAddress != null and conditionParamRef.networkAddress != ''">
...@@ -415,12 +482,18 @@ ...@@ -415,12 +482,18 @@
${_conditionType_} a.networkAddress is null ${_conditionType_} a.networkAddress is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('networkAddressList')"> <if test="conditionParamRef.containsKey('networkAddressList') and conditionParamRef.networkAddressList.size() > 0">
${_conditionType_} a.networkAddress in ${_conditionType_} a.networkAddress in
<foreach collection="conditionParamRef.networkAddressList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.networkAddressList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('networkAddressNotList') and conditionParamRef.networkAddressNotList.size() > 0">
${_conditionType_} a.networkAddress not in
<foreach collection="conditionParamRef.networkAddressNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('cartonType')"> <if test="conditionParamRef.containsKey('cartonType')">
<if test="conditionParamRef.cartonType != null and conditionParamRef.cartonType != ''"> <if test="conditionParamRef.cartonType != null and conditionParamRef.cartonType != ''">
...@@ -430,12 +503,18 @@ ...@@ -430,12 +503,18 @@
${_conditionType_} a.cartonType is null ${_conditionType_} a.cartonType is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('cartonTypeList')"> <if test="conditionParamRef.containsKey('cartonTypeList') and conditionParamRef.cartonTypeList.size() > 0">
${_conditionType_} a.cartonType in ${_conditionType_} a.cartonType in
<foreach collection="conditionParamRef.cartonTypeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.cartonTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('cartonTypeNotList') and conditionParamRef.cartonTypeNotList.size() > 0">
${_conditionType_} a.cartonType not in
<foreach collection="conditionParamRef.cartonTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserId')"> <if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null "> <if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId} ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
...@@ -444,12 +523,18 @@ ...@@ -444,12 +523,18 @@
${_conditionType_} a.createUserId is null ${_conditionType_} a.createUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in ${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if> </if>
...@@ -480,12 +565,18 @@ ...@@ -480,12 +565,18 @@
${_conditionType_} a.updateUserId is null ${_conditionType_} a.updateUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdList')"> <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in ${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null"> <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart} ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if> </if>
...@@ -508,6 +599,33 @@ ...@@ -508,6 +599,33 @@
<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>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -576,6 +694,11 @@ ...@@ -576,6 +694,11 @@
<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>
</trim> </trim>
</if> </if>
</sql> </sql>
......
certificate-manager/src/main/resources/sqlmap/module/print/PrintCatalogMapper.xml
View file @ 4018c60f
<?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.print.dao.ibatis.PrintCatalogDaoImpl"> <mapper namespace="com.mortals.xhx.module.print.dao.ibatis.PrintCatalogDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="serviceId" column="serviceId" /> <result property="serviceId" column="serviceId" />
<result property="siteId" column="siteId" />
</resultMap> </resultMap>
...@@ -60,23 +61,26 @@ ...@@ -60,23 +61,26 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('serviceId') or colPickMode == 1 and data.containsKey('serviceId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('serviceId') or colPickMode == 1 and data.containsKey('serviceId')))">
a.serviceId, a.serviceId,
</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>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="PrintCatalogEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="PrintCatalogEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_print_catalog insert into mortals_xhx_print_catalog
(catalogId,catalogCode,catalogName,printerName,printerIp,paperSource,createUserId,createTime,updateUserId,updateTime,serviceId) (catalogId,catalogCode,catalogName,printerName,printerIp,paperSource,createUserId,createTime,updateUserId,updateTime,serviceId,siteId)
VALUES VALUES
(#{catalogId},#{catalogCode},#{catalogName},#{printerName},#{printerIp},#{paperSource},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{serviceId}) (#{catalogId},#{catalogCode},#{catalogName},#{printerName},#{printerIp},#{paperSource},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{serviceId},#{siteId})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_print_catalog insert into mortals_xhx_print_catalog
(catalogId,catalogCode,catalogName,printerName,printerIp,paperSource,createUserId,createTime,updateUserId,updateTime,serviceId) (catalogId,catalogCode,catalogName,printerName,printerIp,paperSource,createUserId,createTime,updateUserId,updateTime,serviceId,siteId)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.printerName},#{item.printerIp},#{item.paperSource},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.serviceId}) (#{item.catalogId},#{item.catalogCode},#{item.catalogName},#{item.printerName},#{item.printerIp},#{item.paperSource},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.serviceId},#{item.siteId})
</foreach> </foreach>
</insert> </insert>
...@@ -131,6 +135,12 @@ ...@@ -131,6 +135,12 @@
<if test="(colPickMode==0 and data.containsKey('serviceIdIncrement')) or (colPickMode==1 and !data.containsKey('serviceIdIncrement'))"> <if test="(colPickMode==0 and data.containsKey('serviceIdIncrement')) or (colPickMode==1 and !data.containsKey('serviceIdIncrement'))">
a.serviceId=ifnull(a.serviceId,0) + #{data.serviceIdIncrement}, a.serviceId=ifnull(a.serviceId,0) + #{data.serviceIdIncrement},
</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>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -240,6 +250,18 @@ ...@@ -240,6 +250,18 @@
</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> </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=")">
...@@ -263,6 +285,21 @@ ...@@ -263,6 +285,21 @@
#{item} #{item}
</foreach> </foreach>
</delete> </delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_xhx_print_catalog where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_xhx_print_catalog where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 --> <!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto"> <delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_print_catalog as a delete a.* from mortals_xhx_print_catalog as a
...@@ -349,12 +386,18 @@ ...@@ -349,12 +386,18 @@
${_conditionType_} a.id is null ${_conditionType_} a.id is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in ${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart} ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
...@@ -370,12 +413,18 @@ ...@@ -370,12 +413,18 @@
${_conditionType_} a.catalogId is null ${_conditionType_} a.catalogId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('catalogIdList')"> <if test="conditionParamRef.containsKey('catalogIdList') and conditionParamRef.catalogIdList.size() > 0">
${_conditionType_} a.catalogId in ${_conditionType_} a.catalogId in
<foreach collection="conditionParamRef.catalogIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.catalogIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('catalogIdNotList') and conditionParamRef.catalogIdNotList.size() > 0">
${_conditionType_} a.catalogId not in
<foreach collection="conditionParamRef.catalogIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('catalogIdStart') and conditionParamRef.catalogIdStart != null"> <if test="conditionParamRef.containsKey('catalogIdStart') and conditionParamRef.catalogIdStart != null">
${_conditionType_} a.catalogId <![CDATA[ >= ]]> #{${_conditionParam_}.catalogIdStart} ${_conditionType_} a.catalogId <![CDATA[ >= ]]> #{${_conditionParam_}.catalogIdStart}
</if> </if>
...@@ -392,12 +441,18 @@ ...@@ -392,12 +441,18 @@
${_conditionType_} a.catalogCode is null ${_conditionType_} a.catalogCode is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('catalogCodeList')"> <if test="conditionParamRef.containsKey('catalogCodeList') and conditionParamRef.catalogCodeList.size() > 0">
${_conditionType_} a.catalogCode in ${_conditionType_} a.catalogCode in
<foreach collection="conditionParamRef.catalogCodeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.catalogCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('catalogCodeNotList') and conditionParamRef.catalogCodeNotList.size() > 0">
${_conditionType_} a.catalogCode not in
<foreach collection="conditionParamRef.catalogCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('catalogName')"> <if test="conditionParamRef.containsKey('catalogName')">
<if test="conditionParamRef.catalogName != null and conditionParamRef.catalogName != ''"> <if test="conditionParamRef.catalogName != null and conditionParamRef.catalogName != ''">
...@@ -407,12 +462,18 @@ ...@@ -407,12 +462,18 @@
${_conditionType_} a.catalogName is null ${_conditionType_} a.catalogName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('catalogNameList')"> <if test="conditionParamRef.containsKey('catalogNameList') and conditionParamRef.catalogNameList.size() > 0">
${_conditionType_} a.catalogName in ${_conditionType_} a.catalogName in
<foreach collection="conditionParamRef.catalogNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.catalogNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('catalogNameNotList') and conditionParamRef.catalogNameNotList.size() > 0">
${_conditionType_} a.catalogName not in
<foreach collection="conditionParamRef.catalogNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('printerName')"> <if test="conditionParamRef.containsKey('printerName')">
<if test="conditionParamRef.printerName != null and conditionParamRef.printerName != ''"> <if test="conditionParamRef.printerName != null and conditionParamRef.printerName != ''">
...@@ -422,12 +483,18 @@ ...@@ -422,12 +483,18 @@
${_conditionType_} a.printerName is null ${_conditionType_} a.printerName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('printerNameList')"> <if test="conditionParamRef.containsKey('printerNameList') and conditionParamRef.printerNameList.size() > 0">
${_conditionType_} a.printerName in ${_conditionType_} a.printerName in
<foreach collection="conditionParamRef.printerNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.printerNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('printerNameNotList') and conditionParamRef.printerNameNotList.size() > 0">
${_conditionType_} a.printerName not in
<foreach collection="conditionParamRef.printerNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('printerIp')"> <if test="conditionParamRef.containsKey('printerIp')">
<if test="conditionParamRef.printerIp != null and conditionParamRef.printerIp != ''"> <if test="conditionParamRef.printerIp != null and conditionParamRef.printerIp != ''">
...@@ -437,12 +504,18 @@ ...@@ -437,12 +504,18 @@
${_conditionType_} a.printerIp is null ${_conditionType_} a.printerIp is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('printerIpList')"> <if test="conditionParamRef.containsKey('printerIpList') and conditionParamRef.printerIpList.size() > 0">
${_conditionType_} a.printerIp in ${_conditionType_} a.printerIp in
<foreach collection="conditionParamRef.printerIpList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.printerIpList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('printerIpNotList') and conditionParamRef.printerIpNotList.size() > 0">
${_conditionType_} a.printerIp not in
<foreach collection="conditionParamRef.printerIpNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('paperSource')"> <if test="conditionParamRef.containsKey('paperSource')">
<if test="conditionParamRef.paperSource != null and conditionParamRef.paperSource != ''"> <if test="conditionParamRef.paperSource != null and conditionParamRef.paperSource != ''">
...@@ -452,12 +525,18 @@ ...@@ -452,12 +525,18 @@
${_conditionType_} a.paperSource is null ${_conditionType_} a.paperSource is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('paperSourceList')"> <if test="conditionParamRef.containsKey('paperSourceList') and conditionParamRef.paperSourceList.size() > 0">
${_conditionType_} a.paperSource in ${_conditionType_} a.paperSource in
<foreach collection="conditionParamRef.paperSourceList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.paperSourceList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('paperSourceNotList') and conditionParamRef.paperSourceNotList.size() > 0">
${_conditionType_} a.paperSource not in
<foreach collection="conditionParamRef.paperSourceNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserId')"> <if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null "> <if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId} ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
...@@ -466,12 +545,18 @@ ...@@ -466,12 +545,18 @@
${_conditionType_} a.createUserId is null ${_conditionType_} a.createUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in ${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if> </if>
...@@ -502,12 +587,18 @@ ...@@ -502,12 +587,18 @@
${_conditionType_} a.updateUserId is null ${_conditionType_} a.updateUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdList')"> <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in ${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null"> <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart} ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if> </if>
...@@ -538,12 +629,18 @@ ...@@ -538,12 +629,18 @@
${_conditionType_} a.serviceId is null ${_conditionType_} a.serviceId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('serviceIdList')"> <if test="conditionParamRef.containsKey('serviceIdList') and conditionParamRef.serviceIdList.size() > 0">
${_conditionType_} a.serviceId in ${_conditionType_} a.serviceId in
<foreach collection="conditionParamRef.serviceIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.serviceIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('serviceIdNotList') and conditionParamRef.serviceIdNotList.size() > 0">
${_conditionType_} a.serviceId not in
<foreach collection="conditionParamRef.serviceIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('serviceIdStart') and conditionParamRef.serviceIdStart != null"> <if test="conditionParamRef.containsKey('serviceIdStart') and conditionParamRef.serviceIdStart != null">
${_conditionType_} a.serviceId <![CDATA[ >= ]]> #{${_conditionParam_}.serviceIdStart} ${_conditionType_} a.serviceId <![CDATA[ >= ]]> #{${_conditionParam_}.serviceIdStart}
</if> </if>
...@@ -551,6 +648,33 @@ ...@@ -551,6 +648,33 @@
${_conditionType_} a.serviceId <![CDATA[ <= ]]> #{${_conditionParam_}.serviceIdEnd} ${_conditionType_} a.serviceId <![CDATA[ <= ]]> #{${_conditionParam_}.serviceIdEnd}
</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>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -624,6 +748,11 @@ ...@@ -624,6 +748,11 @@
<if test='orderCol.serviceId != null and "DESC".equalsIgnoreCase(orderCol.serviceId)'>DESC</if> <if test='orderCol.serviceId != null and "DESC".equalsIgnoreCase(orderCol.serviceId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
certificate-manager/src/main/resources/sqlmap/module/print/PrintServiceMapper.xml
View file @ 4018c60f
<?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.print.dao.ibatis.PrintServiceDaoImpl"> <mapper namespace="com.mortals.xhx.module.print.dao.ibatis.PrintServiceDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<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" />
</resultMap> </resultMap>
...@@ -40,23 +41,26 @@ ...@@ -40,23 +41,26 @@
<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>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="PrintServiceEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="PrintServiceEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_print_service insert into mortals_xhx_print_service
(serviceName,serviceUrl,createUserId,createTime,updateUserId,updateTime) (serviceName,serviceUrl,createUserId,createTime,updateUserId,updateTime,siteId)
VALUES VALUES
(#{serviceName},#{serviceUrl},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{serviceName},#{serviceUrl},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{siteId})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_print_service insert into mortals_xhx_print_service
(serviceName,serviceUrl,createUserId,createTime,updateUserId,updateTime) (serviceName,serviceUrl,createUserId,createTime,updateUserId,updateTime,siteId)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.serviceName},#{item.serviceUrl},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.serviceName},#{item.serviceUrl},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.siteId})
</foreach> </foreach>
</insert> </insert>
...@@ -90,6 +94,12 @@ ...@@ -90,6 +94,12 @@
<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>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -154,6 +164,18 @@ ...@@ -154,6 +164,18 @@
</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> </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=")">
...@@ -177,6 +199,21 @@ ...@@ -177,6 +199,21 @@
#{item} #{item}
</foreach> </foreach>
</delete> </delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_xhx_print_service where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_xhx_print_service where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 --> <!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto"> <delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_print_service as a delete a.* from mortals_xhx_print_service as a
...@@ -263,12 +300,18 @@ ...@@ -263,12 +300,18 @@
${_conditionType_} a.id is null ${_conditionType_} a.id is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in ${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart} ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
...@@ -285,12 +328,18 @@ ...@@ -285,12 +328,18 @@
${_conditionType_} a.serviceName is null ${_conditionType_} a.serviceName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('serviceNameList')"> <if test="conditionParamRef.containsKey('serviceNameList') and conditionParamRef.serviceNameList.size() > 0">
${_conditionType_} a.serviceName in ${_conditionType_} a.serviceName in
<foreach collection="conditionParamRef.serviceNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.serviceNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('serviceNameNotList') and conditionParamRef.serviceNameNotList.size() > 0">
${_conditionType_} a.serviceName not in
<foreach collection="conditionParamRef.serviceNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('serviceUrl')"> <if test="conditionParamRef.containsKey('serviceUrl')">
<if test="conditionParamRef.serviceUrl != null and conditionParamRef.serviceUrl != ''"> <if test="conditionParamRef.serviceUrl != null and conditionParamRef.serviceUrl != ''">
...@@ -300,12 +349,18 @@ ...@@ -300,12 +349,18 @@
${_conditionType_} a.serviceUrl is null ${_conditionType_} a.serviceUrl is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('serviceUrlList')"> <if test="conditionParamRef.containsKey('serviceUrlList') and conditionParamRef.serviceUrlList.size() > 0">
${_conditionType_} a.serviceUrl in ${_conditionType_} a.serviceUrl in
<foreach collection="conditionParamRef.serviceUrlList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.serviceUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('serviceUrlNotList') and conditionParamRef.serviceUrlNotList.size() > 0">
${_conditionType_} a.serviceUrl not in
<foreach collection="conditionParamRef.serviceUrlNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserId')"> <if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null "> <if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId} ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
...@@ -314,12 +369,18 @@ ...@@ -314,12 +369,18 @@
${_conditionType_} a.createUserId is null ${_conditionType_} a.createUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in ${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if> </if>
...@@ -350,12 +411,18 @@ ...@@ -350,12 +411,18 @@
${_conditionType_} a.updateUserId is null ${_conditionType_} a.updateUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdList')"> <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in ${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null"> <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart} ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if> </if>
...@@ -378,6 +445,33 @@ ...@@ -378,6 +445,33 @@
<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>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -426,6 +520,11 @@ ...@@ -426,6 +520,11 @@
<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>
</trim> </trim>
</if> </if>
</sql> </sql>
......
certificate-manager/src/main/resources/sqlmap/module/record/ApplyLogMapper.xml
View file @ 4018c60f
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
<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" />
</resultMap> </resultMap>
...@@ -128,23 +129,26 @@ ...@@ -128,23 +129,26 @@
<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>
</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
(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) (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)
VALUES VALUES
(#{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}) (#{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})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_apply_log insert into mortals_xhx_apply_log
(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) (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)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{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.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})
</foreach> </foreach>
</insert> </insert>
...@@ -265,6 +269,12 @@ ...@@ -265,6 +269,12 @@
<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>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -518,6 +528,18 @@ ...@@ -518,6 +528,18 @@
</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> </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=")">
...@@ -541,6 +563,21 @@ ...@@ -541,6 +563,21 @@
#{item} #{item}
</foreach> </foreach>
</delete> </delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_xhx_apply_log where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_xhx_apply_log where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 --> <!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto"> <delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_apply_log as a delete a.* from mortals_xhx_apply_log as a
...@@ -627,12 +664,18 @@ ...@@ -627,12 +664,18 @@
${_conditionType_} a.id is null ${_conditionType_} a.id is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in ${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart} ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
...@@ -648,12 +691,18 @@ ...@@ -648,12 +691,18 @@
${_conditionType_} a.recordId is null ${_conditionType_} a.recordId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('recordIdList')"> <if test="conditionParamRef.containsKey('recordIdList') and conditionParamRef.recordIdList.size() > 0">
${_conditionType_} a.recordId in ${_conditionType_} a.recordId in
<foreach collection="conditionParamRef.recordIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.recordIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('recordIdNotList') and conditionParamRef.recordIdNotList.size() > 0">
${_conditionType_} a.recordId not in
<foreach collection="conditionParamRef.recordIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('recordIdStart') and conditionParamRef.recordIdStart != null"> <if test="conditionParamRef.containsKey('recordIdStart') and conditionParamRef.recordIdStart != null">
${_conditionType_} a.recordId <![CDATA[ >= ]]> #{${_conditionParam_}.recordIdStart} ${_conditionType_} a.recordId <![CDATA[ >= ]]> #{${_conditionParam_}.recordIdStart}
</if> </if>
...@@ -669,12 +718,18 @@ ...@@ -669,12 +718,18 @@
${_conditionType_} a.catalogId is null ${_conditionType_} a.catalogId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('catalogIdList')"> <if test="conditionParamRef.containsKey('catalogIdList') and conditionParamRef.catalogIdList.size() > 0">
${_conditionType_} a.catalogId in ${_conditionType_} a.catalogId in
<foreach collection="conditionParamRef.catalogIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.catalogIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('catalogIdNotList') and conditionParamRef.catalogIdNotList.size() > 0">
${_conditionType_} a.catalogId not in
<foreach collection="conditionParamRef.catalogIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('catalogIdStart') and conditionParamRef.catalogIdStart != null"> <if test="conditionParamRef.containsKey('catalogIdStart') and conditionParamRef.catalogIdStart != null">
${_conditionType_} a.catalogId <![CDATA[ >= ]]> #{${_conditionParam_}.catalogIdStart} ${_conditionType_} a.catalogId <![CDATA[ >= ]]> #{${_conditionParam_}.catalogIdStart}
</if> </if>
...@@ -691,12 +746,18 @@ ...@@ -691,12 +746,18 @@
${_conditionType_} a.catalogCode is null ${_conditionType_} a.catalogCode is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('catalogCodeList')"> <if test="conditionParamRef.containsKey('catalogCodeList') and conditionParamRef.catalogCodeList.size() > 0">
${_conditionType_} a.catalogCode in ${_conditionType_} a.catalogCode in
<foreach collection="conditionParamRef.catalogCodeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.catalogCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('catalogCodeNotList') and conditionParamRef.catalogCodeNotList.size() > 0">
${_conditionType_} a.catalogCode not in
<foreach collection="conditionParamRef.catalogCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('catalogName')"> <if test="conditionParamRef.containsKey('catalogName')">
<if test="conditionParamRef.catalogName != null and conditionParamRef.catalogName != ''"> <if test="conditionParamRef.catalogName != null and conditionParamRef.catalogName != ''">
...@@ -706,12 +767,18 @@ ...@@ -706,12 +767,18 @@
${_conditionType_} a.catalogName is null ${_conditionType_} a.catalogName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('catalogNameList')"> <if test="conditionParamRef.containsKey('catalogNameList') and conditionParamRef.catalogNameList.size() > 0">
${_conditionType_} a.catalogName in ${_conditionType_} a.catalogName in
<foreach collection="conditionParamRef.catalogNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.catalogNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('catalogNameNotList') and conditionParamRef.catalogNameNotList.size() > 0">
${_conditionType_} a.catalogName not in
<foreach collection="conditionParamRef.catalogNameNotList" 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 != ''">
...@@ -721,12 +788,18 @@ ...@@ -721,12 +788,18 @@
${_conditionType_} a.certificateCode is null ${_conditionType_} a.certificateCode is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('certificateCodeList')"> <if test="conditionParamRef.containsKey('certificateCodeList') and conditionParamRef.certificateCodeList.size() > 0">
${_conditionType_} a.certificateCode in ${_conditionType_} a.certificateCode in
<foreach collection="conditionParamRef.certificateCodeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.certificateCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('certificateCodeNotList') and conditionParamRef.certificateCodeNotList.size() > 0">
${_conditionType_} a.certificateCode not in
<foreach collection="conditionParamRef.certificateCodeNotList" 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 != ''">
...@@ -736,12 +809,18 @@ ...@@ -736,12 +809,18 @@
${_conditionType_} a.certificateName is null ${_conditionType_} a.certificateName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('certificateNameList')"> <if test="conditionParamRef.containsKey('certificateNameList') and conditionParamRef.certificateNameList.size() > 0">
${_conditionType_} a.certificateName in ${_conditionType_} a.certificateName in
<foreach collection="conditionParamRef.certificateNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.certificateNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('certificateNameNotList') and conditionParamRef.certificateNameNotList.size() > 0">
${_conditionType_} a.certificateName not in
<foreach collection="conditionParamRef.certificateNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('issueTime')"> <if test="conditionParamRef.containsKey('issueTime')">
<if test="conditionParamRef.issueTime != null "> <if test="conditionParamRef.issueTime != null ">
...@@ -766,12 +845,18 @@ ...@@ -766,12 +845,18 @@
${_conditionType_} a.pickerName is null ${_conditionType_} a.pickerName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('pickerNameList')"> <if test="conditionParamRef.containsKey('pickerNameList') and conditionParamRef.pickerNameList.size() > 0">
${_conditionType_} a.pickerName in ${_conditionType_} a.pickerName in
<foreach collection="conditionParamRef.pickerNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.pickerNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('pickerNameNotList') and conditionParamRef.pickerNameNotList.size() > 0">
${_conditionType_} a.pickerName not in
<foreach collection="conditionParamRef.pickerNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('pickerIDCardNo')"> <if test="conditionParamRef.containsKey('pickerIDCardNo')">
<if test="conditionParamRef.pickerIDCardNo != null and conditionParamRef.pickerIDCardNo != ''"> <if test="conditionParamRef.pickerIDCardNo != null and conditionParamRef.pickerIDCardNo != ''">
...@@ -781,12 +866,18 @@ ...@@ -781,12 +866,18 @@
${_conditionType_} a.pickerIDCardNo is null ${_conditionType_} a.pickerIDCardNo is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('pickerIDCardNoList')"> <if test="conditionParamRef.containsKey('pickerIDCardNoList') and conditionParamRef.pickerIDCardNoList.size() > 0">
${_conditionType_} a.pickerIDCardNo in ${_conditionType_} a.pickerIDCardNo in
<foreach collection="conditionParamRef.pickerIDCardNoList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.pickerIDCardNoList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('pickerIDCardNoNotList') and conditionParamRef.pickerIDCardNoNotList.size() > 0">
${_conditionType_} a.pickerIDCardNo not in
<foreach collection="conditionParamRef.pickerIDCardNoNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('holderType')"> <if test="conditionParamRef.containsKey('holderType')">
<if test="conditionParamRef.holderType != null "> <if test="conditionParamRef.holderType != null ">
${_conditionType_} a.holderType = #{${_conditionParam_}.holderType} ${_conditionType_} a.holderType = #{${_conditionParam_}.holderType}
...@@ -795,12 +886,18 @@ ...@@ -795,12 +886,18 @@
${_conditionType_} a.holderType is null ${_conditionType_} a.holderType is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('holderTypeList')"> <if test="conditionParamRef.containsKey('holderTypeList') and conditionParamRef.holderTypeList.size() > 0">
${_conditionType_} a.holderType in ${_conditionType_} a.holderType in
<foreach collection="conditionParamRef.holderTypeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.holderTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('holderTypeNotList') and conditionParamRef.holderTypeNotList.size() > 0">
${_conditionType_} a.holderType not in
<foreach collection="conditionParamRef.holderTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('holderTypeStart') and conditionParamRef.holderTypeStart != null"> <if test="conditionParamRef.containsKey('holderTypeStart') and conditionParamRef.holderTypeStart != null">
${_conditionType_} a.holderType <![CDATA[ >= ]]> #{${_conditionParam_}.holderTypeStart} ${_conditionType_} a.holderType <![CDATA[ >= ]]> #{${_conditionParam_}.holderTypeStart}
</if> </if>
...@@ -816,12 +913,18 @@ ...@@ -816,12 +913,18 @@
${_conditionType_} a.holderIdType is null ${_conditionType_} a.holderIdType is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('holderIdTypeList')"> <if test="conditionParamRef.containsKey('holderIdTypeList') and conditionParamRef.holderIdTypeList.size() > 0">
${_conditionType_} a.holderIdType in ${_conditionType_} a.holderIdType in
<foreach collection="conditionParamRef.holderIdTypeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.holderIdTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('holderIdTypeNotList') and conditionParamRef.holderIdTypeNotList.size() > 0">
${_conditionType_} a.holderIdType not in
<foreach collection="conditionParamRef.holderIdTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('holderIdTypeStart') and conditionParamRef.holderIdTypeStart != null"> <if test="conditionParamRef.containsKey('holderIdTypeStart') and conditionParamRef.holderIdTypeStart != null">
${_conditionType_} a.holderIdType <![CDATA[ >= ]]> #{${_conditionParam_}.holderIdTypeStart} ${_conditionType_} a.holderIdType <![CDATA[ >= ]]> #{${_conditionParam_}.holderIdTypeStart}
</if> </if>
...@@ -838,12 +941,18 @@ ...@@ -838,12 +941,18 @@
${_conditionType_} a.holderName is null ${_conditionType_} a.holderName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('holderNameList')"> <if test="conditionParamRef.containsKey('holderNameList') and conditionParamRef.holderNameList.size() > 0">
${_conditionType_} a.holderName in ${_conditionType_} a.holderName in
<foreach collection="conditionParamRef.holderNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.holderNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('holderNameNotList') and conditionParamRef.holderNameNotList.size() > 0">
${_conditionType_} a.holderName not in
<foreach collection="conditionParamRef.holderNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('holderIDCardNo')"> <if test="conditionParamRef.containsKey('holderIDCardNo')">
<if test="conditionParamRef.holderIDCardNo != null and conditionParamRef.holderIDCardNo != ''"> <if test="conditionParamRef.holderIDCardNo != null and conditionParamRef.holderIDCardNo != ''">
...@@ -853,12 +962,18 @@ ...@@ -853,12 +962,18 @@
${_conditionType_} a.holderIDCardNo is null ${_conditionType_} a.holderIDCardNo is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('holderIDCardNoList')"> <if test="conditionParamRef.containsKey('holderIDCardNoList') and conditionParamRef.holderIDCardNoList.size() > 0">
${_conditionType_} a.holderIDCardNo in ${_conditionType_} a.holderIDCardNo in
<foreach collection="conditionParamRef.holderIDCardNoList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.holderIDCardNoList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('holderIDCardNoNotList') and conditionParamRef.holderIDCardNoNotList.size() > 0">
${_conditionType_} a.holderIDCardNo not in
<foreach collection="conditionParamRef.holderIDCardNoNotList" 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 != ''">
...@@ -868,12 +983,18 @@ ...@@ -868,12 +983,18 @@
${_conditionType_} a.enterpriseName is null ${_conditionType_} a.enterpriseName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('enterpriseNameList')"> <if test="conditionParamRef.containsKey('enterpriseNameList') and conditionParamRef.enterpriseNameList.size() > 0">
${_conditionType_} a.enterpriseName in ${_conditionType_} a.enterpriseName in
<foreach collection="conditionParamRef.enterpriseNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.enterpriseNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('enterpriseNameNotList') and conditionParamRef.enterpriseNameNotList.size() > 0">
${_conditionType_} a.enterpriseName not in
<foreach collection="conditionParamRef.enterpriseNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('validityStart')"> <if test="conditionParamRef.containsKey('validityStart')">
<if test="conditionParamRef.validityStart != null "> <if test="conditionParamRef.validityStart != null ">
...@@ -913,12 +1034,18 @@ ...@@ -913,12 +1034,18 @@
${_conditionType_} a.privateID is null ${_conditionType_} a.privateID is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('privateIDList')"> <if test="conditionParamRef.containsKey('privateIDList') and conditionParamRef.privateIDList.size() > 0">
${_conditionType_} a.privateID in ${_conditionType_} a.privateID in
<foreach collection="conditionParamRef.privateIDList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.privateIDList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('privateIDNotList') and conditionParamRef.privateIDNotList.size() > 0">
${_conditionType_} a.privateID not in
<foreach collection="conditionParamRef.privateIDNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('certificateUrl')"> <if test="conditionParamRef.containsKey('certificateUrl')">
<if test="conditionParamRef.certificateUrl != null and conditionParamRef.certificateUrl != ''"> <if test="conditionParamRef.certificateUrl != null and conditionParamRef.certificateUrl != ''">
...@@ -928,12 +1055,18 @@ ...@@ -928,12 +1055,18 @@
${_conditionType_} a.certificateUrl is null ${_conditionType_} a.certificateUrl is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('certificateUrlList')"> <if test="conditionParamRef.containsKey('certificateUrlList') and conditionParamRef.certificateUrlList.size() > 0">
${_conditionType_} a.certificateUrl in ${_conditionType_} a.certificateUrl in
<foreach collection="conditionParamRef.certificateUrlList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.certificateUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('certificateUrlNotList') and conditionParamRef.certificateUrlNotList.size() > 0">
${_conditionType_} a.certificateUrl not in
<foreach collection="conditionParamRef.certificateUrlNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('previewUrl')"> <if test="conditionParamRef.containsKey('previewUrl')">
<if test="conditionParamRef.previewUrl != null and conditionParamRef.previewUrl != ''"> <if test="conditionParamRef.previewUrl != null and conditionParamRef.previewUrl != ''">
...@@ -943,12 +1076,18 @@ ...@@ -943,12 +1076,18 @@
${_conditionType_} a.previewUrl is null ${_conditionType_} a.previewUrl is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('previewUrlList')"> <if test="conditionParamRef.containsKey('previewUrlList') and conditionParamRef.previewUrlList.size() > 0">
${_conditionType_} a.previewUrl in ${_conditionType_} a.previewUrl in
<foreach collection="conditionParamRef.previewUrlList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.previewUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('previewUrlNotList') and conditionParamRef.previewUrlNotList.size() > 0">
${_conditionType_} a.previewUrl not in
<foreach collection="conditionParamRef.previewUrlNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('formContent')"> <if test="conditionParamRef.containsKey('formContent')">
<if test="conditionParamRef.formContent != null and conditionParamRef.formContent != ''"> <if test="conditionParamRef.formContent != null and conditionParamRef.formContent != ''">
...@@ -958,12 +1097,18 @@ ...@@ -958,12 +1097,18 @@
${_conditionType_} a.formContent is null ${_conditionType_} a.formContent is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('formContentList')"> <if test="conditionParamRef.containsKey('formContentList') and conditionParamRef.formContentList.size() > 0">
${_conditionType_} a.formContent in ${_conditionType_} a.formContent in
<foreach collection="conditionParamRef.formContentList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.formContentList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('formContentNotList') and conditionParamRef.formContentNotList.size() > 0">
${_conditionType_} a.formContent not in
<foreach collection="conditionParamRef.formContentNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('formTemplate')"> <if test="conditionParamRef.containsKey('formTemplate')">
<if test="conditionParamRef.formTemplate != null and conditionParamRef.formTemplate != ''"> <if test="conditionParamRef.formTemplate != null and conditionParamRef.formTemplate != ''">
...@@ -973,12 +1118,18 @@ ...@@ -973,12 +1118,18 @@
${_conditionType_} a.formTemplate is null ${_conditionType_} a.formTemplate is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('formTemplateList')"> <if test="conditionParamRef.containsKey('formTemplateList') and conditionParamRef.formTemplateList.size() > 0">
${_conditionType_} a.formTemplate in ${_conditionType_} a.formTemplate in
<foreach collection="conditionParamRef.formTemplateList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.formTemplateList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('formTemplateNotList') and conditionParamRef.formTemplateNotList.size() > 0">
${_conditionType_} a.formTemplate not in
<foreach collection="conditionParamRef.formTemplateNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('generateStatus')"> <if test="conditionParamRef.containsKey('generateStatus')">
<if test="conditionParamRef.generateStatus != null "> <if test="conditionParamRef.generateStatus != null ">
${_conditionType_} a.generateStatus = #{${_conditionParam_}.generateStatus} ${_conditionType_} a.generateStatus = #{${_conditionParam_}.generateStatus}
...@@ -987,12 +1138,18 @@ ...@@ -987,12 +1138,18 @@
${_conditionType_} a.generateStatus is null ${_conditionType_} a.generateStatus is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('generateStatusList')"> <if test="conditionParamRef.containsKey('generateStatusList') and conditionParamRef.generateStatusList.size() > 0">
${_conditionType_} a.generateStatus in ${_conditionType_} a.generateStatus in
<foreach collection="conditionParamRef.generateStatusList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.generateStatusList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('generateStatusNotList') and conditionParamRef.generateStatusNotList.size() > 0">
${_conditionType_} a.generateStatus not in
<foreach collection="conditionParamRef.generateStatusNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('generateStatusStart') and conditionParamRef.generateStatusStart != null"> <if test="conditionParamRef.containsKey('generateStatusStart') and conditionParamRef.generateStatusStart != null">
${_conditionType_} a.generateStatus <![CDATA[ >= ]]> #{${_conditionParam_}.generateStatusStart} ${_conditionType_} a.generateStatus <![CDATA[ >= ]]> #{${_conditionParam_}.generateStatusStart}
</if> </if>
...@@ -1008,12 +1165,18 @@ ...@@ -1008,12 +1165,18 @@
${_conditionType_} a.operType is null ${_conditionType_} a.operType is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('operTypeList')"> <if test="conditionParamRef.containsKey('operTypeList') and conditionParamRef.operTypeList.size() > 0">
${_conditionType_} a.operType in ${_conditionType_} a.operType in
<foreach collection="conditionParamRef.operTypeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.operTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('operTypeNotList') and conditionParamRef.operTypeNotList.size() > 0">
${_conditionType_} a.operType not in
<foreach collection="conditionParamRef.operTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('operTypeStart') and conditionParamRef.operTypeStart != null"> <if test="conditionParamRef.containsKey('operTypeStart') and conditionParamRef.operTypeStart != null">
${_conditionType_} a.operType <![CDATA[ >= ]]> #{${_conditionParam_}.operTypeStart} ${_conditionType_} a.operType <![CDATA[ >= ]]> #{${_conditionParam_}.operTypeStart}
</if> </if>
...@@ -1029,12 +1192,18 @@ ...@@ -1029,12 +1192,18 @@
${_conditionType_} a.createUserId is null ${_conditionType_} a.createUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in ${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if> </if>
...@@ -1065,12 +1234,18 @@ ...@@ -1065,12 +1234,18 @@
${_conditionType_} a.updateUserId is null ${_conditionType_} a.updateUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdList')"> <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in ${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null"> <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart} ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if> </if>
...@@ -1101,12 +1276,18 @@ ...@@ -1101,12 +1276,18 @@
${_conditionType_} a.recordStatus is null ${_conditionType_} a.recordStatus is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('recordStatusList')"> <if test="conditionParamRef.containsKey('recordStatusList') and conditionParamRef.recordStatusList.size() > 0">
${_conditionType_} a.recordStatus in ${_conditionType_} a.recordStatus in
<foreach collection="conditionParamRef.recordStatusList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.recordStatusList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('recordStatusNotList') and conditionParamRef.recordStatusNotList.size() > 0">
${_conditionType_} a.recordStatus not in
<foreach collection="conditionParamRef.recordStatusNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('recordStatusStart') and conditionParamRef.recordStatusStart != null"> <if test="conditionParamRef.containsKey('recordStatusStart') and conditionParamRef.recordStatusStart != null">
${_conditionType_} a.recordStatus <![CDATA[ >= ]]> #{${_conditionParam_}.recordStatusStart} ${_conditionType_} a.recordStatus <![CDATA[ >= ]]> #{${_conditionParam_}.recordStatusStart}
</if> </if>
...@@ -1114,6 +1295,33 @@ ...@@ -1114,6 +1295,33 @@
${_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>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -1272,6 +1480,11 @@ ...@@ -1272,6 +1480,11 @@
<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>
</trim> </trim>
</if> </if>
</sql> </sql>
......
certificate-manager/src/main/resources/sqlmap/module/record/PrintLogMapper.xml
View file @ 4018c60f
<?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">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
<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" />
</resultMap> </resultMap>
...@@ -88,23 +89,26 @@ ...@@ -88,23 +89,26 @@
<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>
</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
(catalogId,catalogCode,catalogName,certificateName,certificateCode,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)
VALUES VALUES
(#{catalogId},#{catalogCode},#{catalogName},#{certificateName},#{certificateCode},#{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})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_print_log insert into mortals_xhx_print_log
(catalogId,catalogCode,catalogName,certificateName,certificateCode,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)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{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.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})
</foreach> </foreach>
</insert> </insert>
...@@ -183,6 +187,12 @@ ...@@ -183,6 +187,12 @@
<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>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -346,6 +356,18 @@ ...@@ -346,6 +356,18 @@
</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> </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=")">
...@@ -369,6 +391,21 @@ ...@@ -369,6 +391,21 @@
#{item} #{item}
</foreach> </foreach>
</delete> </delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_xhx_print_log where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_xhx_print_log where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 --> <!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto"> <delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_print_log as a delete a.* from mortals_xhx_print_log as a
...@@ -455,12 +492,18 @@ ...@@ -455,12 +492,18 @@
${_conditionType_} a.id is null ${_conditionType_} a.id is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in ${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart} ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
...@@ -476,12 +519,18 @@ ...@@ -476,12 +519,18 @@
${_conditionType_} a.catalogId is null ${_conditionType_} a.catalogId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('catalogIdList')"> <if test="conditionParamRef.containsKey('catalogIdList') and conditionParamRef.catalogIdList.size() > 0">
${_conditionType_} a.catalogId in ${_conditionType_} a.catalogId in
<foreach collection="conditionParamRef.catalogIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.catalogIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('catalogIdNotList') and conditionParamRef.catalogIdNotList.size() > 0">
${_conditionType_} a.catalogId not in
<foreach collection="conditionParamRef.catalogIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('catalogIdStart') and conditionParamRef.catalogIdStart != null"> <if test="conditionParamRef.containsKey('catalogIdStart') and conditionParamRef.catalogIdStart != null">
${_conditionType_} a.catalogId <![CDATA[ >= ]]> #{${_conditionParam_}.catalogIdStart} ${_conditionType_} a.catalogId <![CDATA[ >= ]]> #{${_conditionParam_}.catalogIdStart}
</if> </if>
...@@ -498,12 +547,18 @@ ...@@ -498,12 +547,18 @@
${_conditionType_} a.catalogCode is null ${_conditionType_} a.catalogCode is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('catalogCodeList')"> <if test="conditionParamRef.containsKey('catalogCodeList') and conditionParamRef.catalogCodeList.size() > 0">
${_conditionType_} a.catalogCode in ${_conditionType_} a.catalogCode in
<foreach collection="conditionParamRef.catalogCodeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.catalogCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('catalogCodeNotList') and conditionParamRef.catalogCodeNotList.size() > 0">
${_conditionType_} a.catalogCode not in
<foreach collection="conditionParamRef.catalogCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('catalogName')"> <if test="conditionParamRef.containsKey('catalogName')">
<if test="conditionParamRef.catalogName != null and conditionParamRef.catalogName != ''"> <if test="conditionParamRef.catalogName != null and conditionParamRef.catalogName != ''">
...@@ -513,12 +568,18 @@ ...@@ -513,12 +568,18 @@
${_conditionType_} a.catalogName is null ${_conditionType_} a.catalogName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('catalogNameList')"> <if test="conditionParamRef.containsKey('catalogNameList') and conditionParamRef.catalogNameList.size() > 0">
${_conditionType_} a.catalogName in ${_conditionType_} a.catalogName in
<foreach collection="conditionParamRef.catalogNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.catalogNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('catalogNameNotList') and conditionParamRef.catalogNameNotList.size() > 0">
${_conditionType_} a.catalogName not in
<foreach collection="conditionParamRef.catalogNameNotList" 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 != ''">
...@@ -528,12 +589,18 @@ ...@@ -528,12 +589,18 @@
${_conditionType_} a.certificateName is null ${_conditionType_} a.certificateName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('certificateNameList')"> <if test="conditionParamRef.containsKey('certificateNameList') and conditionParamRef.certificateNameList.size() > 0">
${_conditionType_} a.certificateName in ${_conditionType_} a.certificateName in
<foreach collection="conditionParamRef.certificateNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.certificateNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('certificateNameNotList') and conditionParamRef.certificateNameNotList.size() > 0">
${_conditionType_} a.certificateName not in
<foreach collection="conditionParamRef.certificateNameNotList" 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 != ''">
...@@ -543,12 +610,18 @@ ...@@ -543,12 +610,18 @@
${_conditionType_} a.certificateCode is null ${_conditionType_} a.certificateCode is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('certificateCodeList')"> <if test="conditionParamRef.containsKey('certificateCodeList') and conditionParamRef.certificateCodeList.size() > 0">
${_conditionType_} a.certificateCode in ${_conditionType_} a.certificateCode in
<foreach collection="conditionParamRef.certificateCodeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.certificateCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('certificateCodeNotList') and conditionParamRef.certificateCodeNotList.size() > 0">
${_conditionType_} a.certificateCode not in
<foreach collection="conditionParamRef.certificateCodeNotList" 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 != ''">
...@@ -558,12 +631,18 @@ ...@@ -558,12 +631,18 @@
${_conditionType_} a.enterpriseName is null ${_conditionType_} a.enterpriseName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('enterpriseNameList')"> <if test="conditionParamRef.containsKey('enterpriseNameList') and conditionParamRef.enterpriseNameList.size() > 0">
${_conditionType_} a.enterpriseName in ${_conditionType_} a.enterpriseName in
<foreach collection="conditionParamRef.enterpriseNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.enterpriseNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('enterpriseNameNotList') and conditionParamRef.enterpriseNameNotList.size() > 0">
${_conditionType_} a.enterpriseName not in
<foreach collection="conditionParamRef.enterpriseNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('holderName')"> <if test="conditionParamRef.containsKey('holderName')">
<if test="conditionParamRef.holderName != null and conditionParamRef.holderName != ''"> <if test="conditionParamRef.holderName != null and conditionParamRef.holderName != ''">
...@@ -573,12 +652,18 @@ ...@@ -573,12 +652,18 @@
${_conditionType_} a.holderName is null ${_conditionType_} a.holderName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('holderNameList')"> <if test="conditionParamRef.containsKey('holderNameList') and conditionParamRef.holderNameList.size() > 0">
${_conditionType_} a.holderName in ${_conditionType_} a.holderName in
<foreach collection="conditionParamRef.holderNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.holderNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('holderNameNotList') and conditionParamRef.holderNameNotList.size() > 0">
${_conditionType_} a.holderName not in
<foreach collection="conditionParamRef.holderNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('holderIDCardNo')"> <if test="conditionParamRef.containsKey('holderIDCardNo')">
<if test="conditionParamRef.holderIDCardNo != null and conditionParamRef.holderIDCardNo != ''"> <if test="conditionParamRef.holderIDCardNo != null and conditionParamRef.holderIDCardNo != ''">
...@@ -588,12 +673,18 @@ ...@@ -588,12 +673,18 @@
${_conditionType_} a.holderIDCardNo is null ${_conditionType_} a.holderIDCardNo is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('holderIDCardNoList')"> <if test="conditionParamRef.containsKey('holderIDCardNoList') and conditionParamRef.holderIDCardNoList.size() > 0">
${_conditionType_} a.holderIDCardNo in ${_conditionType_} a.holderIDCardNo in
<foreach collection="conditionParamRef.holderIDCardNoList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.holderIDCardNoList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('holderIDCardNoNotList') and conditionParamRef.holderIDCardNoNotList.size() > 0">
${_conditionType_} a.holderIDCardNo not in
<foreach collection="conditionParamRef.holderIDCardNoNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('pickerName')"> <if test="conditionParamRef.containsKey('pickerName')">
<if test="conditionParamRef.pickerName != null and conditionParamRef.pickerName != ''"> <if test="conditionParamRef.pickerName != null and conditionParamRef.pickerName != ''">
...@@ -603,12 +694,18 @@ ...@@ -603,12 +694,18 @@
${_conditionType_} a.pickerName is null ${_conditionType_} a.pickerName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('pickerNameList')"> <if test="conditionParamRef.containsKey('pickerNameList') and conditionParamRef.pickerNameList.size() > 0">
${_conditionType_} a.pickerName in ${_conditionType_} a.pickerName in
<foreach collection="conditionParamRef.pickerNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.pickerNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('pickerNameNotList') and conditionParamRef.pickerNameNotList.size() > 0">
${_conditionType_} a.pickerName not in
<foreach collection="conditionParamRef.pickerNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('pickerIDCardNo')"> <if test="conditionParamRef.containsKey('pickerIDCardNo')">
<if test="conditionParamRef.pickerIDCardNo != null and conditionParamRef.pickerIDCardNo != ''"> <if test="conditionParamRef.pickerIDCardNo != null and conditionParamRef.pickerIDCardNo != ''">
...@@ -618,12 +715,18 @@ ...@@ -618,12 +715,18 @@
${_conditionType_} a.pickerIDCardNo is null ${_conditionType_} a.pickerIDCardNo is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('pickerIDCardNoList')"> <if test="conditionParamRef.containsKey('pickerIDCardNoList') and conditionParamRef.pickerIDCardNoList.size() > 0">
${_conditionType_} a.pickerIDCardNo in ${_conditionType_} a.pickerIDCardNo in
<foreach collection="conditionParamRef.pickerIDCardNoList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.pickerIDCardNoList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('pickerIDCardNoNotList') and conditionParamRef.pickerIDCardNoNotList.size() > 0">
${_conditionType_} a.pickerIDCardNo not in
<foreach collection="conditionParamRef.pickerIDCardNoNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('printStatus')"> <if test="conditionParamRef.containsKey('printStatus')">
<if test="conditionParamRef.printStatus != null "> <if test="conditionParamRef.printStatus != null ">
${_conditionType_} a.printStatus = #{${_conditionParam_}.printStatus} ${_conditionType_} a.printStatus = #{${_conditionParam_}.printStatus}
...@@ -632,12 +735,18 @@ ...@@ -632,12 +735,18 @@
${_conditionType_} a.printStatus is null ${_conditionType_} a.printStatus is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('printStatusList')"> <if test="conditionParamRef.containsKey('printStatusList') and conditionParamRef.printStatusList.size() > 0">
${_conditionType_} a.printStatus in ${_conditionType_} a.printStatus in
<foreach collection="conditionParamRef.printStatusList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.printStatusList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('printStatusNotList') and conditionParamRef.printStatusNotList.size() > 0">
${_conditionType_} a.printStatus not in
<foreach collection="conditionParamRef.printStatusNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('printStatusStart') and conditionParamRef.printStatusStart != null"> <if test="conditionParamRef.containsKey('printStatusStart') and conditionParamRef.printStatusStart != null">
${_conditionType_} a.printStatus <![CDATA[ >= ]]> #{${_conditionParam_}.printStatusStart} ${_conditionType_} a.printStatus <![CDATA[ >= ]]> #{${_conditionParam_}.printStatusStart}
</if> </if>
...@@ -669,12 +778,18 @@ ...@@ -669,12 +778,18 @@
${_conditionType_} a.statusRemark is null ${_conditionType_} a.statusRemark is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('statusRemarkList')"> <if test="conditionParamRef.containsKey('statusRemarkList') and conditionParamRef.statusRemarkList.size() > 0">
${_conditionType_} a.statusRemark in ${_conditionType_} a.statusRemark in
<foreach collection="conditionParamRef.statusRemarkList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.statusRemarkList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('statusRemarkNotList') and conditionParamRef.statusRemarkNotList.size() > 0">
${_conditionType_} a.statusRemark not in
<foreach collection="conditionParamRef.statusRemarkNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceId')"> <if test="conditionParamRef.containsKey('deviceId')">
<if test="conditionParamRef.deviceId != null "> <if test="conditionParamRef.deviceId != null ">
${_conditionType_} a.deviceId = #{${_conditionParam_}.deviceId} ${_conditionType_} a.deviceId = #{${_conditionParam_}.deviceId}
...@@ -683,12 +798,18 @@ ...@@ -683,12 +798,18 @@
${_conditionType_} a.deviceId is null ${_conditionType_} a.deviceId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deviceIdList')"> <if test="conditionParamRef.containsKey('deviceIdList') and conditionParamRef.deviceIdList.size() > 0">
${_conditionType_} a.deviceId in ${_conditionType_} a.deviceId in
<foreach collection="conditionParamRef.deviceIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deviceIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deviceIdNotList') and conditionParamRef.deviceIdNotList.size() > 0">
${_conditionType_} a.deviceId not in
<foreach collection="conditionParamRef.deviceIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceIdStart') and conditionParamRef.deviceIdStart != null"> <if test="conditionParamRef.containsKey('deviceIdStart') and conditionParamRef.deviceIdStart != null">
${_conditionType_} a.deviceId <![CDATA[ >= ]]> #{${_conditionParam_}.deviceIdStart} ${_conditionType_} a.deviceId <![CDATA[ >= ]]> #{${_conditionParam_}.deviceIdStart}
</if> </if>
...@@ -704,12 +825,18 @@ ...@@ -704,12 +825,18 @@
${_conditionType_} a.createUserId is null ${_conditionType_} a.createUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in ${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if> </if>
...@@ -740,12 +867,18 @@ ...@@ -740,12 +867,18 @@
${_conditionType_} a.updateUserId is null ${_conditionType_} a.updateUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdList')"> <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in ${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null"> <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart} ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if> </if>
...@@ -768,6 +901,33 @@ ...@@ -768,6 +901,33 @@
<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>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -876,6 +1036,11 @@ ...@@ -876,6 +1036,11 @@
<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>
</trim> </trim>
</if> </if>
</sql> </sql>
......
certificate-manager/src/main/resources/sqlmap/module/record/PrintWaitQueueMapper.xml
View file @ 4018c60f
<?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">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
<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" />
</resultMap> </resultMap>
...@@ -96,23 +97,26 @@ ...@@ -96,23 +97,26 @@
<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>
</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
(recordId,applyId,catalogId,catalogCode,catalogName,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)
VALUES VALUES
(#{recordId},#{applyId},#{catalogId},#{catalogCode},#{catalogName},#{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})
</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
(recordId,applyId,catalogId,catalogCode,catalogName,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)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{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.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})
</foreach> </foreach>
</insert> </insert>
...@@ -203,6 +207,12 @@ ...@@ -203,6 +207,12 @@
<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>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -390,6 +400,18 @@ ...@@ -390,6 +400,18 @@
</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> </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=")">
...@@ -413,6 +435,21 @@ ...@@ -413,6 +435,21 @@
#{item} #{item}
</foreach> </foreach>
</delete> </delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_xhx_print_wait_queue where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_xhx_print_wait_queue where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 --> <!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto"> <delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_print_wait_queue as a delete a.* from mortals_xhx_print_wait_queue as a
...@@ -499,12 +536,18 @@ ...@@ -499,12 +536,18 @@
${_conditionType_} a.id is null ${_conditionType_} a.id is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in ${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart} ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
...@@ -520,12 +563,18 @@ ...@@ -520,12 +563,18 @@
${_conditionType_} a.recordId is null ${_conditionType_} a.recordId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('recordIdList')"> <if test="conditionParamRef.containsKey('recordIdList') and conditionParamRef.recordIdList.size() > 0">
${_conditionType_} a.recordId in ${_conditionType_} a.recordId in
<foreach collection="conditionParamRef.recordIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.recordIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('recordIdNotList') and conditionParamRef.recordIdNotList.size() > 0">
${_conditionType_} a.recordId not in
<foreach collection="conditionParamRef.recordIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('recordIdStart') and conditionParamRef.recordIdStart != null"> <if test="conditionParamRef.containsKey('recordIdStart') and conditionParamRef.recordIdStart != null">
${_conditionType_} a.recordId <![CDATA[ >= ]]> #{${_conditionParam_}.recordIdStart} ${_conditionType_} a.recordId <![CDATA[ >= ]]> #{${_conditionParam_}.recordIdStart}
</if> </if>
...@@ -541,12 +590,18 @@ ...@@ -541,12 +590,18 @@
${_conditionType_} a.applyId is null ${_conditionType_} a.applyId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('applyIdList')"> <if test="conditionParamRef.containsKey('applyIdList') and conditionParamRef.applyIdList.size() > 0">
${_conditionType_} a.applyId in ${_conditionType_} a.applyId in
<foreach collection="conditionParamRef.applyIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.applyIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('applyIdNotList') and conditionParamRef.applyIdNotList.size() > 0">
${_conditionType_} a.applyId not in
<foreach collection="conditionParamRef.applyIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('applyIdStart') and conditionParamRef.applyIdStart != null"> <if test="conditionParamRef.containsKey('applyIdStart') and conditionParamRef.applyIdStart != null">
${_conditionType_} a.applyId <![CDATA[ >= ]]> #{${_conditionParam_}.applyIdStart} ${_conditionType_} a.applyId <![CDATA[ >= ]]> #{${_conditionParam_}.applyIdStart}
</if> </if>
...@@ -562,12 +617,18 @@ ...@@ -562,12 +617,18 @@
${_conditionType_} a.catalogId is null ${_conditionType_} a.catalogId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('catalogIdList')"> <if test="conditionParamRef.containsKey('catalogIdList') and conditionParamRef.catalogIdList.size() > 0">
${_conditionType_} a.catalogId in ${_conditionType_} a.catalogId in
<foreach collection="conditionParamRef.catalogIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.catalogIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('catalogIdNotList') and conditionParamRef.catalogIdNotList.size() > 0">
${_conditionType_} a.catalogId not in
<foreach collection="conditionParamRef.catalogIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('catalogIdStart') and conditionParamRef.catalogIdStart != null"> <if test="conditionParamRef.containsKey('catalogIdStart') and conditionParamRef.catalogIdStart != null">
${_conditionType_} a.catalogId <![CDATA[ >= ]]> #{${_conditionParam_}.catalogIdStart} ${_conditionType_} a.catalogId <![CDATA[ >= ]]> #{${_conditionParam_}.catalogIdStart}
</if> </if>
...@@ -584,12 +645,18 @@ ...@@ -584,12 +645,18 @@
${_conditionType_} a.catalogCode is null ${_conditionType_} a.catalogCode is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('catalogCodeList')"> <if test="conditionParamRef.containsKey('catalogCodeList') and conditionParamRef.catalogCodeList.size() > 0">
${_conditionType_} a.catalogCode in ${_conditionType_} a.catalogCode in
<foreach collection="conditionParamRef.catalogCodeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.catalogCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('catalogCodeNotList') and conditionParamRef.catalogCodeNotList.size() > 0">
${_conditionType_} a.catalogCode not in
<foreach collection="conditionParamRef.catalogCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('catalogName')"> <if test="conditionParamRef.containsKey('catalogName')">
<if test="conditionParamRef.catalogName != null and conditionParamRef.catalogName != ''"> <if test="conditionParamRef.catalogName != null and conditionParamRef.catalogName != ''">
...@@ -599,12 +666,18 @@ ...@@ -599,12 +666,18 @@
${_conditionType_} a.catalogName is null ${_conditionType_} a.catalogName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('catalogNameList')"> <if test="conditionParamRef.containsKey('catalogNameList') and conditionParamRef.catalogNameList.size() > 0">
${_conditionType_} a.catalogName in ${_conditionType_} a.catalogName in
<foreach collection="conditionParamRef.catalogNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.catalogNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('catalogNameNotList') and conditionParamRef.catalogNameNotList.size() > 0">
${_conditionType_} a.catalogName not in
<foreach collection="conditionParamRef.catalogNameNotList" 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 != ''">
...@@ -614,12 +687,18 @@ ...@@ -614,12 +687,18 @@
${_conditionType_} a.certificateName is null ${_conditionType_} a.certificateName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('certificateNameList')"> <if test="conditionParamRef.containsKey('certificateNameList') and conditionParamRef.certificateNameList.size() > 0">
${_conditionType_} a.certificateName in ${_conditionType_} a.certificateName in
<foreach collection="conditionParamRef.certificateNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.certificateNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('certificateNameNotList') and conditionParamRef.certificateNameNotList.size() > 0">
${_conditionType_} a.certificateName not in
<foreach collection="conditionParamRef.certificateNameNotList" 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 != ''">
...@@ -629,12 +708,18 @@ ...@@ -629,12 +708,18 @@
${_conditionType_} a.certificateCode is null ${_conditionType_} a.certificateCode is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('certificateCodeList')"> <if test="conditionParamRef.containsKey('certificateCodeList') and conditionParamRef.certificateCodeList.size() > 0">
${_conditionType_} a.certificateCode in ${_conditionType_} a.certificateCode in
<foreach collection="conditionParamRef.certificateCodeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.certificateCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('certificateCodeNotList') and conditionParamRef.certificateCodeNotList.size() > 0">
${_conditionType_} a.certificateCode not in
<foreach collection="conditionParamRef.certificateCodeNotList" 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 != ''">
...@@ -644,12 +729,18 @@ ...@@ -644,12 +729,18 @@
${_conditionType_} a.enterpriseName is null ${_conditionType_} a.enterpriseName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('enterpriseNameList')"> <if test="conditionParamRef.containsKey('enterpriseNameList') and conditionParamRef.enterpriseNameList.size() > 0">
${_conditionType_} a.enterpriseName in ${_conditionType_} a.enterpriseName in
<foreach collection="conditionParamRef.enterpriseNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.enterpriseNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('enterpriseNameNotList') and conditionParamRef.enterpriseNameNotList.size() > 0">
${_conditionType_} a.enterpriseName not in
<foreach collection="conditionParamRef.enterpriseNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('holderName')"> <if test="conditionParamRef.containsKey('holderName')">
<if test="conditionParamRef.holderName != null and conditionParamRef.holderName != ''"> <if test="conditionParamRef.holderName != null and conditionParamRef.holderName != ''">
...@@ -659,12 +750,18 @@ ...@@ -659,12 +750,18 @@
${_conditionType_} a.holderName is null ${_conditionType_} a.holderName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('holderNameList')"> <if test="conditionParamRef.containsKey('holderNameList') and conditionParamRef.holderNameList.size() > 0">
${_conditionType_} a.holderName in ${_conditionType_} a.holderName in
<foreach collection="conditionParamRef.holderNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.holderNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('holderNameNotList') and conditionParamRef.holderNameNotList.size() > 0">
${_conditionType_} a.holderName not in
<foreach collection="conditionParamRef.holderNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('holderIDCardNo')"> <if test="conditionParamRef.containsKey('holderIDCardNo')">
<if test="conditionParamRef.holderIDCardNo != null and conditionParamRef.holderIDCardNo != ''"> <if test="conditionParamRef.holderIDCardNo != null and conditionParamRef.holderIDCardNo != ''">
...@@ -674,12 +771,18 @@ ...@@ -674,12 +771,18 @@
${_conditionType_} a.holderIDCardNo is null ${_conditionType_} a.holderIDCardNo is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('holderIDCardNoList')"> <if test="conditionParamRef.containsKey('holderIDCardNoList') and conditionParamRef.holderIDCardNoList.size() > 0">
${_conditionType_} a.holderIDCardNo in ${_conditionType_} a.holderIDCardNo in
<foreach collection="conditionParamRef.holderIDCardNoList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.holderIDCardNoList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('holderIDCardNoNotList') and conditionParamRef.holderIDCardNoNotList.size() > 0">
${_conditionType_} a.holderIDCardNo not in
<foreach collection="conditionParamRef.holderIDCardNoNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('pickerName')"> <if test="conditionParamRef.containsKey('pickerName')">
<if test="conditionParamRef.pickerName != null and conditionParamRef.pickerName != ''"> <if test="conditionParamRef.pickerName != null and conditionParamRef.pickerName != ''">
...@@ -689,12 +792,18 @@ ...@@ -689,12 +792,18 @@
${_conditionType_} a.pickerName is null ${_conditionType_} a.pickerName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('pickerNameList')"> <if test="conditionParamRef.containsKey('pickerNameList') and conditionParamRef.pickerNameList.size() > 0">
${_conditionType_} a.pickerName in ${_conditionType_} a.pickerName in
<foreach collection="conditionParamRef.pickerNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.pickerNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('pickerNameNotList') and conditionParamRef.pickerNameNotList.size() > 0">
${_conditionType_} a.pickerName not in
<foreach collection="conditionParamRef.pickerNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('pickerIDCardNo')"> <if test="conditionParamRef.containsKey('pickerIDCardNo')">
<if test="conditionParamRef.pickerIDCardNo != null and conditionParamRef.pickerIDCardNo != ''"> <if test="conditionParamRef.pickerIDCardNo != null and conditionParamRef.pickerIDCardNo != ''">
...@@ -704,12 +813,18 @@ ...@@ -704,12 +813,18 @@
${_conditionType_} a.pickerIDCardNo is null ${_conditionType_} a.pickerIDCardNo is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('pickerIDCardNoList')"> <if test="conditionParamRef.containsKey('pickerIDCardNoList') and conditionParamRef.pickerIDCardNoList.size() > 0">
${_conditionType_} a.pickerIDCardNo in ${_conditionType_} a.pickerIDCardNo in
<foreach collection="conditionParamRef.pickerIDCardNoList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.pickerIDCardNoList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('pickerIDCardNoNotList') and conditionParamRef.pickerIDCardNoNotList.size() > 0">
${_conditionType_} a.pickerIDCardNo not in
<foreach collection="conditionParamRef.pickerIDCardNoNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('previewUrl')"> <if test="conditionParamRef.containsKey('previewUrl')">
<if test="conditionParamRef.previewUrl != null and conditionParamRef.previewUrl != ''"> <if test="conditionParamRef.previewUrl != null and conditionParamRef.previewUrl != ''">
...@@ -719,12 +834,18 @@ ...@@ -719,12 +834,18 @@
${_conditionType_} a.previewUrl is null ${_conditionType_} a.previewUrl is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('previewUrlList')"> <if test="conditionParamRef.containsKey('previewUrlList') and conditionParamRef.previewUrlList.size() > 0">
${_conditionType_} a.previewUrl in ${_conditionType_} a.previewUrl in
<foreach collection="conditionParamRef.previewUrlList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.previewUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('previewUrlNotList') and conditionParamRef.previewUrlNotList.size() > 0">
${_conditionType_} a.previewUrl not in
<foreach collection="conditionParamRef.previewUrlNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('certificateUrl')"> <if test="conditionParamRef.containsKey('certificateUrl')">
<if test="conditionParamRef.certificateUrl != null and conditionParamRef.certificateUrl != ''"> <if test="conditionParamRef.certificateUrl != null and conditionParamRef.certificateUrl != ''">
...@@ -734,12 +855,18 @@ ...@@ -734,12 +855,18 @@
${_conditionType_} a.certificateUrl is null ${_conditionType_} a.certificateUrl is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('certificateUrlList')"> <if test="conditionParamRef.containsKey('certificateUrlList') and conditionParamRef.certificateUrlList.size() > 0">
${_conditionType_} a.certificateUrl in ${_conditionType_} a.certificateUrl in
<foreach collection="conditionParamRef.certificateUrlList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.certificateUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('certificateUrlNotList') and conditionParamRef.certificateUrlNotList.size() > 0">
${_conditionType_} a.certificateUrl not in
<foreach collection="conditionParamRef.certificateUrlNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('printStatus')"> <if test="conditionParamRef.containsKey('printStatus')">
<if test="conditionParamRef.printStatus != null "> <if test="conditionParamRef.printStatus != null ">
${_conditionType_} a.printStatus = #{${_conditionParam_}.printStatus} ${_conditionType_} a.printStatus = #{${_conditionParam_}.printStatus}
...@@ -748,12 +875,18 @@ ...@@ -748,12 +875,18 @@
${_conditionType_} a.printStatus is null ${_conditionType_} a.printStatus is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('printStatusList')"> <if test="conditionParamRef.containsKey('printStatusList') and conditionParamRef.printStatusList.size() > 0">
${_conditionType_} a.printStatus in ${_conditionType_} a.printStatus in
<foreach collection="conditionParamRef.printStatusList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.printStatusList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('printStatusNotList') and conditionParamRef.printStatusNotList.size() > 0">
${_conditionType_} a.printStatus not in
<foreach collection="conditionParamRef.printStatusNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('printStatusStart') and conditionParamRef.printStatusStart != null"> <if test="conditionParamRef.containsKey('printStatusStart') and conditionParamRef.printStatusStart != null">
${_conditionType_} a.printStatus <![CDATA[ >= ]]> #{${_conditionParam_}.printStatusStart} ${_conditionType_} a.printStatus <![CDATA[ >= ]]> #{${_conditionParam_}.printStatusStart}
</if> </if>
...@@ -769,12 +902,18 @@ ...@@ -769,12 +902,18 @@
${_conditionType_} a.total is null ${_conditionType_} a.total is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('totalList')"> <if test="conditionParamRef.containsKey('totalList') and conditionParamRef.totalList.size() > 0">
${_conditionType_} a.total in ${_conditionType_} a.total in
<foreach collection="conditionParamRef.totalList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.totalList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('totalNotList') and conditionParamRef.totalNotList.size() > 0">
${_conditionType_} a.total not in
<foreach collection="conditionParamRef.totalNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('totalStart') and conditionParamRef.totalStart != null"> <if test="conditionParamRef.containsKey('totalStart') and conditionParamRef.totalStart != null">
${_conditionType_} a.total <![CDATA[ >= ]]> #{${_conditionParam_}.totalStart} ${_conditionType_} a.total <![CDATA[ >= ]]> #{${_conditionParam_}.totalStart}
</if> </if>
...@@ -790,12 +929,18 @@ ...@@ -790,12 +929,18 @@
${_conditionType_} a.createUserId is null ${_conditionType_} a.createUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in ${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if> </if>
...@@ -826,12 +971,18 @@ ...@@ -826,12 +971,18 @@
${_conditionType_} a.updateUserId is null ${_conditionType_} a.updateUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdList')"> <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in ${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null"> <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart} ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if> </if>
...@@ -854,6 +1005,33 @@ ...@@ -854,6 +1005,33 @@
<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>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -972,6 +1150,11 @@ ...@@ -972,6 +1150,11 @@
<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>
</trim> </trim>
</if> </if>
</sql> </sql>
......
certificate-manager/src/main/resources/sqlmap/module/record/RecordMapper.xml
View file @ 4018c60f
<?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.RecordDaoImpl"> <mapper namespace="com.mortals.xhx.module.record.dao.ibatis.RecordDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<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" />
</resultMap> </resultMap>
...@@ -48,23 +49,26 @@ ...@@ -48,23 +49,26 @@
<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>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="RecordEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="RecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_record insert into mortals_xhx_record
(catalogId,catalogName,catalogCode,recordStatus,createUserId,createTime,updateUserId,updateTime) (catalogId,catalogName,catalogCode,recordStatus,createUserId,createTime,updateUserId,updateTime,siteId)
VALUES VALUES
(#{catalogId},#{catalogName},#{catalogCode},#{recordStatus},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{catalogId},#{catalogName},#{catalogCode},#{recordStatus},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{siteId})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_record insert into mortals_xhx_record
(catalogId,catalogName,catalogCode,recordStatus,createUserId,createTime,updateUserId,updateTime) (catalogId,catalogName,catalogCode,recordStatus,createUserId,createTime,updateUserId,updateTime,siteId)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.catalogId},#{item.catalogName},#{item.catalogCode},#{item.recordStatus},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.catalogId},#{item.catalogName},#{item.catalogCode},#{item.recordStatus},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.siteId})
</foreach> </foreach>
</insert> </insert>
...@@ -110,6 +114,12 @@ ...@@ -110,6 +114,12 @@
<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>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -198,6 +208,18 @@ ...@@ -198,6 +208,18 @@
</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> </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=")">
...@@ -221,6 +243,21 @@ ...@@ -221,6 +243,21 @@
#{item} #{item}
</foreach> </foreach>
</delete> </delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_xhx_record where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_xhx_record where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 --> <!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto"> <delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_record as a delete a.* from mortals_xhx_record as a
...@@ -307,12 +344,18 @@ ...@@ -307,12 +344,18 @@
${_conditionType_} a.id is null ${_conditionType_} a.id is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in ${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart} ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
...@@ -328,12 +371,18 @@ ...@@ -328,12 +371,18 @@
${_conditionType_} a.catalogId is null ${_conditionType_} a.catalogId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('catalogIdList')"> <if test="conditionParamRef.containsKey('catalogIdList') and conditionParamRef.catalogIdList.size() > 0">
${_conditionType_} a.catalogId in ${_conditionType_} a.catalogId in
<foreach collection="conditionParamRef.catalogIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.catalogIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('catalogIdNotList') and conditionParamRef.catalogIdNotList.size() > 0">
${_conditionType_} a.catalogId not in
<foreach collection="conditionParamRef.catalogIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('catalogIdStart') and conditionParamRef.catalogIdStart != null"> <if test="conditionParamRef.containsKey('catalogIdStart') and conditionParamRef.catalogIdStart != null">
${_conditionType_} a.catalogId <![CDATA[ >= ]]> #{${_conditionParam_}.catalogIdStart} ${_conditionType_} a.catalogId <![CDATA[ >= ]]> #{${_conditionParam_}.catalogIdStart}
</if> </if>
...@@ -350,12 +399,18 @@ ...@@ -350,12 +399,18 @@
${_conditionType_} a.catalogName is null ${_conditionType_} a.catalogName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('catalogNameList')"> <if test="conditionParamRef.containsKey('catalogNameList') and conditionParamRef.catalogNameList.size() > 0">
${_conditionType_} a.catalogName in ${_conditionType_} a.catalogName in
<foreach collection="conditionParamRef.catalogNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.catalogNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('catalogNameNotList') and conditionParamRef.catalogNameNotList.size() > 0">
${_conditionType_} a.catalogName not in
<foreach collection="conditionParamRef.catalogNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('catalogCode')"> <if test="conditionParamRef.containsKey('catalogCode')">
<if test="conditionParamRef.catalogCode != null and conditionParamRef.catalogCode != ''"> <if test="conditionParamRef.catalogCode != null and conditionParamRef.catalogCode != ''">
...@@ -365,12 +420,18 @@ ...@@ -365,12 +420,18 @@
${_conditionType_} a.catalogCode is null ${_conditionType_} a.catalogCode is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('catalogCodeList')"> <if test="conditionParamRef.containsKey('catalogCodeList') and conditionParamRef.catalogCodeList.size() > 0">
${_conditionType_} a.catalogCode in ${_conditionType_} a.catalogCode in
<foreach collection="conditionParamRef.catalogCodeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.catalogCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('catalogCodeNotList') and conditionParamRef.catalogCodeNotList.size() > 0">
${_conditionType_} a.catalogCode not in
<foreach collection="conditionParamRef.catalogCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('recordStatus')"> <if test="conditionParamRef.containsKey('recordStatus')">
<if test="conditionParamRef.recordStatus != null "> <if test="conditionParamRef.recordStatus != null ">
${_conditionType_} a.recordStatus = #{${_conditionParam_}.recordStatus} ${_conditionType_} a.recordStatus = #{${_conditionParam_}.recordStatus}
...@@ -379,12 +440,18 @@ ...@@ -379,12 +440,18 @@
${_conditionType_} a.recordStatus is null ${_conditionType_} a.recordStatus is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('recordStatusList')"> <if test="conditionParamRef.containsKey('recordStatusList') and conditionParamRef.recordStatusList.size() > 0">
${_conditionType_} a.recordStatus in ${_conditionType_} a.recordStatus in
<foreach collection="conditionParamRef.recordStatusList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.recordStatusList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('recordStatusNotList') and conditionParamRef.recordStatusNotList.size() > 0">
${_conditionType_} a.recordStatus not in
<foreach collection="conditionParamRef.recordStatusNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('recordStatusStart') and conditionParamRef.recordStatusStart != null"> <if test="conditionParamRef.containsKey('recordStatusStart') and conditionParamRef.recordStatusStart != null">
${_conditionType_} a.recordStatus <![CDATA[ >= ]]> #{${_conditionParam_}.recordStatusStart} ${_conditionType_} a.recordStatus <![CDATA[ >= ]]> #{${_conditionParam_}.recordStatusStart}
</if> </if>
...@@ -400,12 +467,18 @@ ...@@ -400,12 +467,18 @@
${_conditionType_} a.createUserId is null ${_conditionType_} a.createUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in ${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if> </if>
...@@ -436,12 +509,18 @@ ...@@ -436,12 +509,18 @@
${_conditionType_} a.updateUserId is null ${_conditionType_} a.updateUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdList')"> <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in ${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null"> <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart} ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if> </if>
...@@ -464,6 +543,33 @@ ...@@ -464,6 +543,33 @@
<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>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -522,6 +628,11 @@ ...@@ -522,6 +628,11 @@
<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>
</trim> </trim>
</if> </if>
</sql> </sql>
......
certificate-manager/src/main/resources/sqlmap/module/record/RetainLogMapper.xml
View file @ 4018c60f
<?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">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
<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" />
</resultMap> </resultMap>
...@@ -80,23 +81,26 @@ ...@@ -80,23 +81,26 @@
<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>
</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
(recordId,catalogId,catalogCode,catalogName,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)
VALUES VALUES
(#{recordId},#{catalogId},#{catalogCode},#{catalogName},#{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})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_retain_log insert into mortals_xhx_retain_log
(recordId,catalogId,catalogCode,catalogName,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)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{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.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})
</foreach> </foreach>
</insert> </insert>
...@@ -169,6 +173,12 @@ ...@@ -169,6 +173,12 @@
<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>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -318,6 +328,18 @@ ...@@ -318,6 +328,18 @@
</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> </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=")">
...@@ -341,6 +363,21 @@ ...@@ -341,6 +363,21 @@
#{item} #{item}
</foreach> </foreach>
</delete> </delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_xhx_retain_log where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_xhx_retain_log where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 --> <!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto"> <delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_retain_log as a delete a.* from mortals_xhx_retain_log as a
...@@ -427,12 +464,18 @@ ...@@ -427,12 +464,18 @@
${_conditionType_} a.id is null ${_conditionType_} a.id is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in ${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart} ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
...@@ -448,12 +491,18 @@ ...@@ -448,12 +491,18 @@
${_conditionType_} a.recordId is null ${_conditionType_} a.recordId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('recordIdList')"> <if test="conditionParamRef.containsKey('recordIdList') and conditionParamRef.recordIdList.size() > 0">
${_conditionType_} a.recordId in ${_conditionType_} a.recordId in
<foreach collection="conditionParamRef.recordIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.recordIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('recordIdNotList') and conditionParamRef.recordIdNotList.size() > 0">
${_conditionType_} a.recordId not in
<foreach collection="conditionParamRef.recordIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('recordIdStart') and conditionParamRef.recordIdStart != null"> <if test="conditionParamRef.containsKey('recordIdStart') and conditionParamRef.recordIdStart != null">
${_conditionType_} a.recordId <![CDATA[ >= ]]> #{${_conditionParam_}.recordIdStart} ${_conditionType_} a.recordId <![CDATA[ >= ]]> #{${_conditionParam_}.recordIdStart}
</if> </if>
...@@ -469,12 +518,18 @@ ...@@ -469,12 +518,18 @@
${_conditionType_} a.catalogId is null ${_conditionType_} a.catalogId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('catalogIdList')"> <if test="conditionParamRef.containsKey('catalogIdList') and conditionParamRef.catalogIdList.size() > 0">
${_conditionType_} a.catalogId in ${_conditionType_} a.catalogId in
<foreach collection="conditionParamRef.catalogIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.catalogIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('catalogIdNotList') and conditionParamRef.catalogIdNotList.size() > 0">
${_conditionType_} a.catalogId not in
<foreach collection="conditionParamRef.catalogIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('catalogIdStart') and conditionParamRef.catalogIdStart != null"> <if test="conditionParamRef.containsKey('catalogIdStart') and conditionParamRef.catalogIdStart != null">
${_conditionType_} a.catalogId <![CDATA[ >= ]]> #{${_conditionParam_}.catalogIdStart} ${_conditionType_} a.catalogId <![CDATA[ >= ]]> #{${_conditionParam_}.catalogIdStart}
</if> </if>
...@@ -491,12 +546,18 @@ ...@@ -491,12 +546,18 @@
${_conditionType_} a.catalogCode is null ${_conditionType_} a.catalogCode is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('catalogCodeList')"> <if test="conditionParamRef.containsKey('catalogCodeList') and conditionParamRef.catalogCodeList.size() > 0">
${_conditionType_} a.catalogCode in ${_conditionType_} a.catalogCode in
<foreach collection="conditionParamRef.catalogCodeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.catalogCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('catalogCodeNotList') and conditionParamRef.catalogCodeNotList.size() > 0">
${_conditionType_} a.catalogCode not in
<foreach collection="conditionParamRef.catalogCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('catalogName')"> <if test="conditionParamRef.containsKey('catalogName')">
<if test="conditionParamRef.catalogName != null and conditionParamRef.catalogName != ''"> <if test="conditionParamRef.catalogName != null and conditionParamRef.catalogName != ''">
...@@ -506,12 +567,18 @@ ...@@ -506,12 +567,18 @@
${_conditionType_} a.catalogName is null ${_conditionType_} a.catalogName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('catalogNameList')"> <if test="conditionParamRef.containsKey('catalogNameList') and conditionParamRef.catalogNameList.size() > 0">
${_conditionType_} a.catalogName in ${_conditionType_} a.catalogName in
<foreach collection="conditionParamRef.catalogNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.catalogNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('catalogNameNotList') and conditionParamRef.catalogNameNotList.size() > 0">
${_conditionType_} a.catalogName not in
<foreach collection="conditionParamRef.catalogNameNotList" 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 != ''">
...@@ -521,12 +588,18 @@ ...@@ -521,12 +588,18 @@
${_conditionType_} a.certificateName is null ${_conditionType_} a.certificateName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('certificateNameList')"> <if test="conditionParamRef.containsKey('certificateNameList') and conditionParamRef.certificateNameList.size() > 0">
${_conditionType_} a.certificateName in ${_conditionType_} a.certificateName in
<foreach collection="conditionParamRef.certificateNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.certificateNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('certificateNameNotList') and conditionParamRef.certificateNameNotList.size() > 0">
${_conditionType_} a.certificateName not in
<foreach collection="conditionParamRef.certificateNameNotList" 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 != ''">
...@@ -536,12 +609,18 @@ ...@@ -536,12 +609,18 @@
${_conditionType_} a.certificateCode is null ${_conditionType_} a.certificateCode is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('certificateCodeList')"> <if test="conditionParamRef.containsKey('certificateCodeList') and conditionParamRef.certificateCodeList.size() > 0">
${_conditionType_} a.certificateCode in ${_conditionType_} a.certificateCode in
<foreach collection="conditionParamRef.certificateCodeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.certificateCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('certificateCodeNotList') and conditionParamRef.certificateCodeNotList.size() > 0">
${_conditionType_} a.certificateCode not in
<foreach collection="conditionParamRef.certificateCodeNotList" 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 != ''">
...@@ -551,12 +630,18 @@ ...@@ -551,12 +630,18 @@
${_conditionType_} a.enterpriseName is null ${_conditionType_} a.enterpriseName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('enterpriseNameList')"> <if test="conditionParamRef.containsKey('enterpriseNameList') and conditionParamRef.enterpriseNameList.size() > 0">
${_conditionType_} a.enterpriseName in ${_conditionType_} a.enterpriseName in
<foreach collection="conditionParamRef.enterpriseNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.enterpriseNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('enterpriseNameNotList') and conditionParamRef.enterpriseNameNotList.size() > 0">
${_conditionType_} a.enterpriseName not in
<foreach collection="conditionParamRef.enterpriseNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('holderName')"> <if test="conditionParamRef.containsKey('holderName')">
<if test="conditionParamRef.holderName != null and conditionParamRef.holderName != ''"> <if test="conditionParamRef.holderName != null and conditionParamRef.holderName != ''">
...@@ -566,12 +651,18 @@ ...@@ -566,12 +651,18 @@
${_conditionType_} a.holderName is null ${_conditionType_} a.holderName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('holderNameList')"> <if test="conditionParamRef.containsKey('holderNameList') and conditionParamRef.holderNameList.size() > 0">
${_conditionType_} a.holderName in ${_conditionType_} a.holderName in
<foreach collection="conditionParamRef.holderNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.holderNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('holderNameNotList') and conditionParamRef.holderNameNotList.size() > 0">
${_conditionType_} a.holderName not in
<foreach collection="conditionParamRef.holderNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('holderIDCardNo')"> <if test="conditionParamRef.containsKey('holderIDCardNo')">
<if test="conditionParamRef.holderIDCardNo != null and conditionParamRef.holderIDCardNo != ''"> <if test="conditionParamRef.holderIDCardNo != null and conditionParamRef.holderIDCardNo != ''">
...@@ -581,12 +672,18 @@ ...@@ -581,12 +672,18 @@
${_conditionType_} a.holderIDCardNo is null ${_conditionType_} a.holderIDCardNo is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('holderIDCardNoList')"> <if test="conditionParamRef.containsKey('holderIDCardNoList') and conditionParamRef.holderIDCardNoList.size() > 0">
${_conditionType_} a.holderIDCardNo in ${_conditionType_} a.holderIDCardNo in
<foreach collection="conditionParamRef.holderIDCardNoList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.holderIDCardNoList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('holderIDCardNoNotList') and conditionParamRef.holderIDCardNoNotList.size() > 0">
${_conditionType_} a.holderIDCardNo not in
<foreach collection="conditionParamRef.holderIDCardNoNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('certificateStatus')"> <if test="conditionParamRef.containsKey('certificateStatus')">
<if test="conditionParamRef.certificateStatus != null "> <if test="conditionParamRef.certificateStatus != null ">
${_conditionType_} a.certificateStatus = #{${_conditionParam_}.certificateStatus} ${_conditionType_} a.certificateStatus = #{${_conditionParam_}.certificateStatus}
...@@ -595,12 +692,18 @@ ...@@ -595,12 +692,18 @@
${_conditionType_} a.certificateStatus is null ${_conditionType_} a.certificateStatus is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('certificateStatusList')"> <if test="conditionParamRef.containsKey('certificateStatusList') and conditionParamRef.certificateStatusList.size() > 0">
${_conditionType_} a.certificateStatus in ${_conditionType_} a.certificateStatus in
<foreach collection="conditionParamRef.certificateStatusList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.certificateStatusList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('certificateStatusNotList') and conditionParamRef.certificateStatusNotList.size() > 0">
${_conditionType_} a.certificateStatus not in
<foreach collection="conditionParamRef.certificateStatusNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('certificateStatusStart') and conditionParamRef.certificateStatusStart != null"> <if test="conditionParamRef.containsKey('certificateStatusStart') and conditionParamRef.certificateStatusStart != null">
${_conditionType_} a.certificateStatus <![CDATA[ >= ]]> #{${_conditionParam_}.certificateStatusStart} ${_conditionType_} a.certificateStatus <![CDATA[ >= ]]> #{${_conditionParam_}.certificateStatusStart}
</if> </if>
...@@ -617,12 +720,18 @@ ...@@ -617,12 +720,18 @@
${_conditionType_} a.certificateUrl is null ${_conditionType_} a.certificateUrl is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('certificateUrlList')"> <if test="conditionParamRef.containsKey('certificateUrlList') and conditionParamRef.certificateUrlList.size() > 0">
${_conditionType_} a.certificateUrl in ${_conditionType_} a.certificateUrl in
<foreach collection="conditionParamRef.certificateUrlList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.certificateUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('certificateUrlNotList') and conditionParamRef.certificateUrlNotList.size() > 0">
${_conditionType_} a.certificateUrl not in
<foreach collection="conditionParamRef.certificateUrlNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('previewUrl')"> <if test="conditionParamRef.containsKey('previewUrl')">
<if test="conditionParamRef.previewUrl != null and conditionParamRef.previewUrl != ''"> <if test="conditionParamRef.previewUrl != null and conditionParamRef.previewUrl != ''">
...@@ -632,12 +741,18 @@ ...@@ -632,12 +741,18 @@
${_conditionType_} a.previewUrl is null ${_conditionType_} a.previewUrl is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('previewUrlList')"> <if test="conditionParamRef.containsKey('previewUrlList') and conditionParamRef.previewUrlList.size() > 0">
${_conditionType_} a.previewUrl in ${_conditionType_} a.previewUrl in
<foreach collection="conditionParamRef.previewUrlList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.previewUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('previewUrlNotList') and conditionParamRef.previewUrlNotList.size() > 0">
${_conditionType_} a.previewUrl not in
<foreach collection="conditionParamRef.previewUrlNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserId')"> <if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null "> <if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId} ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
...@@ -646,12 +761,18 @@ ...@@ -646,12 +761,18 @@
${_conditionType_} a.createUserId is null ${_conditionType_} a.createUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in ${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if> </if>
...@@ -682,12 +803,18 @@ ...@@ -682,12 +803,18 @@
${_conditionType_} a.updateUserId is null ${_conditionType_} a.updateUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdList')"> <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in ${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null"> <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart} ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if> </if>
...@@ -710,6 +837,33 @@ ...@@ -710,6 +837,33 @@
<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>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -808,6 +962,11 @@ ...@@ -808,6 +962,11 @@
<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>
</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