Skip to content

S
smart_gov_platform
Commit 3ff29522 authored by 赵啸非's avatar 赵啸非
Browse files
Options

添加站点参数

parent a171dbf6
Hide whitespace changes
Inline Side-by-side
Showing with 1859 additions and 1138 deletions
base-manager/db/add.sql
View file @ 3ff29522
...@@ -155,3 +155,8 @@ CREATE TABLE mortals_xhx_device_blackapp( ...@@ -155,3 +155,8 @@ CREATE TABLE mortals_xhx_device_blackapp(
`updateTime` datetime COMMENT '修改时间', `updateTime` datetime COMMENT '修改时间',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备应用黑名单'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备应用黑名单';
ALTER TABLE mortals_sys_site ADD COLUMN `onlineTake` tinyint(2) DEFAULT '1' COMMENT '在线取号（0.否，1.是）' AFTER workday7;
ALTER TABLE mortals_sys_site ADD COLUMN `appointment` tinyint(2) DEFAULT '1' COMMENT '在线取号（0.否，1.是）' AFTER onlineTake;
ALTER TABLE mortals_sys_site ADD COLUMN `gowMap` tinyint(2) DEFAULT '1' COMMENT '在线取号（0.否，1.是）' AFTER appointment;
base-manager/doc/api.md
View file @ 3ff29522
...@@ -1437,6 +1437,9 @@ data|object|数据对象|- ...@@ -1437,6 +1437,9 @@ data|object|数据对象|-
  workday5|Integer|周五 (1.上班，0.不上)|-   workday5|Integer|周五 (1.上班，0.不上)|-
  workday6|Integer|周六 (1.上班，0.不上)|-   workday6|Integer|周六 (1.上班，0.不上)|-
  workday7|Integer|周日 (1.上班，0.不上)|-   workday7|Integer|周日 (1.上班，0.不上)|-
  onlineTake|Integer|在线取号（0.否，1.是）
  appointment|Integer|微预约（0.否，1.是）
  gowMap|Integer|政务地图（0.否，1.是）
  level|Integer|楼层|-   level|Integer|楼层|-
  building|Integer|楼栋|-   building|Integer|楼栋|-
  modelIds|String|部署模块，逗号分隔|-   modelIds|String|部署模块，逗号分隔|-
...@@ -1534,6 +1537,9 @@ data|object|数据对象|- ...@@ -1534,6 +1537,9 @@ data|object|数据对象|-
 workday5|Integer|周五 (1.上班，0.不上)|-  workday5|Integer|周五 (1.上班，0.不上)|-
 workday6|Integer|周六 (1.上班，0.不上)|-  workday6|Integer|周六 (1.上班，0.不上)|-
 workday7|Integer|周日 (1.上班，0.不上)|-  workday7|Integer|周日 (1.上班，0.不上)|-
 onlineTake|Integer|在线取号（0.否，1.是）
 appointment|Integer|微预约（0.否，1.是）
 gowMap|Integer|政务地图（0.否，1.是）
 level|Integer|楼层|-  level|Integer|楼层|-
 building|Integer|楼栋|-  building|Integer|楼栋|-
 logoPath|String|设备logo地址  logoPath|String|设备logo地址
...@@ -1600,6 +1606,9 @@ workday4|Integer|周四 (1.上班，0.不上)|是|- ...@@ -1600,6 +1606,9 @@ workday4|Integer|周四 (1.上班，0.不上)|是|-
workday5|Integer|周五 (1.上班，0.不上)|是|- workday5|Integer|周五 (1.上班，0.不上)|是|-
workday6|Integer|周六 (1.上班，0.不上)|是|- workday6|Integer|周六 (1.上班，0.不上)|是|-
workday7|Integer|周日 (1.上班，0.不上)|是|- workday7|Integer|周日 (1.上班，0.不上)|是|-
onlineTake|Integer|否|在线取号（0.否，1.是）
appointment|Integer|否|微预约（0.否，1.是）
gowMap|Integer|否|政务地图（0.否，1.是）
level|Integer|楼层|是|- level|Integer|楼层|是|-
building|Integer|楼栋|是|- building|Integer|楼栋|是|-
logoPath|String|是|设备logo地址|- logoPath|String|是|设备logo地址|-
......
base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteEntity.java
View file @ 3ff29522
package com.mortals.xhx.module.site.model; package com.mortals.xhx.module.site.model;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.site.model.vo.SiteVo; import com.mortals.xhx.module.site.model.vo.SiteVo;
import lombok.Data;
/** /**
* 站点实体对象 * 站点实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-07-14 * @date 2023-05-07
*/ */
@Data
public class SiteEntity extends SiteVo { public class SiteEntity extends SiteVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -26,21 +25,17 @@ public class SiteEntity extends SiteVo { ...@@ -26,21 +25,17 @@ public class SiteEntity extends SiteVo {
*/ */
private String siteCode; private String siteCode;
/** /**
* 区域Id * 省编码
*/
private String areaID;
/**
* 区域编号
*/ */
private String areaCode; private String proCode;
/** /**
* 区域名称 * 区域ID
*/ */
private String areaName; private String areaID;
/** /**
* 省编码 * 区域编码
*/ */
private String proCode; private String areaCode;
/** /**
* 市编码 * 市编码
*/ */
...@@ -80,19 +75,19 @@ public class SiteEntity extends SiteVo { ...@@ -80,19 +75,19 @@ public class SiteEntity extends SiteVo {
/** /**
* 上午上班开始时间 * 上午上班开始时间
*/ */
private Date amWorkStartTime; private String amWorkStartTime;
/** /**
* 上午上班结束时间 * 上午上班结束时间
*/ */
private Date amWorkEndTime; private String amWorkEndTime;
/** /**
* 下午上班开始时间 * 下午上班开始时间
*/ */
private Date pmWorkStartTime; private String pmWorkStartTime;
/** /**
* 下午上班结束时间 * 下午上班结束时间
*/ */
private Date pmWorkEndTime; private String pmWorkEndTime;
/** /**
* 周一 (1.上班，0.不上) * 周一 (1.上班，0.不上)
*/ */
...@@ -129,493 +124,26 @@ public class SiteEntity extends SiteVo { ...@@ -129,493 +124,26 @@ public class SiteEntity extends SiteVo {
* 楼栋 * 楼栋
*/ */
private Integer building; private Integer building;
/**
* logo图片地址
*/
private String logoPath;
/**
* 英文名称
*/
private String englishName;
/**
* 负责人
*/
private String leadingOfficial;
/**
* 联系电话
*/
private String leadingOfficialTelephone;
/** /**
* 部署模块，逗号分隔 * 部署模块，逗号分隔
*/ */
private String modelIds; private String modelIds;
public SiteEntity(){}
/**
* 获取 站点名称
* @return String
*/
public String getSiteName(){
return siteName;
}
/**
* 设置 站点名称
* @param siteName
*/
public void setSiteName(String siteName){
this.siteName = siteName;
}
/**
* 获取 站点编号
* @return String
*/
public String getSiteCode(){
return siteCode;
}
/**
* 设置 站点编号
* @param siteCode
*/
public void setSiteCode(String siteCode){
this.siteCode = siteCode;
}
/**
* 获取 区域Id
* @return String
*/
public String getAreaID(){
return areaID;
}
/**
* 设置 区域Id
* @param areaID
*/
public void setAreaID(String areaID){
this.areaID = areaID;
}
/**
* 获取 区域编号
* @return String
*/
public String getAreaCode(){
return areaCode;
}
/**
* 设置 区域编号
* @param areaCode
*/
public void setAreaCode(String areaCode){
this.areaCode = areaCode;
}
/**
* 获取 区域名称
* @return String
*/
public String getAreaName(){
return areaName;
}
/**
* 设置 区域名称
* @param areaName
*/
public void setAreaName(String areaName){
this.areaName = areaName;
}
/**
* 获取 省编码
* @return String
*/
public String getProCode(){
return proCode;
}
/**
* 设置 省编码
* @param proCode
*/
public void setProCode(String proCode){
this.proCode = proCode;
}
/**
* 获取 市编码
* @return String
*/
public String getCityCode(){
return cityCode;
}
/**
* 设置 市编码
* @param cityCode
*/
public void setCityCode(String cityCode){
this.cityCode = cityCode;
}
/**
* 获取 区编码
* @return String
*/
public String getDistrictCode(){
return districtCode;
}
/**
* 设置 区编码
* @param districtCode
*/
public void setDistrictCode(String districtCode){
this.districtCode = districtCode;
}
/**
* 获取 站点服务器ip
* @return String
*/
public String getSiteIp(){
return siteIp;
}
/**
* 设置 站点服务器ip
* @param siteIp
*/
public void setSiteIp(String siteIp){
this.siteIp = siteIp;
}
/**
* 获取 站点服务器端口
* @return String
*/
public String getSitePort(){
return sitePort;
}
/**
* 设置 站点服务器端口
* @param sitePort
*/
public void setSitePort(String sitePort){
this.sitePort = sitePort;
}
/**
* 获取 经度
* @return String
*/
public String getLongitude(){
return longitude;
}
/**
* 设置 经度
* @param longitude
*/
public void setLongitude(String longitude){
this.longitude = longitude;
}
/**
* 获取 纬度
* @return String
*/
public String getLatitude(){
return latitude;
}
/**
* 设置 纬度
* @param latitude
*/
public void setLatitude(String latitude){
this.latitude = latitude;
}
/**
* 获取 中心联系电话
* @return String
*/
public String getSiteTel(){
return siteTel;
}
/**
* 设置 中心联系电话
* @param siteTel
*/
public void setSiteTel(String siteTel){
this.siteTel = siteTel;
}
/**
* 获取 中心详细地址
* @return String
*/
public String getDetailAddress(){
return detailAddress;
}
/**
* 设置 中心详细地址
* @param detailAddress
*/
public void setDetailAddress(String detailAddress){
this.detailAddress = detailAddress;
}
/**
* 获取 中心介绍
* @return String
*/
public String getSiteRemark(){
return siteRemark;
}
/** /**
* 设置 中心介绍 * 区域名称
* @param siteRemark
*/
public void setSiteRemark(String siteRemark){
this.siteRemark = siteRemark;
}
/**
* 获取 上午上班开始时间
* @return Date
*/
public Date getAmWorkStartTime(){
return amWorkStartTime;
}
/**
* 设置 上午上班开始时间
* @param amWorkStartTime
*/
public void setAmWorkStartTime(Date amWorkStartTime){
this.amWorkStartTime = amWorkStartTime;
}
/**
* 获取 上午上班结束时间
* @return Date
*/
public Date getAmWorkEndTime(){
return amWorkEndTime;
}
/**
* 设置 上午上班结束时间
* @param amWorkEndTime
*/
public void setAmWorkEndTime(Date amWorkEndTime){
this.amWorkEndTime = amWorkEndTime;
}
/**
* 获取 下午上班开始时间
* @return Date
*/
public Date getPmWorkStartTime(){
return pmWorkStartTime;
}
/**
* 设置 下午上班开始时间
* @param pmWorkStartTime
*/
public void setPmWorkStartTime(Date pmWorkStartTime){
this.pmWorkStartTime = pmWorkStartTime;
}
/**
* 获取 下午上班结束时间
* @return Date
*/
public Date getPmWorkEndTime(){
return pmWorkEndTime;
}
/**
* 设置 下午上班结束时间
* @param pmWorkEndTime
*/
public void setPmWorkEndTime(Date pmWorkEndTime){
this.pmWorkEndTime = pmWorkEndTime;
}
/**
* 获取 周一 (1.上班，0.不上)
* @return Integer
*/
public Integer getWorkday1(){
return workday1;
}
/**
* 设置 周一 (1.上班，0.不上)
* @param workday1
*/
public void setWorkday1(Integer workday1){
this.workday1 = workday1;
}
/**
* 获取 周二 (1.上班，0.不上)
* @return Integer
*/
public Integer getWorkday2(){
return workday2;
}
/**
* 设置 周二 (1.上班，0.不上)
* @param workday2
*/
public void setWorkday2(Integer workday2){
this.workday2 = workday2;
}
/**
* 获取 周三 (1.上班，0.不上)
* @return Integer
*/
public Integer getWorkday3(){
return workday3;
}
/**
* 设置 周三 (1.上班，0.不上)
* @param workday3
*/
public void setWorkday3(Integer workday3){
this.workday3 = workday3;
}
/**
* 获取 周四 (1.上班，0.不上)
* @return Integer
*/
public Integer getWorkday4(){
return workday4;
}
/**
* 设置 周四 (1.上班，0.不上)
* @param workday4
*/
public void setWorkday4(Integer workday4){
this.workday4 = workday4;
}
/**
* 获取 周五 (1.上班，0.不上)
* @return Integer
*/
public Integer getWorkday5(){
return workday5;
}
/**
* 设置 周五 (1.上班，0.不上)
* @param workday5
*/
public void setWorkday5(Integer workday5){
this.workday5 = workday5;
}
/**
* 获取 周六 (1.上班，0.不上)
* @return Integer
*/
public Integer getWorkday6(){
return workday6;
}
/**
* 设置 周六 (1.上班，0.不上)
* @param workday6
*/
public void setWorkday6(Integer workday6){
this.workday6 = workday6;
}
/**
* 获取 周日 (1.上班，0.不上)
* @return Integer
*/
public Integer getWorkday7(){
return workday7;
}
/**
* 设置 周日 (1.上班，0.不上)
* @param workday7
*/
public void setWorkday7(Integer workday7){
this.workday7 = workday7;
}
/**
* 获取 楼层
* @return Integer
*/
public Integer getLevel(){
return level;
}
/**
* 设置 楼层
* @param level
*/
public void setLevel(Integer level){
this.level = level;
}
/**
* 获取 楼栋
* @return Integer
*/
public Integer getBuilding(){
return building;
}
/**
* 设置 楼栋
* @param building
*/
public void setBuilding(Integer building){
this.building = building;
}
/**
* 获取 logo图片地址
* @return String
*/
public String getLogoPath(){
return logoPath;
}
/**
* 设置 logo图片地址
* @param logoPath
*/
public void setLogoPath(String logoPath){
this.logoPath = logoPath;
}
/**
* 获取 英文名称
* @return String
*/
public String getEnglishName(){
return englishName;
}
/**
* 设置 英文名称
* @param englishName
*/
public void setEnglishName(String englishName){
this.englishName = englishName;
}
/**
* 获取 负责人
* @return String
*/
public String getLeadingOfficial(){
return leadingOfficial;
}
/**
* 设置 负责人
* @param leadingOfficial
*/
public void setLeadingOfficial(String leadingOfficial){
this.leadingOfficial = leadingOfficial;
}
/**
* 获取 联系电话
* @return String
*/ */
public String getLeadingOfficialTelephone(){ private String areaName;
return leadingOfficialTelephone;
}
/** /**
* 设置 联系电话 * 在线取号（0.否，1.是）
* @param leadingOfficialTelephone
*/ */
public void setLeadingOfficialTelephone(String leadingOfficialTelephone){ private Integer onlineTake;
this.leadingOfficialTelephone = leadingOfficialTelephone;
}
/** /**
* 获取 部署模块，逗号分隔 * 微预约（0.否，1.是）
* @return String
*/ */
public String getModelIds(){ private Integer appointment;
return modelIds;
}
/** /**
* 设置 部署模块，逗号分隔 * 政务地图（0.否，1.是）
* @param modelIds
*/ */
public void setModelIds(String modelIds){ private Integer gowMap;
this.modelIds = modelIds;
}
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -632,83 +160,43 @@ public class SiteEntity extends SiteVo { ...@@ -632,83 +160,43 @@ public class SiteEntity extends SiteVo {
return false; return false;
} }
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",siteName:").append(getSiteName());
sb.append(",siteCode:").append(getSiteCode());
sb.append(",areaID:").append(getAreaID());
sb.append(",areaCode:").append(getAreaCode());
sb.append(",areaName:").append(getAreaName());
sb.append(",proCode:").append(getProCode());
sb.append(",cityCode:").append(getCityCode());
sb.append(",districtCode:").append(getDistrictCode());
sb.append(",siteIp:").append(getSiteIp());
sb.append(",sitePort:").append(getSitePort());
sb.append(",longitude:").append(getLongitude());
sb.append(",latitude:").append(getLatitude());
sb.append(",siteTel:").append(getSiteTel());
sb.append(",detailAddress:").append(getDetailAddress());
sb.append(",siteRemark:").append(getSiteRemark());
sb.append(",amWorkStartTime:").append(getAmWorkStartTime());
sb.append(",amWorkEndTime:").append(getAmWorkEndTime());
sb.append(",pmWorkStartTime:").append(getPmWorkStartTime());
sb.append(",pmWorkEndTime:").append(getPmWorkEndTime());
sb.append(",workday1:").append(getWorkday1());
sb.append(",workday2:").append(getWorkday2());
sb.append(",workday3:").append(getWorkday3());
sb.append(",workday4:").append(getWorkday4());
sb.append(",workday5:").append(getWorkday5());
sb.append(",workday6:").append(getWorkday6());
sb.append(",workday7:").append(getWorkday7());
sb.append(",level:").append(getLevel());
sb.append(",building:").append(getBuilding());
sb.append(",logoPath:").append(getLogoPath());
sb.append(",englishName:").append(getEnglishName());
sb.append(",leadingOfficial:").append(getLeadingOfficial());
sb.append(",leadingOfficialTelephone:").append(getLeadingOfficialTelephone());
sb.append(",modelIds:").append(getModelIds());
return sb.toString();
}
public void initAttrValue(){ public void initAttrValue(){
this.siteName = null; this.siteName = "";
this.siteCode = null; this.siteCode = "";
this.areaID = null; this.proCode = "";
this.areaCode = null; this.areaID = "";
this.areaName = null; this.areaCode = "";
this.proCode = null; this.cityCode = "";
this.cityCode = null; this.districtCode = "";
this.districtCode = null; this.siteIp = "";
this.siteIp = null; this.sitePort = "";
this.sitePort = null; this.longitude = "";
this.longitude = null; this.latitude = "";
this.latitude = null; this.siteTel = "";
this.siteTel = null; this.detailAddress = "";
this.detailAddress = null; this.siteRemark = "";
this.siteRemark = null; this.amWorkStartTime = "";
this.amWorkStartTime = null; this.amWorkEndTime = "";
this.amWorkEndTime = null; this.pmWorkStartTime = "";
this.pmWorkStartTime = null; this.pmWorkEndTime = "";
this.pmWorkEndTime = null;
this.workday1 = 1; this.workday1 = 1;
...@@ -728,14 +216,14 @@ public class SiteEntity extends SiteVo { ...@@ -728,14 +216,14 @@ public class SiteEntity extends SiteVo {
this.building = 1; this.building = 1;
this.logoPath = ""; this.modelIds = "";
this.englishName = ""; this.areaName = "";
this.leadingOfficial = ""; this.onlineTake = 1;
this.leadingOfficialTelephone = ""; this.appointment = 1;
this.modelIds = ""; this.gowMap = 1;
} }
} }
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteQuery.java
View file @ 3ff29522
package com.mortals.xhx.module.site.model; package com.mortals.xhx.module.site.model;
import java.util.Date;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.site.model.SiteEntity; import com.mortals.xhx.module.site.model.SiteEntity;
/** /**
* 站点查询对象 * 站点查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-07-14 * @date 2023-05-07
*/ */
public class SiteQuery extends SiteEntity { public class SiteQuery extends SiteEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -22,75 +21,99 @@ public class SiteQuery extends SiteEntity { ...@@ -22,75 +21,99 @@ public class SiteQuery extends SiteEntity {
/** 序号，主键，自增长列表 */ /** 序号，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 站点名称 */ /** 站点名称 */
private List<String> siteNameList; private List<String> siteNameList;
/** 站点名称排除列表 */
private List <String> siteNameNotList;
/** 站点编号 */ /** 站点编号 */
private List<String> siteCodeList; private List<String> siteCodeList;
/** 区域Id */ /** 站点编号排除列表 */
private List <String> siteCodeNotList;
/** 省编码 */
private List<String> proCodeList;
/** 省编码排除列表 */
private List <String> proCodeNotList;
/** 区域ID */
private List<String> areaIDList; private List<String> areaIDList;
/** 区域编号 */ /** 区域ID排除列表 */
private List <String> areaIDNotList;
/** 区域编码 */
private List<String> areaCodeList; private List<String> areaCodeList;
/** 区域名称 */ /** 区域编码排除列表 */
private List<String> areaNameList; private List <String> areaCodeNotList;
/** 省编码 */
private List<String> proCodeList;
/** 市编码 */ /** 市编码 */
private List<String> cityCodeList; private List<String> cityCodeList;
/** 市编码排除列表 */
private List <String> cityCodeNotList;
/** 区编码 */ /** 区编码 */
private List<String> districtCodeList; private List<String> districtCodeList;
/** 区编码排除列表 */
private List <String> districtCodeNotList;
/** 站点服务器ip */ /** 站点服务器ip */
private List<String> siteIpList; private List<String> siteIpList;
/** 站点服务器ip排除列表 */
private List <String> siteIpNotList;
/** 站点服务器端口 */ /** 站点服务器端口 */
private List<String> sitePortList; private List<String> sitePortList;
/** 站点服务器端口排除列表 */
private List <String> sitePortNotList;
/** 经度 */ /** 经度 */
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 List<String> siteTelList; private List<String> siteTelList;
/** 中心联系电话排除列表 */
private List <String> siteTelNotList;
/** 中心详细地址 */ /** 中心详细地址 */
private List<String> detailAddressList; private List<String> detailAddressList;
/** 中心详细地址排除列表 */
private List <String> detailAddressNotList;
/** 中心介绍 */ /** 中心介绍 */
private List<String> siteRemarkList; private List<String> siteRemarkList;
/** 开始 上午上班开始时间 */ /** 中心介绍排除列表 */
private String amWorkStartTimeStart; private List <String> siteRemarkNotList;
/** 上午上班开始时间 */
/** 结束 上午上班开始时间 */ private List<String> amWorkStartTimeList;
private String amWorkStartTimeEnd;
/** 开始 上午上班结束时间 */
private String amWorkEndTimeStart;
/** 结束 上午上班结束时间 */ /** 上午上班开始时间排除列表 */
private String amWorkEndTimeEnd; private List <String> amWorkStartTimeNotList;
/** 上午上班结束时间 */
private List<String> amWorkEndTimeList;
/** 开始 下午上班开始时间 */ /** 上午上班结束时间排除列表 */
private String pmWorkStartTimeStart; private List <String> amWorkEndTimeNotList;
/** 下午上班开始时间 */
private List<String> pmWorkStartTimeList;
/** 结束 下午上班开始时间 */ /** 下午上班开始时间排除列表 */
private String pmWorkStartTimeEnd; private List <String> pmWorkStartTimeNotList;
/** 下午上班结束时间 */
/** 开始 下午上班结束时间 */ private List<String> pmWorkEndTimeList;
private String pmWorkEndTimeStart;
/** 结束 下午上班结束时间 */
private String pmWorkEndTimeEnd;
/** 下午上班结束时间排除列表 */
private List <String> pmWorkEndTimeNotList;
/** 开始 周一 (1.上班，0.不上) */ /** 开始 周一 (1.上班，0.不上) */
private Integer workday1Start; private Integer workday1Start;
...@@ -103,6 +126,9 @@ public class SiteQuery extends SiteEntity { ...@@ -103,6 +126,9 @@ public class SiteQuery extends SiteEntity {
/** 周一 (1.上班，0.不上)列表 */ /** 周一 (1.上班，0.不上)列表 */
private List <Integer> workday1List; private List <Integer> workday1List;
/** 周一 (1.上班，0.不上)排除列表 */
private List <Integer> workday1NotList;
/** 开始 周二 (1.上班，0.不上) */ /** 开始 周二 (1.上班，0.不上) */
private Integer workday2Start; private Integer workday2Start;
...@@ -115,6 +141,9 @@ public class SiteQuery extends SiteEntity { ...@@ -115,6 +141,9 @@ public class SiteQuery extends SiteEntity {
/** 周二 (1.上班，0.不上)列表 */ /** 周二 (1.上班，0.不上)列表 */
private List <Integer> workday2List; private List <Integer> workday2List;
/** 周二 (1.上班，0.不上)排除列表 */
private List <Integer> workday2NotList;
/** 开始 周三 (1.上班，0.不上) */ /** 开始 周三 (1.上班，0.不上) */
private Integer workday3Start; private Integer workday3Start;
...@@ -127,6 +156,9 @@ public class SiteQuery extends SiteEntity { ...@@ -127,6 +156,9 @@ public class SiteQuery extends SiteEntity {
/** 周三 (1.上班，0.不上)列表 */ /** 周三 (1.上班，0.不上)列表 */
private List <Integer> workday3List; private List <Integer> workday3List;
/** 周三 (1.上班，0.不上)排除列表 */
private List <Integer> workday3NotList;
/** 开始 周四 (1.上班，0.不上) */ /** 开始 周四 (1.上班，0.不上) */
private Integer workday4Start; private Integer workday4Start;
...@@ -139,6 +171,9 @@ public class SiteQuery extends SiteEntity { ...@@ -139,6 +171,9 @@ public class SiteQuery extends SiteEntity {
/** 周四 (1.上班，0.不上)列表 */ /** 周四 (1.上班，0.不上)列表 */
private List <Integer> workday4List; private List <Integer> workday4List;
/** 周四 (1.上班，0.不上)排除列表 */
private List <Integer> workday4NotList;
/** 开始 周五 (1.上班，0.不上) */ /** 开始 周五 (1.上班，0.不上) */
private Integer workday5Start; private Integer workday5Start;
...@@ -151,6 +186,9 @@ public class SiteQuery extends SiteEntity { ...@@ -151,6 +186,9 @@ public class SiteQuery extends SiteEntity {
/** 周五 (1.上班，0.不上)列表 */ /** 周五 (1.上班，0.不上)列表 */
private List <Integer> workday5List; private List <Integer> workday5List;
/** 周五 (1.上班，0.不上)排除列表 */
private List <Integer> workday5NotList;
/** 开始 周六 (1.上班，0.不上) */ /** 开始 周六 (1.上班，0.不上) */
private Integer workday6Start; private Integer workday6Start;
...@@ -163,6 +201,9 @@ public class SiteQuery extends SiteEntity { ...@@ -163,6 +201,9 @@ public class SiteQuery extends SiteEntity {
/** 周六 (1.上班，0.不上)列表 */ /** 周六 (1.上班，0.不上)列表 */
private List <Integer> workday6List; private List <Integer> workday6List;
/** 周六 (1.上班，0.不上)排除列表 */
private List <Integer> workday6NotList;
/** 开始 周日 (1.上班，0.不上) */ /** 开始 周日 (1.上班，0.不上) */
private Integer workday7Start; private Integer workday7Start;
...@@ -175,6 +216,9 @@ public class SiteQuery extends SiteEntity { ...@@ -175,6 +216,9 @@ public class SiteQuery extends SiteEntity {
/** 周日 (1.上班，0.不上)列表 */ /** 周日 (1.上班，0.不上)列表 */
private List <Integer> workday7List; private List <Integer> workday7List;
/** 周日 (1.上班，0.不上)排除列表 */
private List <Integer> workday7NotList;
/** 开始 楼层 */ /** 开始 楼层 */
private Integer levelStart; private Integer levelStart;
...@@ -187,6 +231,9 @@ public class SiteQuery extends SiteEntity { ...@@ -187,6 +231,9 @@ public class SiteQuery extends SiteEntity {
/** 楼层列表 */ /** 楼层列表 */
private List <Integer> levelList; private List <Integer> levelList;
/** 楼层排除列表 */
private List <Integer> levelNotList;
/** 开始 楼栋 */ /** 开始 楼栋 */
private Integer buildingStart; private Integer buildingStart;
...@@ -199,20 +246,8 @@ public class SiteQuery extends SiteEntity { ...@@ -199,20 +246,8 @@ public class SiteQuery extends SiteEntity {
/** 楼栋列表 */ /** 楼栋列表 */
private List <Integer> buildingList; private List <Integer> buildingList;
/** logo图片地址 */ /** 楼栋排除列表 */
private List<String> logoPathList; private List <Integer> buildingNotList;
/** 英文名称 */
private List<String> englishNameList;
/** 负责人 */
private List<String> leadingOfficialList;
/** 联系电话 */
private List<String> leadingOfficialTelephoneList;
/** 部署模块，逗号分隔 */
private List<String> modelIdsList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -232,12 +267,70 @@ public class SiteQuery extends SiteEntity { ...@@ -232,12 +267,70 @@ public class SiteQuery extends SiteEntity {
/** 创建用户列表 */ /** 创建用户列表 */
private List <Long> createUserIdList; private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 修改时间 */ /** 开始 修改时间 */
private String updateTimeStart; private String updateTimeStart;
/** 结束 修改时间 */ /** 结束 修改时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 部署模块，逗号分隔 */
private List<String> modelIdsList;
/** 部署模块，逗号分隔排除列表 */
private List <String> modelIdsNotList;
/** 区域名称 */
private List<String> areaNameList;
/** 区域名称排除列表 */
private List <String> areaNameNotList;
/** 开始 在线取号（0.否，1.是） */
private Integer onlineTakeStart;
/** 结束 在线取号（0.否，1.是） */
private Integer onlineTakeEnd;
/** 增加 在线取号（0.否，1.是） */
private Integer onlineTakeIncrement;
/** 在线取号（0.否，1.是）列表 */
private List <Integer> onlineTakeList;
/** 在线取号（0.否，1.是）排除列表 */
private List <Integer> onlineTakeNotList;
/** 开始 微预约（0.否，1.是） */
private Integer appointmentStart;
/** 结束 微预约（0.否，1.是） */
private Integer appointmentEnd;
/** 增加 微预约（0.否，1.是） */
private Integer appointmentIncrement;
/** 微预约（0.否，1.是）列表 */
private List <Integer> appointmentList;
/** 微预约（0.否，1.是）排除列表 */
private List <Integer> appointmentNotList;
/** 开始 政务地图（0.否，1.是） */
private Integer gowMapStart;
/** 结束 政务地图（0.否，1.是） */
private Integer gowMapEnd;
/** 增加 政务地图（0.否，1.是） */
private Integer gowMapIncrement;
/** 政务地图（0.否，1.是）列表 */
private List <Integer> gowMapList;
/** 政务地图（0.否，1.是）排除列表 */
private List <Integer> gowMapNotList;
/** 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<SiteQuery> orConditionList; private List<SiteQuery> orConditionList;
...@@ -310,6 +403,23 @@ public class SiteQuery extends SiteEntity { ...@@ -310,6 +403,23 @@ public class SiteQuery extends SiteEntity {
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 siteNameList * @return siteNameList
...@@ -325,6 +435,23 @@ public class SiteQuery extends SiteEntity { ...@@ -325,6 +435,23 @@ public class SiteQuery extends SiteEntity {
public void setSiteNameList(List<String> siteNameList){ public void setSiteNameList(List<String> siteNameList){
this.siteNameList = siteNameList; this.siteNameList = siteNameList;
} }
/**
* 获取 站点名称
* @return siteNameNotList
*/
public List<String> getSiteNameNotList(){
return this.siteNameNotList;
}
/**
* 设置 站点名称
* @param siteNameNotList
*/
public void setSiteNameNotList(List<String> siteNameNotList){
this.siteNameNotList = siteNameNotList;
}
/** /**
* 获取 站点编号 * 获取 站点编号
* @return siteCodeList * @return siteCodeList
...@@ -340,8 +467,57 @@ public class SiteQuery extends SiteEntity { ...@@ -340,8 +467,57 @@ public class SiteQuery extends SiteEntity {
public void setSiteCodeList(List<String> siteCodeList){ public void setSiteCodeList(List<String> siteCodeList){
this.siteCodeList = siteCodeList; this.siteCodeList = siteCodeList;
} }
/**
* 获取 站点编号
* @return siteCodeNotList
*/
public List<String> getSiteCodeNotList(){
return this.siteCodeNotList;
}
/**
* 设置 站点编号
* @param siteCodeNotList
*/
public void setSiteCodeNotList(List<String> siteCodeNotList){
this.siteCodeNotList = siteCodeNotList;
}
/**
* 获取 省编码
* @return proCodeList
*/
public List<String> getProCodeList(){
return this.proCodeList;
}
/**
* 设置 省编码
* @param proCodeList
*/
public void setProCodeList(List<String> proCodeList){
this.proCodeList = proCodeList;
}
/**
* 获取 省编码
* @return proCodeNotList
*/
public List<String> getProCodeNotList(){
return this.proCodeNotList;
}
/**
* 设置 省编码
* @param proCodeNotList
*/
public void setProCodeNotList(List<String> proCodeNotList){
this.proCodeNotList = proCodeNotList;
}
/** /**
* 获取 区域Id * 获取 区域ID
* @return areaIDList * @return areaIDList
*/ */
public List<String> getAreaIDList(){ public List<String> getAreaIDList(){
...@@ -349,57 +525,61 @@ public class SiteQuery extends SiteEntity { ...@@ -349,57 +525,61 @@ public class SiteQuery extends SiteEntity {
} }
/** /**
* 设置 区域Id * 设置 区域ID
* @param areaIDList * @param areaIDList
*/ */
public void setAreaIDList(List<String> areaIDList){ public void setAreaIDList(List<String> areaIDList){
this.areaIDList = areaIDList; this.areaIDList = areaIDList;
} }
/** /**
* 获取 区域编号 * 获取 区域ID
* @return areaCodeList * @return areaIDNotList
*/ */
public List<String> getAreaCodeList(){ public List<String> getAreaIDNotList(){
return this.areaCodeList; return this.areaIDNotList;
} }
/** /**
* 设置 区域编号 * 设置 区域ID
* @param areaCodeList * @param areaIDNotList
*/ */
public void setAreaCodeList(List<String> areaCodeList){ public void setAreaIDNotList(List<String> areaIDNotList){
this.areaCodeList = areaCodeList; this.areaIDNotList = areaIDNotList;
} }
/** /**
* 获取 区域名称 * 获取 区域编码
* @return areaNameList * @return areaCodeList
*/ */
public List<String> getAreaNameList(){ public List<String> getAreaCodeList(){
return this.areaNameList; return this.areaCodeList;
} }
/** /**
* 设置 区域名称 * 设置 区域编码
* @param areaNameList * @param areaCodeList
*/ */
public void setAreaNameList(List<String> areaNameList){ public void setAreaCodeList(List<String> areaCodeList){
this.areaNameList = areaNameList; this.areaCodeList = areaCodeList;
} }
/** /**
* 获取 省编码 * 获取 区域编码
* @return proCodeList * @return areaCodeNotList
*/ */
public List<String> getProCodeList(){ public List<String> getAreaCodeNotList(){
return this.proCodeList; return this.areaCodeNotList;
} }
/** /**
* 设置 省编码 * 设置 区域编码
* @param proCodeList * @param areaCodeNotList
*/ */
public void setProCodeList(List<String> proCodeList){ public void setAreaCodeNotList(List<String> areaCodeNotList){
this.proCodeList = proCodeList; this.areaCodeNotList = areaCodeNotList;
} }
/** /**
* 获取 市编码 * 获取 市编码
* @return cityCodeList * @return cityCodeList
...@@ -415,6 +595,23 @@ public class SiteQuery extends SiteEntity { ...@@ -415,6 +595,23 @@ public class SiteQuery extends SiteEntity {
public void setCityCodeList(List<String> cityCodeList){ public void setCityCodeList(List<String> cityCodeList){
this.cityCodeList = cityCodeList; this.cityCodeList = cityCodeList;
} }
/**
* 获取 市编码
* @return cityCodeNotList
*/
public List<String> getCityCodeNotList(){
return this.cityCodeNotList;
}
/**
* 设置 市编码
* @param cityCodeNotList
*/
public void setCityCodeNotList(List<String> cityCodeNotList){
this.cityCodeNotList = cityCodeNotList;
}
/** /**
* 获取 区编码 * 获取 区编码
* @return districtCodeList * @return districtCodeList
...@@ -430,6 +627,23 @@ public class SiteQuery extends SiteEntity { ...@@ -430,6 +627,23 @@ public class SiteQuery extends SiteEntity {
public void setDistrictCodeList(List<String> districtCodeList){ public void setDistrictCodeList(List<String> districtCodeList){
this.districtCodeList = districtCodeList; this.districtCodeList = districtCodeList;
} }
/**
* 获取 区编码
* @return districtCodeNotList
*/
public List<String> getDistrictCodeNotList(){
return this.districtCodeNotList;
}
/**
* 设置 区编码
* @param districtCodeNotList
*/
public void setDistrictCodeNotList(List<String> districtCodeNotList){
this.districtCodeNotList = districtCodeNotList;
}
/** /**
* 获取 站点服务器ip * 获取 站点服务器ip
* @return siteIpList * @return siteIpList
...@@ -445,6 +659,23 @@ public class SiteQuery extends SiteEntity { ...@@ -445,6 +659,23 @@ public class SiteQuery extends SiteEntity {
public void setSiteIpList(List<String> siteIpList){ public void setSiteIpList(List<String> siteIpList){
this.siteIpList = siteIpList; this.siteIpList = siteIpList;
} }
/**
* 获取 站点服务器ip
* @return siteIpNotList
*/
public List<String> getSiteIpNotList(){
return this.siteIpNotList;
}
/**
* 设置 站点服务器ip
* @param siteIpNotList
*/
public void setSiteIpNotList(List<String> siteIpNotList){
this.siteIpNotList = siteIpNotList;
}
/** /**
* 获取 站点服务器端口 * 获取 站点服务器端口
* @return sitePortList * @return sitePortList
...@@ -460,6 +691,23 @@ public class SiteQuery extends SiteEntity { ...@@ -460,6 +691,23 @@ public class SiteQuery extends SiteEntity {
public void setSitePortList(List<String> sitePortList){ public void setSitePortList(List<String> sitePortList){
this.sitePortList = sitePortList; this.sitePortList = sitePortList;
} }
/**
* 获取 站点服务器端口
* @return sitePortNotList
*/
public List<String> getSitePortNotList(){
return this.sitePortNotList;
}
/**
* 设置 站点服务器端口
* @param sitePortNotList
*/
public void setSitePortNotList(List<String> sitePortNotList){
this.sitePortNotList = sitePortNotList;
}
/** /**
* 获取 经度 * 获取 经度
* @return longitudeList * @return longitudeList
...@@ -475,6 +723,23 @@ public class SiteQuery extends SiteEntity { ...@@ -475,6 +723,23 @@ public class SiteQuery extends SiteEntity {
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
...@@ -490,6 +755,23 @@ public class SiteQuery extends SiteEntity { ...@@ -490,6 +755,23 @@ public class SiteQuery extends SiteEntity {
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 siteTelList * @return siteTelList
...@@ -505,6 +787,23 @@ public class SiteQuery extends SiteEntity { ...@@ -505,6 +787,23 @@ public class SiteQuery extends SiteEntity {
public void setSiteTelList(List<String> siteTelList){ public void setSiteTelList(List<String> siteTelList){
this.siteTelList = siteTelList; this.siteTelList = siteTelList;
} }
/**
* 获取 中心联系电话
* @return siteTelNotList
*/
public List<String> getSiteTelNotList(){
return this.siteTelNotList;
}
/**
* 设置 中心联系电话
* @param siteTelNotList
*/
public void setSiteTelNotList(List<String> siteTelNotList){
this.siteTelNotList = siteTelNotList;
}
/** /**
* 获取 中心详细地址 * 获取 中心详细地址
* @return detailAddressList * @return detailAddressList
...@@ -520,6 +819,23 @@ public class SiteQuery extends SiteEntity { ...@@ -520,6 +819,23 @@ public class SiteQuery extends SiteEntity {
public void setDetailAddressList(List<String> detailAddressList){ public void setDetailAddressList(List<String> detailAddressList){
this.detailAddressList = detailAddressList; this.detailAddressList = detailAddressList;
} }
/**
* 获取 中心详细地址
* @return detailAddressNotList
*/
public List<String> getDetailAddressNotList(){
return this.detailAddressNotList;
}
/**
* 设置 中心详细地址
* @param detailAddressNotList
*/
public void setDetailAddressNotList(List<String> detailAddressNotList){
this.detailAddressNotList = detailAddressNotList;
}
/** /**
* 获取 中心介绍 * 获取 中心介绍
* @return siteRemarkList * @return siteRemarkList
...@@ -535,132 +851,149 @@ public class SiteQuery extends SiteEntity { ...@@ -535,132 +851,149 @@ public class SiteQuery extends SiteEntity {
public void setSiteRemarkList(List<String> siteRemarkList){ public void setSiteRemarkList(List<String> siteRemarkList){
this.siteRemarkList = siteRemarkList; this.siteRemarkList = siteRemarkList;
} }
/**
* 获取 中心介绍
* @return siteRemarkNotList
*/
public List<String> getSiteRemarkNotList(){
return this.siteRemarkNotList;
}
/**
* 设置 中心介绍
* @param siteRemarkNotList
*/
public void setSiteRemarkNotList(List<String> siteRemarkNotList){
this.siteRemarkNotList = siteRemarkNotList;
}
/** /**
* 获取 开始 上午上班开始时间 * 获取 上午上班开始时间
* @return amWorkStartTimeStart * @return amWorkStartTimeList
*/ */
public String getAmWorkStartTimeStart(){ public List<String> getAmWorkStartTimeList(){
return this.amWorkStartTimeStart; return this.amWorkStartTimeList;
} }
/** /**
* 设置 开始 上午上班开始时间 * 设置 上午上班开始时间
* @param amWorkStartTimeStart * @param amWorkStartTimeList
*/ */
public void setAmWorkStartTimeStart(String amWorkStartTimeStart){ public void setAmWorkStartTimeList(List<String> amWorkStartTimeList){
this.amWorkStartTimeStart = amWorkStartTimeStart; this.amWorkStartTimeList = amWorkStartTimeList;
} }
/** /**
* 获取 结束 上午上班开始时间 * 获取 上午上班开始时间
* @return amWorkStartTimeEnd * @return amWorkStartTimeNotList
*/ */
public String getAmWorkStartTimeEnd(){ public List<String> getAmWorkStartTimeNotList(){
return this.amWorkStartTimeEnd; return this.amWorkStartTimeNotList;
} }
/** /**
* 设置 结束 上午上班开始时间 * 设置 上午上班开始时间
* @param amWorkStartTimeEnd * @param amWorkStartTimeNotList
*/ */
public void setAmWorkStartTimeEnd(String amWorkStartTimeEnd){ public void setAmWorkStartTimeNotList(List<String> amWorkStartTimeNotList){
this.amWorkStartTimeEnd = amWorkStartTimeEnd; this.amWorkStartTimeNotList = amWorkStartTimeNotList;
} }
/** /**
* 获取 开始 上午上班结束时间 * 获取 上午上班结束时间
* @return amWorkEndTimeStart * @return amWorkEndTimeList
*/ */
public String getAmWorkEndTimeStart(){ public List<String> getAmWorkEndTimeList(){
return this.amWorkEndTimeStart; return this.amWorkEndTimeList;
} }
/** /**
* 设置 开始 上午上班结束时间 * 设置 上午上班结束时间
* @param amWorkEndTimeStart * @param amWorkEndTimeList
*/ */
public void setAmWorkEndTimeStart(String amWorkEndTimeStart){ public void setAmWorkEndTimeList(List<String> amWorkEndTimeList){
this.amWorkEndTimeStart = amWorkEndTimeStart; this.amWorkEndTimeList = amWorkEndTimeList;
} }
/** /**
* 获取 结束 上午上班结束时间 * 获取 上午上班结束时间
* @return amWorkEndTimeEnd * @return amWorkEndTimeNotList
*/ */
public String getAmWorkEndTimeEnd(){ public List<String> getAmWorkEndTimeNotList(){
return this.amWorkEndTimeEnd; return this.amWorkEndTimeNotList;
} }
/** /**
* 设置 结束 上午上班结束时间 * 设置 上午上班结束时间
* @param amWorkEndTimeEnd * @param amWorkEndTimeNotList
*/ */
public void setAmWorkEndTimeEnd(String amWorkEndTimeEnd){ public void setAmWorkEndTimeNotList(List<String> amWorkEndTimeNotList){
this.amWorkEndTimeEnd = amWorkEndTimeEnd; this.amWorkEndTimeNotList = amWorkEndTimeNotList;
} }
/** /**
* 获取 开始 下午上班开始时间 * 获取 下午上班开始时间
* @return pmWorkStartTimeStart * @return pmWorkStartTimeList
*/ */
public String getPmWorkStartTimeStart(){ public List<String> getPmWorkStartTimeList(){
return this.pmWorkStartTimeStart; return this.pmWorkStartTimeList;
} }
/** /**
* 设置 开始 下午上班开始时间 * 设置 下午上班开始时间
* @param pmWorkStartTimeStart * @param pmWorkStartTimeList
*/ */
public void setPmWorkStartTimeStart(String pmWorkStartTimeStart){ public void setPmWorkStartTimeList(List<String> pmWorkStartTimeList){
this.pmWorkStartTimeStart = pmWorkStartTimeStart; this.pmWorkStartTimeList = pmWorkStartTimeList;
} }
/** /**
* 获取 结束 下午上班开始时间 * 获取 下午上班开始时间
* @return pmWorkStartTimeEnd * @return pmWorkStartTimeNotList
*/ */
public String getPmWorkStartTimeEnd(){ public List<String> getPmWorkStartTimeNotList(){
return this.pmWorkStartTimeEnd; return this.pmWorkStartTimeNotList;
} }
/** /**
* 设置 结束 下午上班开始时间 * 设置 下午上班开始时间
* @param pmWorkStartTimeEnd * @param pmWorkStartTimeNotList
*/ */
public void setPmWorkStartTimeEnd(String pmWorkStartTimeEnd){ public void setPmWorkStartTimeNotList(List<String> pmWorkStartTimeNotList){
this.pmWorkStartTimeEnd = pmWorkStartTimeEnd; this.pmWorkStartTimeNotList = pmWorkStartTimeNotList;
} }
/** /**
* 获取 开始 下午上班结束时间 * 获取 下午上班结束时间
* @return pmWorkEndTimeStart * @return pmWorkEndTimeList
*/ */
public String getPmWorkEndTimeStart(){ public List<String> getPmWorkEndTimeList(){
return this.pmWorkEndTimeStart; return this.pmWorkEndTimeList;
} }
/** /**
* 设置 开始 下午上班结束时间 * 设置 下午上班结束时间
* @param pmWorkEndTimeStart * @param pmWorkEndTimeList
*/ */
public void setPmWorkEndTimeStart(String pmWorkEndTimeStart){ public void setPmWorkEndTimeList(List<String> pmWorkEndTimeList){
this.pmWorkEndTimeStart = pmWorkEndTimeStart; this.pmWorkEndTimeList = pmWorkEndTimeList;
} }
/** /**
* 获取 结束 下午上班结束时间 * 获取 下午上班结束时间
* @return pmWorkEndTimeEnd * @return pmWorkEndTimeNotList
*/ */
public String getPmWorkEndTimeEnd(){ public List<String> getPmWorkEndTimeNotList(){
return this.pmWorkEndTimeEnd; return this.pmWorkEndTimeNotList;
} }
/** /**
* 设置 结束 下午上班结束时间 * 设置 下午上班结束时间
* @param pmWorkEndTimeEnd * @param pmWorkEndTimeNotList
*/ */
public void setPmWorkEndTimeEnd(String pmWorkEndTimeEnd){ public void setPmWorkEndTimeNotList(List<String> pmWorkEndTimeNotList){
this.pmWorkEndTimeEnd = pmWorkEndTimeEnd; this.pmWorkEndTimeNotList = pmWorkEndTimeNotList;
} }
/** /**
...@@ -727,6 +1060,23 @@ public class SiteQuery extends SiteEntity { ...@@ -727,6 +1060,23 @@ public class SiteQuery extends SiteEntity {
this.workday1List = workday1List; this.workday1List = workday1List;
} }
/**
* 获取 周一 (1.上班，0.不上)
* @return workday1NotList
*/
public List<Integer> getWorkday1NotList(){
return this.workday1NotList;
}
/**
* 设置 周一 (1.上班，0.不上)
* @param workday1NotList
*/
public void setWorkday1NotList(List<Integer> workday1NotList){
this.workday1NotList = workday1NotList;
}
/** /**
* 获取 开始 周二 (1.上班，0.不上) * 获取 开始 周二 (1.上班，0.不上)
* @return workday2Start * @return workday2Start
...@@ -792,11 +1142,28 @@ public class SiteQuery extends SiteEntity { ...@@ -792,11 +1142,28 @@ public class SiteQuery extends SiteEntity {
} }
/** /**
* 获取 开始 周三 (1.上班，0.不上) * 获取 周二 (1.上班，0.不上)
* @return workday3Start * @return workday2NotList
*/ */
public Integer getWorkday3Start(){ public List<Integer> getWorkday2NotList(){
return this.workday3Start; return this.workday2NotList;
}
/**
* 设置 周二 (1.上班，0.不上)
* @param workday2NotList
*/
public void setWorkday2NotList(List<Integer> workday2NotList){
this.workday2NotList = workday2NotList;
}
/**
* 获取 开始 周三 (1.上班，0.不上)
* @return workday3Start
*/
public Integer getWorkday3Start(){
return this.workday3Start;
} }
/** /**
...@@ -855,6 +1222,23 @@ public class SiteQuery extends SiteEntity { ...@@ -855,6 +1222,23 @@ public class SiteQuery extends SiteEntity {
this.workday3List = workday3List; this.workday3List = workday3List;
} }
/**
* 获取 周三 (1.上班，0.不上)
* @return workday3NotList
*/
public List<Integer> getWorkday3NotList(){
return this.workday3NotList;
}
/**
* 设置 周三 (1.上班，0.不上)
* @param workday3NotList
*/
public void setWorkday3NotList(List<Integer> workday3NotList){
this.workday3NotList = workday3NotList;
}
/** /**
* 获取 开始 周四 (1.上班，0.不上) * 获取 开始 周四 (1.上班，0.不上)
* @return workday4Start * @return workday4Start
...@@ -919,6 +1303,23 @@ public class SiteQuery extends SiteEntity { ...@@ -919,6 +1303,23 @@ public class SiteQuery extends SiteEntity {
this.workday4List = workday4List; this.workday4List = workday4List;
} }
/**
* 获取 周四 (1.上班，0.不上)
* @return workday4NotList
*/
public List<Integer> getWorkday4NotList(){
return this.workday4NotList;
}
/**
* 设置 周四 (1.上班，0.不上)
* @param workday4NotList
*/
public void setWorkday4NotList(List<Integer> workday4NotList){
this.workday4NotList = workday4NotList;
}
/** /**
* 获取 开始 周五 (1.上班，0.不上) * 获取 开始 周五 (1.上班，0.不上)
* @return workday5Start * @return workday5Start
...@@ -983,6 +1384,23 @@ public class SiteQuery extends SiteEntity { ...@@ -983,6 +1384,23 @@ public class SiteQuery extends SiteEntity {
this.workday5List = workday5List; this.workday5List = workday5List;
} }
/**
* 获取 周五 (1.上班，0.不上)
* @return workday5NotList
*/
public List<Integer> getWorkday5NotList(){
return this.workday5NotList;
}
/**
* 设置 周五 (1.上班，0.不上)
* @param workday5NotList
*/
public void setWorkday5NotList(List<Integer> workday5NotList){
this.workday5NotList = workday5NotList;
}
/** /**
* 获取 开始 周六 (1.上班，0.不上) * 获取 开始 周六 (1.上班，0.不上)
* @return workday6Start * @return workday6Start
...@@ -1047,6 +1465,23 @@ public class SiteQuery extends SiteEntity { ...@@ -1047,6 +1465,23 @@ public class SiteQuery extends SiteEntity {
this.workday6List = workday6List; this.workday6List = workday6List;
} }
/**
* 获取 周六 (1.上班，0.不上)
* @return workday6NotList
*/
public List<Integer> getWorkday6NotList(){
return this.workday6NotList;
}
/**
* 设置 周六 (1.上班，0.不上)
* @param workday6NotList
*/
public void setWorkday6NotList(List<Integer> workday6NotList){
this.workday6NotList = workday6NotList;
}
/** /**
* 获取 开始 周日 (1.上班，0.不上) * 获取 开始 周日 (1.上班，0.不上)
* @return workday7Start * @return workday7Start
...@@ -1111,6 +1546,23 @@ public class SiteQuery extends SiteEntity { ...@@ -1111,6 +1546,23 @@ public class SiteQuery extends SiteEntity {
this.workday7List = workday7List; this.workday7List = workday7List;
} }
/**
* 获取 周日 (1.上班，0.不上)
* @return workday7NotList
*/
public List<Integer> getWorkday7NotList(){
return this.workday7NotList;
}
/**
* 设置 周日 (1.上班，0.不上)
* @param workday7NotList
*/
public void setWorkday7NotList(List<Integer> workday7NotList){
this.workday7NotList = workday7NotList;
}
/** /**
* 获取 开始 楼层 * 获取 开始 楼层
* @return levelStart * @return levelStart
...@@ -1175,6 +1627,23 @@ public class SiteQuery extends SiteEntity { ...@@ -1175,6 +1627,23 @@ public class SiteQuery extends SiteEntity {
this.levelList = levelList; this.levelList = levelList;
} }
/**
* 获取 楼层
* @return levelNotList
*/
public List<Integer> getLevelNotList(){
return this.levelNotList;
}
/**
* 设置 楼层
* @param levelNotList
*/
public void setLevelNotList(List<Integer> levelNotList){
this.levelNotList = levelNotList;
}
/** /**
* 获取 开始 楼栋 * 获取 开始 楼栋
* @return buildingStart * @return buildingStart
...@@ -1240,80 +1709,22 @@ public class SiteQuery extends SiteEntity { ...@@ -1240,80 +1709,22 @@ public class SiteQuery extends SiteEntity {
} }
/** /**
* 获取 logo图片地址 * 获取 楼栋
* @return logoPathList * @return buildingNotList
*/
public List<String> getLogoPathList(){
return this.logoPathList;
}
/**
* 设置 logo图片地址
* @param logoPathList
*/
public void setLogoPathList(List<String> logoPathList){
this.logoPathList = logoPathList;
}
/**
* 获取 英文名称
* @return englishNameList
*/
public List<String> getEnglishNameList(){
return this.englishNameList;
}
/**
* 设置 英文名称
* @param englishNameList
*/
public void setEnglishNameList(List<String> englishNameList){
this.englishNameList = englishNameList;
}
/**
* 获取 负责人
* @return leadingOfficialList
*/ */
public List<String> getLeadingOfficialList(){ public List<Integer> getBuildingNotList(){
return this.leadingOfficialList; return this.buildingNotList;
} }
/** /**
* 设置 负责人 * 设置 楼栋
* @param leadingOfficialList * @param buildingNotList
*/
public void setLeadingOfficialList(List<String> leadingOfficialList){
this.leadingOfficialList = leadingOfficialList;
}
/**
* 获取 联系电话
* @return leadingOfficialTelephoneList
*/ */
public List<String> getLeadingOfficialTelephoneList(){ public void setBuildingNotList(List<Integer> buildingNotList){
return this.leadingOfficialTelephoneList; this.buildingNotList = buildingNotList;
} }
/**
* 设置 联系电话
* @param leadingOfficialTelephoneList
*/
public void setLeadingOfficialTelephoneList(List<String> leadingOfficialTelephoneList){
this.leadingOfficialTelephoneList = leadingOfficialTelephoneList;
}
/**
* 获取 部署模块，逗号分隔
* @return modelIdsList
*/
public List<String> getModelIdsList(){
return this.modelIdsList;
}
/**
* 设置 部署模块，逗号分隔
* @param modelIdsList
*/
public void setModelIdsList(List<String> modelIdsList){
this.modelIdsList = modelIdsList;
}
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
...@@ -1410,6 +1821,23 @@ public class SiteQuery extends SiteEntity { ...@@ -1410,6 +1821,23 @@ public class SiteQuery extends SiteEntity {
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 updateTimeStart * @return updateTimeStart
...@@ -1442,6 +1870,313 @@ public class SiteQuery extends SiteEntity { ...@@ -1442,6 +1870,313 @@ public class SiteQuery extends SiteEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 部署模块，逗号分隔
* @return modelIdsList
*/
public List<String> getModelIdsList(){
return this.modelIdsList;
}
/**
* 设置 部署模块，逗号分隔
* @param modelIdsList
*/
public void setModelIdsList(List<String> modelIdsList){
this.modelIdsList = modelIdsList;
}
/**
* 获取 部署模块，逗号分隔
* @return modelIdsNotList
*/
public List<String> getModelIdsNotList(){
return this.modelIdsNotList;
}
/**
* 设置 部署模块，逗号分隔
* @param modelIdsNotList
*/
public void setModelIdsNotList(List<String> modelIdsNotList){
this.modelIdsNotList = modelIdsNotList;
}
/**
* 获取 区域名称
* @return areaNameList
*/
public List<String> getAreaNameList(){
return this.areaNameList;
}
/**
* 设置 区域名称
* @param areaNameList
*/
public void setAreaNameList(List<String> areaNameList){
this.areaNameList = areaNameList;
}
/**
* 获取 区域名称
* @return areaNameNotList
*/
public List<String> getAreaNameNotList(){
return this.areaNameNotList;
}
/**
* 设置 区域名称
* @param areaNameNotList
*/
public void setAreaNameNotList(List<String> areaNameNotList){
this.areaNameNotList = areaNameNotList;
}
/**
* 获取 开始 在线取号（0.否，1.是）
* @return onlineTakeStart
*/
public Integer getOnlineTakeStart(){
return this.onlineTakeStart;
}
/**
* 设置 开始 在线取号（0.否，1.是）
* @param onlineTakeStart
*/
public void setOnlineTakeStart(Integer onlineTakeStart){
this.onlineTakeStart = onlineTakeStart;
}
/**
* 获取 结束 在线取号（0.否，1.是）
* @return $onlineTakeEnd
*/
public Integer getOnlineTakeEnd(){
return this.onlineTakeEnd;
}
/**
* 设置 结束 在线取号（0.否，1.是）
* @param onlineTakeEnd
*/
public void setOnlineTakeEnd(Integer onlineTakeEnd){
this.onlineTakeEnd = onlineTakeEnd;
}
/**
* 获取 增加 在线取号（0.否，1.是）
* @return onlineTakeIncrement
*/
public Integer getOnlineTakeIncrement(){
return this.onlineTakeIncrement;
}
/**
* 设置 增加 在线取号（0.否，1.是）
* @param onlineTakeIncrement
*/
public void setOnlineTakeIncrement(Integer onlineTakeIncrement){
this.onlineTakeIncrement = onlineTakeIncrement;
}
/**
* 获取 在线取号（0.否，1.是）
* @return onlineTakeList
*/
public List<Integer> getOnlineTakeList(){
return this.onlineTakeList;
}
/**
* 设置 在线取号（0.否，1.是）
* @param onlineTakeList
*/
public void setOnlineTakeList(List<Integer> onlineTakeList){
this.onlineTakeList = onlineTakeList;
}
/**
* 获取 在线取号（0.否，1.是）
* @return onlineTakeNotList
*/
public List<Integer> getOnlineTakeNotList(){
return this.onlineTakeNotList;
}
/**
* 设置 在线取号（0.否，1.是）
* @param onlineTakeNotList
*/
public void setOnlineTakeNotList(List<Integer> onlineTakeNotList){
this.onlineTakeNotList = onlineTakeNotList;
}
/**
* 获取 开始 微预约（0.否，1.是）
* @return appointmentStart
*/
public Integer getAppointmentStart(){
return this.appointmentStart;
}
/**
* 设置 开始 微预约（0.否，1.是）
* @param appointmentStart
*/
public void setAppointmentStart(Integer appointmentStart){
this.appointmentStart = appointmentStart;
}
/**
* 获取 结束 微预约（0.否，1.是）
* @return $appointmentEnd
*/
public Integer getAppointmentEnd(){
return this.appointmentEnd;
}
/**
* 设置 结束 微预约（0.否，1.是）
* @param appointmentEnd
*/
public void setAppointmentEnd(Integer appointmentEnd){
this.appointmentEnd = appointmentEnd;
}
/**
* 获取 增加 微预约（0.否，1.是）
* @return appointmentIncrement
*/
public Integer getAppointmentIncrement(){
return this.appointmentIncrement;
}
/**
* 设置 增加 微预约（0.否，1.是）
* @param appointmentIncrement
*/
public void setAppointmentIncrement(Integer appointmentIncrement){
this.appointmentIncrement = appointmentIncrement;
}
/**
* 获取 微预约（0.否，1.是）
* @return appointmentList
*/
public List<Integer> getAppointmentList(){
return this.appointmentList;
}
/**
* 设置 微预约（0.否，1.是）
* @param appointmentList
*/
public void setAppointmentList(List<Integer> appointmentList){
this.appointmentList = appointmentList;
}
/**
* 获取 微预约（0.否，1.是）
* @return appointmentNotList
*/
public List<Integer> getAppointmentNotList(){
return this.appointmentNotList;
}
/**
* 设置 微预约（0.否，1.是）
* @param appointmentNotList
*/
public void setAppointmentNotList(List<Integer> appointmentNotList){
this.appointmentNotList = appointmentNotList;
}
/**
* 获取 开始 政务地图（0.否，1.是）
* @return gowMapStart
*/
public Integer getGowMapStart(){
return this.gowMapStart;
}
/**
* 设置 开始 政务地图（0.否，1.是）
* @param gowMapStart
*/
public void setGowMapStart(Integer gowMapStart){
this.gowMapStart = gowMapStart;
}
/**
* 获取 结束 政务地图（0.否，1.是）
* @return $gowMapEnd
*/
public Integer getGowMapEnd(){
return this.gowMapEnd;
}
/**
* 设置 结束 政务地图（0.否，1.是）
* @param gowMapEnd
*/
public void setGowMapEnd(Integer gowMapEnd){
this.gowMapEnd = gowMapEnd;
}
/**
* 获取 增加 政务地图（0.否，1.是）
* @return gowMapIncrement
*/
public Integer getGowMapIncrement(){
return this.gowMapIncrement;
}
/**
* 设置 增加 政务地图（0.否，1.是）
* @param gowMapIncrement
*/
public void setGowMapIncrement(Integer gowMapIncrement){
this.gowMapIncrement = gowMapIncrement;
}
/**
* 获取 政务地图（0.否，1.是）
* @return gowMapList
*/
public List<Integer> getGowMapList(){
return this.gowMapList;
}
/**
* 设置 政务地图（0.否，1.是）
* @param gowMapList
*/
public void setGowMapList(List<Integer> gowMapList){
this.gowMapList = gowMapList;
}
/**
* 获取 政务地图（0.否，1.是）
* @return gowMapNotList
*/
public List<Integer> getGowMapNotList(){
return this.gowMapNotList;
}
/**
* 设置 政务地图（0.否，1.是）
* @param gowMapNotList
*/
public void setGowMapNotList(List<Integer> gowMapNotList){
this.gowMapNotList = gowMapNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -1487,6 +2222,15 @@ public class SiteQuery extends SiteEntity { ...@@ -1487,6 +2222,15 @@ public class SiteQuery extends SiteEntity {
return this; return this;
} }
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public SiteQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/** /**
* 设置 站点名称 * 设置 站点名称
...@@ -1527,77 +2271,58 @@ public class SiteQuery extends SiteEntity { ...@@ -1527,77 +2271,58 @@ public class SiteQuery extends SiteEntity {
/** /**
* 设置 区域Id * 设置 省编码
* @param areaID * @param proCode
*/
public SiteQuery areaID(String areaID){
setAreaID(areaID);
return this;
}
/**
* 设置 区域Id
* @param areaIDList
*/
public SiteQuery areaIDList(List<String> areaIDList){
this.areaIDList = areaIDList;
return this;
}
/**
* 设置 区域编号
* @param areaCode
*/ */
public SiteQuery areaCode(String areaCode){ public SiteQuery proCode(String proCode){
setAreaCode(areaCode); setProCode(proCode);
return this; return this;
} }
/** /**
* 设置 区域编号 * 设置 省编码
* @param areaCodeList * @param proCodeList
*/ */
public SiteQuery areaCodeList(List<String> areaCodeList){ public SiteQuery proCodeList(List<String> proCodeList){
this.areaCodeList = areaCodeList; this.proCodeList = proCodeList;
return this; return this;
} }
/** /**
* 设置 区域名称 * 设置 区域ID
* @param areaName * @param areaID
*/ */
public SiteQuery areaName(String areaName){ public SiteQuery areaID(String areaID){
setAreaName(areaName); setAreaID(areaID);
return this; return this;
} }
/** /**
* 设置 区域名称 * 设置 区域ID
* @param areaNameList * @param areaIDList
*/ */
public SiteQuery areaNameList(List<String> areaNameList){ public SiteQuery areaIDList(List<String> areaIDList){
this.areaNameList = areaNameList; this.areaIDList = areaIDList;
return this; return this;
} }
/** /**
* 设置 省编码 * 设置 区域编码
* @param proCode * @param areaCode
*/ */
public SiteQuery proCode(String proCode){ public SiteQuery areaCode(String areaCode){
setProCode(proCode); setAreaCode(areaCode);
return this; return this;
} }
/** /**
* 设置 省编码 * 设置 区域编码
* @param proCodeList * @param areaCodeList
*/ */
public SiteQuery proCodeList(List<String> proCodeList){ public SiteQuery areaCodeList(List<String> areaCodeList){
this.proCodeList = proCodeList; this.areaCodeList = areaCodeList;
return this; return this;
} }
...@@ -1773,8 +2498,80 @@ public class SiteQuery extends SiteEntity { ...@@ -1773,8 +2498,80 @@ public class SiteQuery extends SiteEntity {
} }
/**
* 设置 上午上班开始时间
* @param amWorkStartTime
*/
public SiteQuery amWorkStartTime(String amWorkStartTime){
setAmWorkStartTime(amWorkStartTime);
return this;
}
/**
* 设置 上午上班开始时间
* @param amWorkStartTimeList
*/
public SiteQuery amWorkStartTimeList(List<String> amWorkStartTimeList){
this.amWorkStartTimeList = amWorkStartTimeList;
return this;
}
/**
* 设置 上午上班结束时间
* @param amWorkEndTime
*/
public SiteQuery amWorkEndTime(String amWorkEndTime){
setAmWorkEndTime(amWorkEndTime);
return this;
}
/**
* 设置 上午上班结束时间
* @param amWorkEndTimeList
*/
public SiteQuery amWorkEndTimeList(List<String> amWorkEndTimeList){
this.amWorkEndTimeList = amWorkEndTimeList;
return this;
}
/**
* 设置 下午上班开始时间
* @param pmWorkStartTime
*/
public SiteQuery pmWorkStartTime(String pmWorkStartTime){
setPmWorkStartTime(pmWorkStartTime);
return this;
}
/**
* 设置 下午上班开始时间
* @param pmWorkStartTimeList
*/
public SiteQuery pmWorkStartTimeList(List<String> pmWorkStartTimeList){
this.pmWorkStartTimeList = pmWorkStartTimeList;
return this;
}
/**
* 设置 下午上班结束时间
* @param pmWorkEndTime
*/
public SiteQuery pmWorkEndTime(String pmWorkEndTime){
setPmWorkEndTime(pmWorkEndTime);
return this;
}
/**
* 设置 下午上班结束时间
* @param pmWorkEndTimeList
*/
public SiteQuery pmWorkEndTimeList(List<String> pmWorkEndTimeList){
this.pmWorkEndTimeList = pmWorkEndTimeList;
return this;
}
/** /**
* 设置 周一 (1.上班，0.不上) * 设置 周一 (1.上班，0.不上)
...@@ -1821,6 +2618,15 @@ public class SiteQuery extends SiteEntity { ...@@ -1821,6 +2618,15 @@ public class SiteQuery extends SiteEntity {
return this; return this;
} }
/**
* 设置 周一 (1.上班，0.不上)
* @param workday1NotList
*/
public SiteQuery workday1NotList(List<Integer> workday1NotList){
this.workday1NotList = workday1NotList;
return this;
}
/** /**
* 设置 周二 (1.上班，0.不上) * 设置 周二 (1.上班，0.不上)
* @param workday2 * @param workday2
...@@ -1866,6 +2672,15 @@ public class SiteQuery extends SiteEntity { ...@@ -1866,6 +2672,15 @@ public class SiteQuery extends SiteEntity {
return this; return this;
} }
/**
* 设置 周二 (1.上班，0.不上)
* @param workday2NotList
*/
public SiteQuery workday2NotList(List<Integer> workday2NotList){
this.workday2NotList = workday2NotList;
return this;
}
/** /**
* 设置 周三 (1.上班，0.不上) * 设置 周三 (1.上班，0.不上)
* @param workday3 * @param workday3
...@@ -1911,6 +2726,15 @@ public class SiteQuery extends SiteEntity { ...@@ -1911,6 +2726,15 @@ public class SiteQuery extends SiteEntity {
return this; return this;
} }
/**
* 设置 周三 (1.上班，0.不上)
* @param workday3NotList
*/
public SiteQuery workday3NotList(List<Integer> workday3NotList){
this.workday3NotList = workday3NotList;
return this;
}
/** /**
* 设置 周四 (1.上班，0.不上) * 设置 周四 (1.上班，0.不上)
* @param workday4 * @param workday4
...@@ -1956,6 +2780,15 @@ public class SiteQuery extends SiteEntity { ...@@ -1956,6 +2780,15 @@ public class SiteQuery extends SiteEntity {
return this; return this;
} }
/**
* 设置 周四 (1.上班，0.不上)
* @param workday4NotList
*/
public SiteQuery workday4NotList(List<Integer> workday4NotList){
this.workday4NotList = workday4NotList;
return this;
}
/** /**
* 设置 周五 (1.上班，0.不上) * 设置 周五 (1.上班，0.不上)
* @param workday5 * @param workday5
...@@ -2001,6 +2834,15 @@ public class SiteQuery extends SiteEntity { ...@@ -2001,6 +2834,15 @@ public class SiteQuery extends SiteEntity {
return this; return this;
} }
/**
* 设置 周五 (1.上班，0.不上)
* @param workday5NotList
*/
public SiteQuery workday5NotList(List<Integer> workday5NotList){
this.workday5NotList = workday5NotList;
return this;
}
/** /**
* 设置 周六 (1.上班，0.不上) * 设置 周六 (1.上班，0.不上)
* @param workday6 * @param workday6
...@@ -2046,6 +2888,15 @@ public class SiteQuery extends SiteEntity { ...@@ -2046,6 +2888,15 @@ public class SiteQuery extends SiteEntity {
return this; return this;
} }
/**
* 设置 周六 (1.上班，0.不上)
* @param workday6NotList
*/
public SiteQuery workday6NotList(List<Integer> workday6NotList){
this.workday6NotList = workday6NotList;
return this;
}
/** /**
* 设置 周日 (1.上班，0.不上) * 设置 周日 (1.上班，0.不上)
* @param workday7 * @param workday7
...@@ -2091,6 +2942,15 @@ public class SiteQuery extends SiteEntity { ...@@ -2091,6 +2942,15 @@ public class SiteQuery extends SiteEntity {
return this; return this;
} }
/**
* 设置 周日 (1.上班，0.不上)
* @param workday7NotList
*/
public SiteQuery workday7NotList(List<Integer> workday7NotList){
this.workday7NotList = workday7NotList;
return this;
}
/** /**
* 设置 楼层 * 设置 楼层
* @param level * @param level
...@@ -2136,6 +2996,15 @@ public class SiteQuery extends SiteEntity { ...@@ -2136,6 +2996,15 @@ public class SiteQuery extends SiteEntity {
return this; return this;
} }
/**
* 设置 楼层
* @param levelNotList
*/
public SiteQuery levelNotList(List<Integer> levelNotList){
this.levelNotList = levelNotList;
return this;
}
/** /**
* 设置 楼栋 * 设置 楼栋
* @param building * @param building
...@@ -2181,83 +3050,72 @@ public class SiteQuery extends SiteEntity { ...@@ -2181,83 +3050,72 @@ public class SiteQuery extends SiteEntity {
return this; return this;
} }
/**
* 设置 logo图片地址
* @param logoPath
*/
public SiteQuery logoPath(String logoPath){
setLogoPath(logoPath);
return this;
}
/** /**
* 设置 logo图片地址 * 设置 楼栋
* @param logoPathList * @param buildingNotList
*/ */
public SiteQuery logoPathList(List<String> logoPathList){ public SiteQuery buildingNotList(List<Integer> buildingNotList){
this.logoPathList = logoPathList; this.buildingNotList = buildingNotList;
return this; return this;
} }
/** /**
* 设置 英文名称 * 设置 创建用户
* @param englishName * @param createUserId
*/ */
public SiteQuery englishName(String englishName){ public SiteQuery createUserId(Long createUserId){
setEnglishName(englishName); setCreateUserId(createUserId);
return this; return this;
} }
/** /**
* 设置 英文名称 * 设置 开始 创建用户
* @param englishNameList * @param createUserIdStart
*/ */
public SiteQuery englishNameList(List<String> englishNameList){ public SiteQuery createUserIdStart(Long createUserIdStart){
this.englishNameList = englishNameList; this.createUserIdStart = createUserIdStart;
return this; return this;
} }
/** /**
* 设置 负责人 * 设置 结束 创建用户
* @param leadingOfficial * @param createUserIdEnd
*/ */
public SiteQuery leadingOfficial(String leadingOfficial){ public SiteQuery createUserIdEnd(Long createUserIdEnd){
setLeadingOfficial(leadingOfficial); this.createUserIdEnd = createUserIdEnd;
return this; return this;
} }
/** /**
* 设置 负责人 * 设置 增加 创建用户
* @param leadingOfficialList * @param createUserIdIncrement
*/ */
public SiteQuery leadingOfficialList(List<String> leadingOfficialList){ public SiteQuery createUserIdIncrement(Long createUserIdIncrement){
this.leadingOfficialList = leadingOfficialList; this.createUserIdIncrement = createUserIdIncrement;
return this; return this;
} }
/** /**
* 设置 联系电话 * 设置 创建用户
* @param leadingOfficialTelephone * @param createUserIdList
*/ */
public SiteQuery leadingOfficialTelephone(String leadingOfficialTelephone){ public SiteQuery createUserIdList(List<Long> createUserIdList){
setLeadingOfficialTelephone(leadingOfficialTelephone); this.createUserIdList = createUserIdList;
return this; return this;
} }
/** /**
* 设置 联系电话 * 设置 创建用户
* @param leadingOfficialTelephoneList * @param createUserIdNotList
*/ */
public SiteQuery leadingOfficialTelephoneList(List<String> leadingOfficialTelephoneList){ public SiteQuery createUserIdNotList(List<Long> createUserIdNotList){
this.leadingOfficialTelephoneList = leadingOfficialTelephoneList; this.createUserIdNotList = createUserIdNotList;
return this; return this;
} }
/** /**
* 设置 部署模块，逗号分隔 * 设置 部署模块，逗号分隔
* @param modelIds * @param modelIds
...@@ -2278,50 +3136,184 @@ public class SiteQuery extends SiteEntity { ...@@ -2278,50 +3136,184 @@ public class SiteQuery extends SiteEntity {
/** /**
* 设置 创建用户 * 设置 区域名称
* @param createUserId * @param areaName
*/ */
public SiteQuery createUserId(Long createUserId){ public SiteQuery areaName(String areaName){
setCreateUserId(createUserId); setAreaName(areaName);
return this; return this;
} }
/** /**
* 设置 开始 创建用户 * 设置 区域名称
* @param createUserIdStart * @param areaNameList
*/ */
public SiteQuery createUserIdStart(Long createUserIdStart){ public SiteQuery areaNameList(List<String> areaNameList){
this.createUserIdStart = createUserIdStart; this.areaNameList = areaNameList;
return this; return this;
} }
/** /**
* 设置 结束 创建用户 * 设置 在线取号（0.否，1.是）
* @param createUserIdEnd * @param onlineTake
*/ */
public SiteQuery createUserIdEnd(Long createUserIdEnd){ public SiteQuery onlineTake(Integer onlineTake){
this.createUserIdEnd = createUserIdEnd; setOnlineTake(onlineTake);
return this; return this;
} }
/** /**
* 设置 增加 创建用户 * 设置 开始 在线取号（0.否，1.是）
* @param createUserIdIncrement * @param onlineTakeStart
*/ */
public SiteQuery createUserIdIncrement(Long createUserIdIncrement){ public SiteQuery onlineTakeStart(Integer onlineTakeStart){
this.createUserIdIncrement = createUserIdIncrement; this.onlineTakeStart = onlineTakeStart;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 结束 在线取号（0.否，1.是）
* @param createUserIdList * @param onlineTakeEnd
*/ */
public SiteQuery createUserIdList(List<Long> createUserIdList){ public SiteQuery onlineTakeEnd(Integer onlineTakeEnd){
this.createUserIdList = createUserIdList; this.onlineTakeEnd = onlineTakeEnd;
return this;
}
/**
* 设置 增加 在线取号（0.否，1.是）
* @param onlineTakeIncrement
*/
public SiteQuery onlineTakeIncrement(Integer onlineTakeIncrement){
this.onlineTakeIncrement = onlineTakeIncrement;
return this;
}
/**
* 设置 在线取号（0.否，1.是）
* @param onlineTakeList
*/
public SiteQuery onlineTakeList(List<Integer> onlineTakeList){
this.onlineTakeList = onlineTakeList;
return this; return this;
} }
/**
* 设置 在线取号（0.否，1.是）
* @param onlineTakeNotList
*/
public SiteQuery onlineTakeNotList(List<Integer> onlineTakeNotList){
this.onlineTakeNotList = onlineTakeNotList;
return this;
}
/**
* 设置 微预约（0.否，1.是）
* @param appointment
*/
public SiteQuery appointment(Integer appointment){
setAppointment(appointment);
return this;
}
/**
* 设置 开始 微预约（0.否，1.是）
* @param appointmentStart
*/
public SiteQuery appointmentStart(Integer appointmentStart){
this.appointmentStart = appointmentStart;
return this;
}
/**
* 设置 结束 微预约（0.否，1.是）
* @param appointmentEnd
*/
public SiteQuery appointmentEnd(Integer appointmentEnd){
this.appointmentEnd = appointmentEnd;
return this;
}
/**
* 设置 增加 微预约（0.否，1.是）
* @param appointmentIncrement
*/
public SiteQuery appointmentIncrement(Integer appointmentIncrement){
this.appointmentIncrement = appointmentIncrement;
return this;
}
/**
* 设置 微预约（0.否，1.是）
* @param appointmentList
*/
public SiteQuery appointmentList(List<Integer> appointmentList){
this.appointmentList = appointmentList;
return this;
}
/**
* 设置 微预约（0.否，1.是）
* @param appointmentNotList
*/
public SiteQuery appointmentNotList(List<Integer> appointmentNotList){
this.appointmentNotList = appointmentNotList;
return this;
}
/**
* 设置 政务地图（0.否，1.是）
* @param gowMap
*/
public SiteQuery gowMap(Integer gowMap){
setGowMap(gowMap);
return this;
}
/**
* 设置 开始 政务地图（0.否，1.是）
* @param gowMapStart
*/
public SiteQuery gowMapStart(Integer gowMapStart){
this.gowMapStart = gowMapStart;
return this;
}
/**
* 设置 结束 政务地图（0.否，1.是）
* @param gowMapEnd
*/
public SiteQuery gowMapEnd(Integer gowMapEnd){
this.gowMapEnd = gowMapEnd;
return this;
}
/**
* 设置 增加 政务地图（0.否，1.是）
* @param gowMapIncrement
*/
public SiteQuery gowMapIncrement(Integer gowMapIncrement){
this.gowMapIncrement = gowMapIncrement;
return this;
}
/**
* 设置 政务地图（0.否，1.是）
* @param gowMapList
*/
public SiteQuery gowMapList(List<Integer> gowMapList){
this.gowMapList = gowMapList;
return this;
}
/**
* 设置 政务地图（0.否，1.是）
* @param gowMapNotList
*/
public SiteQuery gowMapNotList(List<Integer> gowMapNotList){
this.gowMapNotList = gowMapNotList;
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)
......
base-manager/src/main/resources/sqlmap/module/site/SiteMapper.xml
View file @ 3ff29522
...@@ -8,10 +8,9 @@ ...@@ -8,10 +8,9 @@
<id property="id" column="id" /> <id property="id" column="id" />
<result property="siteName" column="siteName" /> <result property="siteName" column="siteName" />
<result property="siteCode" column="siteCode" /> <result property="siteCode" column="siteCode" />
<result property="proCode" column="proCode" />
<result property="areaID" column="areaID" /> <result property="areaID" column="areaID" />
<result property="areaCode" column="areaCode" /> <result property="areaCode" column="areaCode" />
<result property="areaName" column="areaName" />
<result property="proCode" column="proCode" />
<result property="cityCode" column="cityCode" /> <result property="cityCode" column="cityCode" />
<result property="districtCode" column="districtCode" /> <result property="districtCode" column="districtCode" />
<result property="siteIp" column="siteIp" /> <result property="siteIp" column="siteIp" />
...@@ -34,14 +33,14 @@ ...@@ -34,14 +33,14 @@
<result property="workday7" column="workday7" /> <result property="workday7" column="workday7" />
<result property="level" column="level" /> <result property="level" column="level" />
<result property="building" column="building" /> <result property="building" column="building" />
<result property="logoPath" column="logoPath" />
<result property="englishName" column="englishName" />
<result property="leadingOfficial" column="leadingOfficial" />
<result property="leadingOfficialTelephone" column="leadingOfficialTelephone" />
<result property="modelIds" column="modelIds" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="modelIds" column="modelIds" />
<result property="areaName" column="areaName" />
<result property="onlineTake" column="onlineTake" />
<result property="appointment" column="appointment" />
<result property="gowMap" column="gowMap" />
</resultMap> </resultMap>
...@@ -58,18 +57,15 @@ ...@@ -58,18 +57,15 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteCode') or colPickMode == 1 and data.containsKey('siteCode')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteCode') or colPickMode == 1 and data.containsKey('siteCode')))">
a.siteCode, a.siteCode,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('proCode') or colPickMode == 1 and data.containsKey('proCode')))">
a.proCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('areaID') or colPickMode == 1 and data.containsKey('areaID')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('areaID') or colPickMode == 1 and data.containsKey('areaID')))">
a.areaID, a.areaID,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('areaCode') or colPickMode == 1 and data.containsKey('areaCode')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('areaCode') or colPickMode == 1 and data.containsKey('areaCode')))">
a.areaCode, a.areaCode,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('areaName') or colPickMode == 1 and data.containsKey('areaName')))">
a.areaName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('proCode') or colPickMode == 1 and data.containsKey('proCode')))">
a.proCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('cityCode') or colPickMode == 1 and data.containsKey('cityCode')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('cityCode') or colPickMode == 1 and data.containsKey('cityCode')))">
a.cityCode, a.cityCode,
</if> </if>
...@@ -136,21 +132,6 @@ ...@@ -136,21 +132,6 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('building') or colPickMode == 1 and data.containsKey('building')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('building') or colPickMode == 1 and data.containsKey('building')))">
a.building, a.building,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('logoPath') or colPickMode == 1 and data.containsKey('logoPath')))">
a.logoPath,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('englishName') or colPickMode == 1 and data.containsKey('englishName')))">
a.englishName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('leadingOfficial') or colPickMode == 1 and data.containsKey('leadingOfficial')))">
a.leadingOfficial,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('leadingOfficialTelephone') or colPickMode == 1 and data.containsKey('leadingOfficialTelephone')))">
a.leadingOfficialTelephone,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('modelIds') or colPickMode == 1 and data.containsKey('modelIds')))">
a.modelIds,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime, a.createTime,
</if> </if>
...@@ -160,23 +141,38 @@ ...@@ -160,23 +141,38 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('modelIds') or colPickMode == 1 and data.containsKey('modelIds')))">
a.modelIds,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('areaName') or colPickMode == 1 and data.containsKey('areaName')))">
a.areaName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('onlineTake') or colPickMode == 1 and data.containsKey('onlineTake')))">
a.onlineTake,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('appointment') or colPickMode == 1 and data.containsKey('appointment')))">
a.appointment,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('gowMap') or colPickMode == 1 and data.containsKey('gowMap')))">
a.gowMap,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="SiteEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="SiteEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_site insert into mortals_sys_site
(siteName,siteCode,areaID,areaCode,areaName,proCode,cityCode,districtCode,siteIp,sitePort,longitude,latitude,siteTel,detailAddress,siteRemark,amWorkStartTime,amWorkEndTime,pmWorkStartTime,pmWorkEndTime,workday1,workday2,workday3,workday4,workday5,workday6,workday7,level,building,logoPath,englishName,leadingOfficial,leadingOfficialTelephone,modelIds,createTime,createUserId,updateTime) (siteName,siteCode,proCode,areaID,areaCode,cityCode,districtCode,siteIp,sitePort,longitude,latitude,siteTel,detailAddress,siteRemark,amWorkStartTime,amWorkEndTime,pmWorkStartTime,pmWorkEndTime,workday1,workday2,workday3,workday4,workday5,workday6,workday7,level,building,createTime,createUserId,updateTime,modelIds,areaName,onlineTake,appointment,gowMap)
VALUES VALUES
(#{siteName},#{siteCode},#{areaID},#{areaCode},#{areaName},#{proCode},#{cityCode},#{districtCode},#{siteIp},#{sitePort},#{longitude},#{latitude},#{siteTel},#{detailAddress},#{siteRemark},#{amWorkStartTime},#{amWorkEndTime},#{pmWorkStartTime},#{pmWorkEndTime},#{workday1},#{workday2},#{workday3},#{workday4},#{workday5},#{workday6},#{workday7},#{level},#{building},#{logoPath},#{englishName},#{leadingOfficial},#{leadingOfficialTelephone},#{modelIds},#{createTime},#{createUserId},#{updateTime}) (#{siteName},#{siteCode},#{proCode},#{areaID},#{areaCode},#{cityCode},#{districtCode},#{siteIp},#{sitePort},#{longitude},#{latitude},#{siteTel},#{detailAddress},#{siteRemark},#{amWorkStartTime},#{amWorkEndTime},#{pmWorkStartTime},#{pmWorkEndTime},#{workday1},#{workday2},#{workday3},#{workday4},#{workday5},#{workday6},#{workday7},#{level},#{building},#{createTime},#{createUserId},#{updateTime},#{modelIds},#{areaName},#{onlineTake},#{appointment},#{gowMap})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_site insert into mortals_sys_site
(siteName,siteCode,areaID,areaCode,areaName,proCode,cityCode,districtCode,siteIp,sitePort,longitude,latitude,siteTel,detailAddress,siteRemark,amWorkStartTime,amWorkEndTime,pmWorkStartTime,pmWorkEndTime,workday1,workday2,workday3,workday4,workday5,workday6,workday7,level,building,logoPath,englishName,leadingOfficial,leadingOfficialTelephone,modelIds,createTime,createUserId,updateTime) (siteName,siteCode,proCode,areaID,areaCode,cityCode,districtCode,siteIp,sitePort,longitude,latitude,siteTel,detailAddress,siteRemark,amWorkStartTime,amWorkEndTime,pmWorkStartTime,pmWorkEndTime,workday1,workday2,workday3,workday4,workday5,workday6,workday7,level,building,createTime,createUserId,updateTime,modelIds,areaName,onlineTake,appointment,gowMap)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteName},#{item.siteCode},#{item.areaID},#{item.areaCode},#{item.areaName},#{item.proCode},#{item.cityCode},#{item.districtCode},#{item.siteIp},#{item.sitePort},#{item.longitude},#{item.latitude},#{item.siteTel},#{item.detailAddress},#{item.siteRemark},#{item.amWorkStartTime},#{item.amWorkEndTime},#{item.pmWorkStartTime},#{item.pmWorkEndTime},#{item.workday1},#{item.workday2},#{item.workday3},#{item.workday4},#{item.workday5},#{item.workday6},#{item.workday7},#{item.level},#{item.building},#{item.logoPath},#{item.englishName},#{item.leadingOfficial},#{item.leadingOfficialTelephone},#{item.modelIds},#{item.createTime},#{item.createUserId},#{item.updateTime}) (#{item.siteName},#{item.siteCode},#{item.proCode},#{item.areaID},#{item.areaCode},#{item.cityCode},#{item.districtCode},#{item.siteIp},#{item.sitePort},#{item.longitude},#{item.latitude},#{item.siteTel},#{item.detailAddress},#{item.siteRemark},#{item.amWorkStartTime},#{item.amWorkEndTime},#{item.pmWorkStartTime},#{item.pmWorkEndTime},#{item.workday1},#{item.workday2},#{item.workday3},#{item.workday4},#{item.workday5},#{item.workday6},#{item.workday7},#{item.level},#{item.building},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.modelIds},#{item.areaName},#{item.onlineTake},#{item.appointment},#{item.gowMap})
</foreach> </foreach>
</insert> </insert>
...@@ -192,18 +188,15 @@ ...@@ -192,18 +188,15 @@
<if test="(colPickMode==0 and data.containsKey('siteCode')) or (colPickMode==1 and !data.containsKey('siteCode'))"> <if test="(colPickMode==0 and data.containsKey('siteCode')) or (colPickMode==1 and !data.containsKey('siteCode'))">
a.siteCode=#{data.siteCode}, a.siteCode=#{data.siteCode},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('proCode')) or (colPickMode==1 and !data.containsKey('proCode'))">
a.proCode=#{data.proCode},
</if>
<if test="(colPickMode==0 and data.containsKey('areaID')) or (colPickMode==1 and !data.containsKey('areaID'))"> <if test="(colPickMode==0 and data.containsKey('areaID')) or (colPickMode==1 and !data.containsKey('areaID'))">
a.areaID=#{data.areaID}, a.areaID=#{data.areaID},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('areaCode')) or (colPickMode==1 and !data.containsKey('areaCode'))"> <if test="(colPickMode==0 and data.containsKey('areaCode')) or (colPickMode==1 and !data.containsKey('areaCode'))">
a.areaCode=#{data.areaCode}, a.areaCode=#{data.areaCode},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('areaName')) or (colPickMode==1 and !data.containsKey('areaName'))">
a.areaName=#{data.areaName},
</if>
<if test="(colPickMode==0 and data.containsKey('proCode')) or (colPickMode==1 and !data.containsKey('proCode'))">
a.proCode=#{data.proCode},
</if>
<if test="(colPickMode==0 and data.containsKey('cityCode')) or (colPickMode==1 and !data.containsKey('cityCode'))"> <if test="(colPickMode==0 and data.containsKey('cityCode')) or (colPickMode==1 and !data.containsKey('cityCode'))">
a.cityCode=#{data.cityCode}, a.cityCode=#{data.cityCode},
</if> </if>
...@@ -297,21 +290,6 @@ ...@@ -297,21 +290,6 @@
<if test="(colPickMode==0 and data.containsKey('buildingIncrement')) or (colPickMode==1 and !data.containsKey('buildingIncrement'))"> <if test="(colPickMode==0 and data.containsKey('buildingIncrement')) or (colPickMode==1 and !data.containsKey('buildingIncrement'))">
a.building=ifnull(a.building,0) + #{data.buildingIncrement}, a.building=ifnull(a.building,0) + #{data.buildingIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('logoPath')) or (colPickMode==1 and !data.containsKey('logoPath'))">
a.logoPath=#{data.logoPath},
</if>
<if test="(colPickMode==0 and data.containsKey('englishName')) or (colPickMode==1 and !data.containsKey('englishName'))">
a.englishName=#{data.englishName},
</if>
<if test="(colPickMode==0 and data.containsKey('leadingOfficial')) or (colPickMode==1 and !data.containsKey('leadingOfficial'))">
a.leadingOfficial=#{data.leadingOfficial},
</if>
<if test="(colPickMode==0 and data.containsKey('leadingOfficialTelephone')) or (colPickMode==1 and !data.containsKey('leadingOfficialTelephone'))">
a.leadingOfficialTelephone=#{data.leadingOfficialTelephone},
</if>
<if test="(colPickMode==0 and data.containsKey('modelIds')) or (colPickMode==1 and !data.containsKey('modelIds'))">
a.modelIds=#{data.modelIds},
</if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))"> <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime}, a.createTime=#{data.createTime},
</if> </if>
...@@ -324,6 +302,30 @@ ...@@ -324,6 +302,30 @@
<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('modelIds')) or (colPickMode==1 and !data.containsKey('modelIds'))">
a.modelIds=#{data.modelIds},
</if>
<if test="(colPickMode==0 and data.containsKey('areaName')) or (colPickMode==1 and !data.containsKey('areaName'))">
a.areaName=#{data.areaName},
</if>
<if test="(colPickMode==0 and data.containsKey('onlineTake')) or (colPickMode==1 and !data.containsKey('onlineTake'))">
a.onlineTake=#{data.onlineTake},
</if>
<if test="(colPickMode==0 and data.containsKey('onlineTakeIncrement')) or (colPickMode==1 and !data.containsKey('onlineTakeIncrement'))">
a.onlineTake=ifnull(a.onlineTake,0) + #{data.onlineTakeIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('appointment')) or (colPickMode==1 and !data.containsKey('appointment'))">
a.appointment=#{data.appointment},
</if>
<if test="(colPickMode==0 and data.containsKey('appointmentIncrement')) or (colPickMode==1 and !data.containsKey('appointmentIncrement'))">
a.appointment=ifnull(a.appointment,0) + #{data.appointmentIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('gowMap')) or (colPickMode==1 and !data.containsKey('gowMap'))">
a.gowMap=#{data.gowMap},
</if>
<if test="(colPickMode==0 and data.containsKey('gowMapIncrement')) or (colPickMode==1 and !data.containsKey('gowMapIncrement'))">
a.gowMap=ifnull(a.gowMap,0) + #{data.gowMapIncrement},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -350,6 +352,13 @@ ...@@ -350,6 +352,13 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="proCode=(case" suffix="ELSE proCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('proCode')) or (colPickMode==1 and !item.containsKey('proCode'))">
when a.id=#{item.id} then #{item.proCode}
</if>
</foreach>
</trim>
<trim prefix="areaID=(case" suffix="ELSE areaID end),"> <trim prefix="areaID=(case" suffix="ELSE areaID end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('areaID')) or (colPickMode==1 and !item.containsKey('areaID'))"> <if test="(colPickMode==0 and item.containsKey('areaID')) or (colPickMode==1 and !item.containsKey('areaID'))">
...@@ -364,20 +373,6 @@ ...@@ -364,20 +373,6 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="areaName=(case" suffix="ELSE areaName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('areaName')) or (colPickMode==1 and !item.containsKey('areaName'))">
when a.id=#{item.id} then #{item.areaName}
</if>
</foreach>
</trim>
<trim prefix="proCode=(case" suffix="ELSE proCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('proCode')) or (colPickMode==1 and !item.containsKey('proCode'))">
when a.id=#{item.id} then #{item.proCode}
</if>
</foreach>
</trim>
<trim prefix="cityCode=(case" suffix="ELSE cityCode end),"> <trim prefix="cityCode=(case" suffix="ELSE cityCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('cityCode')) or (colPickMode==1 and !item.containsKey('cityCode'))"> <if test="(colPickMode==0 and item.containsKey('cityCode')) or (colPickMode==1 and !item.containsKey('cityCode'))">
...@@ -577,31 +572,29 @@ ...@@ -577,31 +572,29 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="logoPath=(case" suffix="ELSE logoPath end),"> <trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('logoPath')) or (colPickMode==1 and !item.containsKey('logoPath'))">
when a.id=#{item.id} then #{item.logoPath}
</if>
</foreach>
</trim>
<trim prefix="englishName=(case" suffix="ELSE englishName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('englishName')) or (colPickMode==1 and !item.containsKey('englishName'))"> <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
when a.id=#{item.id} then #{item.englishName} when a.id=#{item.id} then #{item.createTime}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="leadingOfficial=(case" suffix="ELSE leadingOfficial end),"> <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('leadingOfficial')) or (colPickMode==1 and !item.containsKey('leadingOfficial'))"> <choose>
when a.id=#{item.id} then #{item.leadingOfficial} <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
</if> when a.id=#{item.id} then #{item.createUserId}
</when>
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
</when>
</choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="leadingOfficialTelephone=(case" suffix="ELSE leadingOfficialTelephone end),"> <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('leadingOfficialTelephone')) or (colPickMode==1 and !item.containsKey('leadingOfficialTelephone'))"> <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
when a.id=#{item.id} then #{item.leadingOfficialTelephone} when a.id=#{item.id} then #{item.updateTime}
</if> </if>
</foreach> </foreach>
</trim> </trim>
...@@ -612,30 +605,47 @@ ...@@ -612,30 +605,47 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),"> <trim prefix="areaName=(case" suffix="ELSE areaName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))"> <if test="(colPickMode==0 and item.containsKey('areaName')) or (colPickMode==1 and !item.containsKey('areaName'))">
when a.id=#{item.id} then #{item.createTime} when a.id=#{item.id} then #{item.areaName}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),"> <trim prefix="onlineTake=(case" suffix="ELSE onlineTake end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))"> <when test="(colPickMode==0 and item.containsKey('onlineTake')) or (colPickMode==1 and !item.containsKey('onlineTake'))">
when a.id=#{item.id} then #{item.createUserId} when a.id=#{item.id} then #{item.onlineTake}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))"> <when test="(colPickMode==0 and item.containsKey('onlineTakeIncrement')) or (colPickMode==1 and !item.containsKey('onlineTakeIncrement'))">
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement} when a.id=#{item.id} then ifnull(a.onlineTake,0) + #{item.onlineTakeIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),"> <trim prefix="appointment=(case" suffix="ELSE appointment end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))"> <choose>
when a.id=#{item.id} then #{item.updateTime} <when test="(colPickMode==0 and item.containsKey('appointment')) or (colPickMode==1 and !item.containsKey('appointment'))">
</if> when a.id=#{item.id} then #{item.appointment}
</when>
<when test="(colPickMode==0 and item.containsKey('appointmentIncrement')) or (colPickMode==1 and !item.containsKey('appointmentIncrement'))">
when a.id=#{item.id} then ifnull(a.appointment,0) + #{item.appointmentIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="gowMap=(case" suffix="ELSE gowMap end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('gowMap')) or (colPickMode==1 and !item.containsKey('gowMap'))">
when a.id=#{item.id} then #{item.gowMap}
</when>
<when test="(colPickMode==0 and item.containsKey('gowMapIncrement')) or (colPickMode==1 and !item.containsKey('gowMapIncrement'))">
when a.id=#{item.id} then ifnull(a.gowMap,0) + #{item.gowMapIncrement}
</when>
</choose>
</foreach> </foreach>
</trim> </trim>
</trim> </trim>
...@@ -661,6 +671,21 @@ ...@@ -661,6 +671,21 @@
#{item} #{item}
</foreach> </foreach>
</delete> </delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_sys_site where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_sys_site 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_sys_site as a delete a.* from mortals_sys_site as a
...@@ -747,12 +772,18 @@ ...@@ -747,12 +772,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>
...@@ -769,12 +800,18 @@ ...@@ -769,12 +800,18 @@
${_conditionType_} a.siteName is null ${_conditionType_} a.siteName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('siteNameList')"> <if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
${_conditionType_} a.siteName in ${_conditionType_} a.siteName in
<foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('siteNameNotList') and conditionParamRef.siteNameNotList.size() > 0">
${_conditionType_} a.siteName not in
<foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteCode')"> <if test="conditionParamRef.containsKey('siteCode')">
<if test="conditionParamRef.siteCode != null and conditionParamRef.siteCode != ''"> <if test="conditionParamRef.siteCode != null and conditionParamRef.siteCode != ''">
...@@ -784,12 +821,39 @@ ...@@ -784,12 +821,39 @@
${_conditionType_} a.siteCode is null ${_conditionType_} a.siteCode is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('siteCodeList')"> <if test="conditionParamRef.containsKey('siteCodeList') and conditionParamRef.siteCodeList.size() > 0">
${_conditionType_} a.siteCode in ${_conditionType_} a.siteCode in
<foreach collection="conditionParamRef.siteCodeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.siteCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('siteCodeNotList') and conditionParamRef.siteCodeNotList.size() > 0">
${_conditionType_} a.siteCode not in
<foreach collection="conditionParamRef.siteCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('proCode')">
<if test="conditionParamRef.proCode != null and conditionParamRef.proCode != ''">
${_conditionType_} a.proCode like #{${_conditionParam_}.proCode}
</if>
<if test="conditionParamRef.proCode == null">
${_conditionType_} a.proCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('proCodeList') and conditionParamRef.proCodeList.size() > 0">
${_conditionType_} a.proCode in
<foreach collection="conditionParamRef.proCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('proCodeNotList') and conditionParamRef.proCodeNotList.size() > 0">
${_conditionType_} a.proCode not in
<foreach collection="conditionParamRef.proCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('areaID')"> <if test="conditionParamRef.containsKey('areaID')">
<if test="conditionParamRef.areaID != null and conditionParamRef.areaID != ''"> <if test="conditionParamRef.areaID != null and conditionParamRef.areaID != ''">
...@@ -799,12 +863,18 @@ ...@@ -799,12 +863,18 @@
${_conditionType_} a.areaID is null ${_conditionType_} a.areaID is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('areaIDList')"> <if test="conditionParamRef.containsKey('areaIDList') and conditionParamRef.areaIDList.size() > 0">
${_conditionType_} a.areaID in ${_conditionType_} a.areaID in
<foreach collection="conditionParamRef.areaIDList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.areaIDList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('areaIDNotList') and conditionParamRef.areaIDNotList.size() > 0">
${_conditionType_} a.areaID not in
<foreach collection="conditionParamRef.areaIDNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('areaCode')"> <if test="conditionParamRef.containsKey('areaCode')">
<if test="conditionParamRef.areaCode != null and conditionParamRef.areaCode != ''"> <if test="conditionParamRef.areaCode != null and conditionParamRef.areaCode != ''">
...@@ -814,39 +884,15 @@ ...@@ -814,39 +884,15 @@
${_conditionType_} a.areaCode is null ${_conditionType_} a.areaCode is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('areaCodeList')"> <if test="conditionParamRef.containsKey('areaCodeList') and conditionParamRef.areaCodeList.size() > 0">
${_conditionType_} a.areaCode in ${_conditionType_} a.areaCode in
<foreach collection="conditionParamRef.areaCodeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.areaCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('areaCodeNotList') and conditionParamRef.areaCodeNotList.size() > 0">
<if test="conditionParamRef.containsKey('areaName')"> ${_conditionType_} a.areaCode not in
<if test="conditionParamRef.areaName != null and conditionParamRef.areaName != ''"> <foreach collection="conditionParamRef.areaCodeNotList" open="(" close=")" index="index" item="item" separator=",">
${_conditionType_} a.areaName like #{${_conditionParam_}.areaName}
</if>
<if test="conditionParamRef.areaName == null">
${_conditionType_} a.areaName is null
</if>
</if>
<if test="conditionParamRef.containsKey('areaNameList')">
${_conditionType_} a.areaName in
<foreach collection="conditionParamRef.areaNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('proCode')">
<if test="conditionParamRef.proCode != null and conditionParamRef.proCode != ''">
${_conditionType_} a.proCode like #{${_conditionParam_}.proCode}
</if>
<if test="conditionParamRef.proCode == null">
${_conditionType_} a.proCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('proCodeList')">
${_conditionType_} a.proCode in
<foreach collection="conditionParamRef.proCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
...@@ -859,12 +905,18 @@ ...@@ -859,12 +905,18 @@
${_conditionType_} a.cityCode is null ${_conditionType_} a.cityCode is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('cityCodeList')"> <if test="conditionParamRef.containsKey('cityCodeList') and conditionParamRef.cityCodeList.size() > 0">
${_conditionType_} a.cityCode in ${_conditionType_} a.cityCode in
<foreach collection="conditionParamRef.cityCodeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.cityCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('cityCodeNotList') and conditionParamRef.cityCodeNotList.size() > 0">
${_conditionType_} a.cityCode not in
<foreach collection="conditionParamRef.cityCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('districtCode')"> <if test="conditionParamRef.containsKey('districtCode')">
<if test="conditionParamRef.districtCode != null and conditionParamRef.districtCode != ''"> <if test="conditionParamRef.districtCode != null and conditionParamRef.districtCode != ''">
...@@ -874,12 +926,18 @@ ...@@ -874,12 +926,18 @@
${_conditionType_} a.districtCode is null ${_conditionType_} a.districtCode is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('districtCodeList')"> <if test="conditionParamRef.containsKey('districtCodeList') and conditionParamRef.districtCodeList.size() > 0">
${_conditionType_} a.districtCode in ${_conditionType_} a.districtCode in
<foreach collection="conditionParamRef.districtCodeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.districtCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('districtCodeNotList') and conditionParamRef.districtCodeNotList.size() > 0">
${_conditionType_} a.districtCode not in
<foreach collection="conditionParamRef.districtCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIp')"> <if test="conditionParamRef.containsKey('siteIp')">
<if test="conditionParamRef.siteIp != null and conditionParamRef.siteIp != ''"> <if test="conditionParamRef.siteIp != null and conditionParamRef.siteIp != ''">
...@@ -889,12 +947,18 @@ ...@@ -889,12 +947,18 @@
${_conditionType_} a.siteIp is null ${_conditionType_} a.siteIp is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('siteIpList')"> <if test="conditionParamRef.containsKey('siteIpList') and conditionParamRef.siteIpList.size() > 0">
${_conditionType_} a.siteIp in ${_conditionType_} a.siteIp in
<foreach collection="conditionParamRef.siteIpList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.siteIpList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('siteIpNotList') and conditionParamRef.siteIpNotList.size() > 0">
${_conditionType_} a.siteIp not in
<foreach collection="conditionParamRef.siteIpNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sitePort')"> <if test="conditionParamRef.containsKey('sitePort')">
<if test="conditionParamRef.sitePort != null and conditionParamRef.sitePort != ''"> <if test="conditionParamRef.sitePort != null and conditionParamRef.sitePort != ''">
...@@ -904,12 +968,18 @@ ...@@ -904,12 +968,18 @@
${_conditionType_} a.sitePort is null ${_conditionType_} a.sitePort is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('sitePortList')"> <if test="conditionParamRef.containsKey('sitePortList') and conditionParamRef.sitePortList.size() > 0">
${_conditionType_} a.sitePort in ${_conditionType_} a.sitePort in
<foreach collection="conditionParamRef.sitePortList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.sitePortList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('sitePortNotList') and conditionParamRef.sitePortNotList.size() > 0">
${_conditionType_} a.sitePort not in
<foreach collection="conditionParamRef.sitePortNotList" 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 != ''">
...@@ -919,12 +989,18 @@ ...@@ -919,12 +989,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 != ''">
...@@ -934,12 +1010,18 @@ ...@@ -934,12 +1010,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('siteTel')"> <if test="conditionParamRef.containsKey('siteTel')">
<if test="conditionParamRef.siteTel != null and conditionParamRef.siteTel != ''"> <if test="conditionParamRef.siteTel != null and conditionParamRef.siteTel != ''">
...@@ -949,12 +1031,18 @@ ...@@ -949,12 +1031,18 @@
${_conditionType_} a.siteTel is null ${_conditionType_} a.siteTel is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('siteTelList')"> <if test="conditionParamRef.containsKey('siteTelList') and conditionParamRef.siteTelList.size() > 0">
${_conditionType_} a.siteTel in ${_conditionType_} a.siteTel in
<foreach collection="conditionParamRef.siteTelList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.siteTelList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('siteTelNotList') and conditionParamRef.siteTelNotList.size() > 0">
${_conditionType_} a.siteTel not in
<foreach collection="conditionParamRef.siteTelNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('detailAddress')"> <if test="conditionParamRef.containsKey('detailAddress')">
<if test="conditionParamRef.detailAddress != null and conditionParamRef.detailAddress != ''"> <if test="conditionParamRef.detailAddress != null and conditionParamRef.detailAddress != ''">
...@@ -964,12 +1052,18 @@ ...@@ -964,12 +1052,18 @@
${_conditionType_} a.detailAddress is null ${_conditionType_} a.detailAddress is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('detailAddressList')"> <if test="conditionParamRef.containsKey('detailAddressList') and conditionParamRef.detailAddressList.size() > 0">
${_conditionType_} a.detailAddress in ${_conditionType_} a.detailAddress in
<foreach collection="conditionParamRef.detailAddressList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.detailAddressList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('detailAddressNotList') and conditionParamRef.detailAddressNotList.size() > 0">
${_conditionType_} a.detailAddress not in
<foreach collection="conditionParamRef.detailAddressNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteRemark')"> <if test="conditionParamRef.containsKey('siteRemark')">
<if test="conditionParamRef.siteRemark != null and conditionParamRef.siteRemark != ''"> <if test="conditionParamRef.siteRemark != null and conditionParamRef.siteRemark != ''">
...@@ -979,71 +1073,101 @@ ...@@ -979,71 +1073,101 @@
${_conditionType_} a.siteRemark is null ${_conditionType_} a.siteRemark is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('siteRemarkList')"> <if test="conditionParamRef.containsKey('siteRemarkList') and conditionParamRef.siteRemarkList.size() > 0">
${_conditionType_} a.siteRemark in ${_conditionType_} a.siteRemark in
<foreach collection="conditionParamRef.siteRemarkList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.siteRemarkList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('siteRemarkNotList') and conditionParamRef.siteRemarkNotList.size() > 0">
${_conditionType_} a.siteRemark not in
<foreach collection="conditionParamRef.siteRemarkNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('amWorkStartTime')"> <if test="conditionParamRef.containsKey('amWorkStartTime')">
<if test="conditionParamRef.amWorkStartTime != null "> <if test="conditionParamRef.amWorkStartTime != null and conditionParamRef.amWorkStartTime != ''">
${_conditionType_} a.amWorkStartTime = #{${_conditionParam_}.amWorkStartTime} ${_conditionType_} a.amWorkStartTime like #{${_conditionParam_}.amWorkStartTime}
</if> </if>
<if test="conditionParamRef.amWorkStartTime == null"> <if test="conditionParamRef.amWorkStartTime == null">
${_conditionType_} a.amWorkStartTime is null ${_conditionType_} a.amWorkStartTime is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('amWorkStartTimeStart') and conditionParamRef.amWorkStartTimeStart != null and conditionParamRef.amWorkStartTimeStart!=''"> <if test="conditionParamRef.containsKey('amWorkStartTimeList') and conditionParamRef.amWorkStartTimeList.size() > 0">
${_conditionType_} a.amWorkStartTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.amWorkStartTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.amWorkStartTime in
<foreach collection="conditionParamRef.amWorkStartTimeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('amWorkStartTimeEnd') and conditionParamRef.amWorkStartTimeEnd != null and conditionParamRef.amWorkStartTimeEnd!=''"> <if test="conditionParamRef.containsKey('amWorkStartTimeNotList') and conditionParamRef.amWorkStartTimeNotList.size() > 0">
${_conditionType_} a.amWorkStartTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.amWorkStartTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.amWorkStartTime not in
<foreach collection="conditionParamRef.amWorkStartTimeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('amWorkEndTime')"> <if test="conditionParamRef.containsKey('amWorkEndTime')">
<if test="conditionParamRef.amWorkEndTime != null "> <if test="conditionParamRef.amWorkEndTime != null and conditionParamRef.amWorkEndTime != ''">
${_conditionType_} a.amWorkEndTime = #{${_conditionParam_}.amWorkEndTime} ${_conditionType_} a.amWorkEndTime like #{${_conditionParam_}.amWorkEndTime}
</if> </if>
<if test="conditionParamRef.amWorkEndTime == null"> <if test="conditionParamRef.amWorkEndTime == null">
${_conditionType_} a.amWorkEndTime is null ${_conditionType_} a.amWorkEndTime is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('amWorkEndTimeStart') and conditionParamRef.amWorkEndTimeStart != null and conditionParamRef.amWorkEndTimeStart!=''"> <if test="conditionParamRef.containsKey('amWorkEndTimeList') and conditionParamRef.amWorkEndTimeList.size() > 0">
${_conditionType_} a.amWorkEndTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.amWorkEndTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.amWorkEndTime in
<foreach collection="conditionParamRef.amWorkEndTimeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('amWorkEndTimeEnd') and conditionParamRef.amWorkEndTimeEnd != null and conditionParamRef.amWorkEndTimeEnd!=''"> <if test="conditionParamRef.containsKey('amWorkEndTimeNotList') and conditionParamRef.amWorkEndTimeNotList.size() > 0">
${_conditionType_} a.amWorkEndTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.amWorkEndTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.amWorkEndTime not in
<foreach collection="conditionParamRef.amWorkEndTimeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('pmWorkStartTime')"> <if test="conditionParamRef.containsKey('pmWorkStartTime')">
<if test="conditionParamRef.pmWorkStartTime != null "> <if test="conditionParamRef.pmWorkStartTime != null and conditionParamRef.pmWorkStartTime != ''">
${_conditionType_} a.pmWorkStartTime = #{${_conditionParam_}.pmWorkStartTime} ${_conditionType_} a.pmWorkStartTime like #{${_conditionParam_}.pmWorkStartTime}
</if> </if>
<if test="conditionParamRef.pmWorkStartTime == null"> <if test="conditionParamRef.pmWorkStartTime == null">
${_conditionType_} a.pmWorkStartTime is null ${_conditionType_} a.pmWorkStartTime is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('pmWorkStartTimeStart') and conditionParamRef.pmWorkStartTimeStart != null and conditionParamRef.pmWorkStartTimeStart!=''"> <if test="conditionParamRef.containsKey('pmWorkStartTimeList') and conditionParamRef.pmWorkStartTimeList.size() > 0">
${_conditionType_} a.pmWorkStartTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.pmWorkStartTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.pmWorkStartTime in
<foreach collection="conditionParamRef.pmWorkStartTimeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('pmWorkStartTimeEnd') and conditionParamRef.pmWorkStartTimeEnd != null and conditionParamRef.pmWorkStartTimeEnd!=''"> <if test="conditionParamRef.containsKey('pmWorkStartTimeNotList') and conditionParamRef.pmWorkStartTimeNotList.size() > 0">
${_conditionType_} a.pmWorkStartTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.pmWorkStartTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.pmWorkStartTime not in
<foreach collection="conditionParamRef.pmWorkStartTimeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('pmWorkEndTime')"> <if test="conditionParamRef.containsKey('pmWorkEndTime')">
<if test="conditionParamRef.pmWorkEndTime != null "> <if test="conditionParamRef.pmWorkEndTime != null and conditionParamRef.pmWorkEndTime != ''">
${_conditionType_} a.pmWorkEndTime = #{${_conditionParam_}.pmWorkEndTime} ${_conditionType_} a.pmWorkEndTime like #{${_conditionParam_}.pmWorkEndTime}
</if> </if>
<if test="conditionParamRef.pmWorkEndTime == null"> <if test="conditionParamRef.pmWorkEndTime == null">
${_conditionType_} a.pmWorkEndTime is null ${_conditionType_} a.pmWorkEndTime is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('pmWorkEndTimeStart') and conditionParamRef.pmWorkEndTimeStart != null and conditionParamRef.pmWorkEndTimeStart!=''"> <if test="conditionParamRef.containsKey('pmWorkEndTimeList') and conditionParamRef.pmWorkEndTimeList.size() > 0">
${_conditionType_} a.pmWorkEndTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.pmWorkEndTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.pmWorkEndTime in
<foreach collection="conditionParamRef.pmWorkEndTimeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('pmWorkEndTimeEnd') and conditionParamRef.pmWorkEndTimeEnd != null and conditionParamRef.pmWorkEndTimeEnd!=''"> <if test="conditionParamRef.containsKey('pmWorkEndTimeNotList') and conditionParamRef.pmWorkEndTimeNotList.size() > 0">
${_conditionType_} a.pmWorkEndTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.pmWorkEndTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.pmWorkEndTime not in
<foreach collection="conditionParamRef.pmWorkEndTimeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('workday1')"> <if test="conditionParamRef.containsKey('workday1')">
<if test="conditionParamRef.workday1 != null "> <if test="conditionParamRef.workday1 != null ">
...@@ -1053,12 +1177,18 @@ ...@@ -1053,12 +1177,18 @@
${_conditionType_} a.workday1 is null ${_conditionType_} a.workday1 is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('workday1List')"> <if test="conditionParamRef.containsKey('workday1List') and conditionParamRef.workday1List.size() > 0">
${_conditionType_} a.workday1 in ${_conditionType_} a.workday1 in
<foreach collection="conditionParamRef.workday1List" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.workday1List" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('workday1NotList') and conditionParamRef.workday1NotList.size() > 0">
${_conditionType_} a.workday1 not in
<foreach collection="conditionParamRef.workday1NotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('workday1Start') and conditionParamRef.workday1Start != null"> <if test="conditionParamRef.containsKey('workday1Start') and conditionParamRef.workday1Start != null">
${_conditionType_} a.workday1 <![CDATA[ >= ]]> #{${_conditionParam_}.workday1Start} ${_conditionType_} a.workday1 <![CDATA[ >= ]]> #{${_conditionParam_}.workday1Start}
</if> </if>
...@@ -1074,12 +1204,18 @@ ...@@ -1074,12 +1204,18 @@
${_conditionType_} a.workday2 is null ${_conditionType_} a.workday2 is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('workday2List')"> <if test="conditionParamRef.containsKey('workday2List') and conditionParamRef.workday2List.size() > 0">
${_conditionType_} a.workday2 in ${_conditionType_} a.workday2 in
<foreach collection="conditionParamRef.workday2List" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.workday2List" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('workday2NotList') and conditionParamRef.workday2NotList.size() > 0">
${_conditionType_} a.workday2 not in
<foreach collection="conditionParamRef.workday2NotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('workday2Start') and conditionParamRef.workday2Start != null"> <if test="conditionParamRef.containsKey('workday2Start') and conditionParamRef.workday2Start != null">
${_conditionType_} a.workday2 <![CDATA[ >= ]]> #{${_conditionParam_}.workday2Start} ${_conditionType_} a.workday2 <![CDATA[ >= ]]> #{${_conditionParam_}.workday2Start}
</if> </if>
...@@ -1095,12 +1231,18 @@ ...@@ -1095,12 +1231,18 @@
${_conditionType_} a.workday3 is null ${_conditionType_} a.workday3 is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('workday3List')"> <if test="conditionParamRef.containsKey('workday3List') and conditionParamRef.workday3List.size() > 0">
${_conditionType_} a.workday3 in ${_conditionType_} a.workday3 in
<foreach collection="conditionParamRef.workday3List" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.workday3List" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('workday3NotList') and conditionParamRef.workday3NotList.size() > 0">
${_conditionType_} a.workday3 not in
<foreach collection="conditionParamRef.workday3NotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('workday3Start') and conditionParamRef.workday3Start != null"> <if test="conditionParamRef.containsKey('workday3Start') and conditionParamRef.workday3Start != null">
${_conditionType_} a.workday3 <![CDATA[ >= ]]> #{${_conditionParam_}.workday3Start} ${_conditionType_} a.workday3 <![CDATA[ >= ]]> #{${_conditionParam_}.workday3Start}
</if> </if>
...@@ -1116,12 +1258,18 @@ ...@@ -1116,12 +1258,18 @@
${_conditionType_} a.workday4 is null ${_conditionType_} a.workday4 is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('workday4List')"> <if test="conditionParamRef.containsKey('workday4List') and conditionParamRef.workday4List.size() > 0">
${_conditionType_} a.workday4 in ${_conditionType_} a.workday4 in
<foreach collection="conditionParamRef.workday4List" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.workday4List" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('workday4NotList') and conditionParamRef.workday4NotList.size() > 0">
${_conditionType_} a.workday4 not in
<foreach collection="conditionParamRef.workday4NotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('workday4Start') and conditionParamRef.workday4Start != null"> <if test="conditionParamRef.containsKey('workday4Start') and conditionParamRef.workday4Start != null">
${_conditionType_} a.workday4 <![CDATA[ >= ]]> #{${_conditionParam_}.workday4Start} ${_conditionType_} a.workday4 <![CDATA[ >= ]]> #{${_conditionParam_}.workday4Start}
</if> </if>
...@@ -1137,12 +1285,18 @@ ...@@ -1137,12 +1285,18 @@
${_conditionType_} a.workday5 is null ${_conditionType_} a.workday5 is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('workday5List')"> <if test="conditionParamRef.containsKey('workday5List') and conditionParamRef.workday5List.size() > 0">
${_conditionType_} a.workday5 in ${_conditionType_} a.workday5 in
<foreach collection="conditionParamRef.workday5List" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.workday5List" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('workday5NotList') and conditionParamRef.workday5NotList.size() > 0">
${_conditionType_} a.workday5 not in
<foreach collection="conditionParamRef.workday5NotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('workday5Start') and conditionParamRef.workday5Start != null"> <if test="conditionParamRef.containsKey('workday5Start') and conditionParamRef.workday5Start != null">
${_conditionType_} a.workday5 <![CDATA[ >= ]]> #{${_conditionParam_}.workday5Start} ${_conditionType_} a.workday5 <![CDATA[ >= ]]> #{${_conditionParam_}.workday5Start}
</if> </if>
...@@ -1158,12 +1312,18 @@ ...@@ -1158,12 +1312,18 @@
${_conditionType_} a.workday6 is null ${_conditionType_} a.workday6 is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('workday6List')"> <if test="conditionParamRef.containsKey('workday6List') and conditionParamRef.workday6List.size() > 0">
${_conditionType_} a.workday6 in ${_conditionType_} a.workday6 in
<foreach collection="conditionParamRef.workday6List" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.workday6List" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('workday6NotList') and conditionParamRef.workday6NotList.size() > 0">
${_conditionType_} a.workday6 not in
<foreach collection="conditionParamRef.workday6NotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('workday6Start') and conditionParamRef.workday6Start != null"> <if test="conditionParamRef.containsKey('workday6Start') and conditionParamRef.workday6Start != null">
${_conditionType_} a.workday6 <![CDATA[ >= ]]> #{${_conditionParam_}.workday6Start} ${_conditionType_} a.workday6 <![CDATA[ >= ]]> #{${_conditionParam_}.workday6Start}
</if> </if>
...@@ -1179,12 +1339,18 @@ ...@@ -1179,12 +1339,18 @@
${_conditionType_} a.workday7 is null ${_conditionType_} a.workday7 is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('workday7List')"> <if test="conditionParamRef.containsKey('workday7List') and conditionParamRef.workday7List.size() > 0">
${_conditionType_} a.workday7 in ${_conditionType_} a.workday7 in
<foreach collection="conditionParamRef.workday7List" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.workday7List" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('workday7NotList') and conditionParamRef.workday7NotList.size() > 0">
${_conditionType_} a.workday7 not in
<foreach collection="conditionParamRef.workday7NotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('workday7Start') and conditionParamRef.workday7Start != null"> <if test="conditionParamRef.containsKey('workday7Start') and conditionParamRef.workday7Start != null">
${_conditionType_} a.workday7 <![CDATA[ >= ]]> #{${_conditionParam_}.workday7Start} ${_conditionType_} a.workday7 <![CDATA[ >= ]]> #{${_conditionParam_}.workday7Start}
</if> </if>
...@@ -1200,12 +1366,18 @@ ...@@ -1200,12 +1366,18 @@
${_conditionType_} a.level is null ${_conditionType_} a.level is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('levelList')"> <if test="conditionParamRef.containsKey('levelList') and conditionParamRef.levelList.size() > 0">
${_conditionType_} a.level in ${_conditionType_} a.level in
<foreach collection="conditionParamRef.levelList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.levelList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('levelNotList') and conditionParamRef.levelNotList.size() > 0">
${_conditionType_} a.level not in
<foreach collection="conditionParamRef.levelNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('levelStart') and conditionParamRef.levelStart != null"> <if test="conditionParamRef.containsKey('levelStart') and conditionParamRef.levelStart != null">
${_conditionType_} a.level <![CDATA[ >= ]]> #{${_conditionParam_}.levelStart} ${_conditionType_} a.level <![CDATA[ >= ]]> #{${_conditionParam_}.levelStart}
</if> </if>
...@@ -1221,12 +1393,18 @@ ...@@ -1221,12 +1393,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>
...@@ -1235,64 +1413,61 @@ ...@@ -1235,64 +1413,61 @@
</if> </if>
<if test="conditionParamRef.containsKey('logoPath')"> <if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.logoPath != null and conditionParamRef.logoPath != ''"> <if test="conditionParamRef.createTime != null ">
${_conditionType_} a.logoPath like #{${_conditionParam_}.logoPath} ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</if> </if>
<if test="conditionParamRef.logoPath == null"> <if test="conditionParamRef.createTime == null">
${_conditionType_} a.logoPath is null ${_conditionType_} a.createTime is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('logoPathList')"> <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.logoPath in ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
<foreach collection="conditionParamRef.logoPathList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
<if test="conditionParamRef.containsKey('englishName')"> ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
<if test="conditionParamRef.englishName != null and conditionParamRef.englishName != ''"> </if>
${_conditionType_} a.englishName like #{${_conditionParam_}.englishName} <if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if> </if>
<if test="conditionParamRef.englishName == null"> <if test="conditionParamRef.createUserId == null">
${_conditionType_} a.englishName is null ${_conditionType_} a.createUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('englishNameList')"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.englishName in ${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.englishNameList" 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">
<if test="conditionParamRef.containsKey('leadingOfficial')"> ${_conditionType_} a.createUserId not in
<if test="conditionParamRef.leadingOfficial != null and conditionParamRef.leadingOfficial != ''"> <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
${_conditionType_} a.leadingOfficial like #{${_conditionParam_}.leadingOfficial}
</if>
<if test="conditionParamRef.leadingOfficial == null">
${_conditionType_} a.leadingOfficial is null
</if>
</if>
<if test="conditionParamRef.containsKey('leadingOfficialList')">
${_conditionType_} a.leadingOfficial in
<foreach collection="conditionParamRef.leadingOfficialList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('leadingOfficialTelephone')"> <if test="conditionParamRef.containsKey('updateTime')">
<if test="conditionParamRef.leadingOfficialTelephone != null and conditionParamRef.leadingOfficialTelephone != ''"> <if test="conditionParamRef.updateTime != null ">
${_conditionType_} a.leadingOfficialTelephone like #{${_conditionParam_}.leadingOfficialTelephone} ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
</if> </if>
<if test="conditionParamRef.leadingOfficialTelephone == null"> <if test="conditionParamRef.updateTime == null">
${_conditionType_} a.leadingOfficialTelephone is null ${_conditionType_} a.updateTime is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('leadingOfficialTelephoneList')"> <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
${_conditionType_} a.leadingOfficialTelephone in ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
<foreach collection="conditionParamRef.leadingOfficialTelephoneList" open="(" close=")" index="index" item="item" separator=","> </if>
#{item} <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
</foreach> ${_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('modelIds')"> <if test="conditionParamRef.containsKey('modelIds')">
...@@ -1303,63 +1478,120 @@ ...@@ -1303,63 +1478,120 @@
${_conditionType_} a.modelIds is null ${_conditionType_} a.modelIds is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('modelIdsList')"> <if test="conditionParamRef.containsKey('modelIdsList') and conditionParamRef.modelIdsList.size() > 0">
${_conditionType_} a.modelIds in ${_conditionType_} a.modelIds in
<foreach collection="conditionParamRef.modelIdsList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.modelIdsList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('modelIdsNotList') and conditionParamRef.modelIdsNotList.size() > 0">
${_conditionType_} a.modelIds not in
<foreach collection="conditionParamRef.modelIdsNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createTime')"> <if test="conditionParamRef.containsKey('areaName')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.areaName != null and conditionParamRef.areaName != ''">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime} ${_conditionType_} a.areaName like #{${_conditionParam_}.areaName}
</if> </if>
<if test="conditionParamRef.createTime == null"> <if test="conditionParamRef.areaName == null">
${_conditionType_} a.createTime is null ${_conditionType_} a.areaName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''"> <if test="conditionParamRef.containsKey('areaNameList') and conditionParamRef.areaNameList.size() > 0">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.areaName in
<foreach collection="conditionParamRef.areaNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''"> <if test="conditionParamRef.containsKey('areaNameNotList') and conditionParamRef.areaNameNotList.size() > 0">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.areaName not in
<foreach collection="conditionParamRef.areaNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserId')"> <if test="conditionParamRef.containsKey('onlineTake')">
<if test="conditionParamRef.createUserId != null "> <if test="conditionParamRef.onlineTake != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId} ${_conditionType_} a.onlineTake = #{${_conditionParam_}.onlineTake}
</if> </if>
<if test="conditionParamRef.createUserId == null"> <if test="conditionParamRef.onlineTake == null">
${_conditionType_} a.createUserId is null ${_conditionType_} a.onlineTake is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> <if test="conditionParamRef.containsKey('onlineTakeList') and conditionParamRef.onlineTakeList.size() > 0">
${_conditionType_} a.createUserId in ${_conditionType_} a.onlineTake in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.onlineTakeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> <if test="conditionParamRef.containsKey('onlineTakeNotList') and conditionParamRef.onlineTakeNotList.size() > 0">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} ${_conditionType_} a.onlineTake not in
<foreach collection="conditionParamRef.onlineTakeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null"> <if test="conditionParamRef.containsKey('onlineTakeStart') and conditionParamRef.onlineTakeStart != null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd} ${_conditionType_} a.onlineTake <![CDATA[ >= ]]> #{${_conditionParam_}.onlineTakeStart}
</if>
<if test="conditionParamRef.containsKey('onlineTakeEnd') and conditionParamRef.onlineTakeEnd != null">
${_conditionType_} a.onlineTake <![CDATA[ <= ]]> #{${_conditionParam_}.onlineTakeEnd}
</if> </if>
<if test="conditionParamRef.containsKey('appointment')">
<if test="conditionParamRef.appointment != null ">
${_conditionType_} a.appointment = #{${_conditionParam_}.appointment}
</if>
<if test="conditionParamRef.appointment == null">
${_conditionType_} a.appointment is null
</if>
</if>
<if test="conditionParamRef.containsKey('appointmentList') and conditionParamRef.appointmentList.size() > 0">
${_conditionType_} a.appointment in
<foreach collection="conditionParamRef.appointmentList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('appointmentNotList') and conditionParamRef.appointmentNotList.size() > 0">
${_conditionType_} a.appointment not in
<foreach collection="conditionParamRef.appointmentNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('appointmentStart') and conditionParamRef.appointmentStart != null">
${_conditionType_} a.appointment <![CDATA[ >= ]]> #{${_conditionParam_}.appointmentStart}
</if>
<if test="conditionParamRef.containsKey('appointmentEnd') and conditionParamRef.appointmentEnd != null">
${_conditionType_} a.appointment <![CDATA[ <= ]]> #{${_conditionParam_}.appointmentEnd}
</if>
<if test="conditionParamRef.containsKey('updateTime')"> <if test="conditionParamRef.containsKey('gowMap')">
<if test="conditionParamRef.updateTime != null "> <if test="conditionParamRef.gowMap != null ">
${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime} ${_conditionType_} a.gowMap = #{${_conditionParam_}.gowMap}
</if> </if>
<if test="conditionParamRef.updateTime == null"> <if test="conditionParamRef.gowMap == null">
${_conditionType_} a.updateTime is null ${_conditionType_} a.gowMap is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''"> <if test="conditionParamRef.containsKey('gowMapList') and conditionParamRef.gowMapList.size() > 0">
${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.gowMap in
<foreach collection="conditionParamRef.gowMapList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.containsKey('gowMapNotList') and conditionParamRef.gowMapNotList.size() > 0">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.gowMap not in
<foreach collection="conditionParamRef.gowMapNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('gowMapStart') and conditionParamRef.gowMapStart != null">
${_conditionType_} a.gowMap <![CDATA[ >= ]]> #{${_conditionParam_}.gowMapStart}
</if>
<if test="conditionParamRef.containsKey('gowMapEnd') and conditionParamRef.gowMapEnd != null">
${_conditionType_} a.gowMap <![CDATA[ <= ]]> #{${_conditionParam_}.gowMapEnd}
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -1388,6 +1620,11 @@ ...@@ -1388,6 +1620,11 @@
<if test='orderCol.siteCode != null and "DESC".equalsIgnoreCase(orderCol.siteCode)'>DESC</if> <if test='orderCol.siteCode != null and "DESC".equalsIgnoreCase(orderCol.siteCode)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('proCode')">
a.proCode
<if test='orderCol.proCode != null and "DESC".equalsIgnoreCase(orderCol.proCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('areaID')"> <if test="orderCol.containsKey('areaID')">
a.areaID a.areaID
<if test='orderCol.areaID != null and "DESC".equalsIgnoreCase(orderCol.areaID)'>DESC</if> <if test='orderCol.areaID != null and "DESC".equalsIgnoreCase(orderCol.areaID)'>DESC</if>
...@@ -1398,16 +1635,6 @@ ...@@ -1398,16 +1635,6 @@
<if test='orderCol.areaCode != null and "DESC".equalsIgnoreCase(orderCol.areaCode)'>DESC</if> <if test='orderCol.areaCode != null and "DESC".equalsIgnoreCase(orderCol.areaCode)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('areaName')">
a.areaName
<if test='orderCol.areaName != null and "DESC".equalsIgnoreCase(orderCol.areaName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('proCode')">
a.proCode
<if test='orderCol.proCode != null and "DESC".equalsIgnoreCase(orderCol.proCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('cityCode')"> <if test="orderCol.containsKey('cityCode')">
a.cityCode a.cityCode
<if test='orderCol.cityCode != null and "DESC".equalsIgnoreCase(orderCol.cityCode)'>DESC</if> <if test='orderCol.cityCode != null and "DESC".equalsIgnoreCase(orderCol.cityCode)'>DESC</if>
...@@ -1518,24 +1745,19 @@ ...@@ -1518,24 +1745,19 @@
<if test='orderCol.building != null and "DESC".equalsIgnoreCase(orderCol.building)'>DESC</if> <if test='orderCol.building != null and "DESC".equalsIgnoreCase(orderCol.building)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('logoPath')"> <if test="orderCol.containsKey('createTime')">
a.logoPath a.createTime
<if test='orderCol.logoPath != null and "DESC".equalsIgnoreCase(orderCol.logoPath)'>DESC</if> <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('englishName')">
a.englishName
<if test='orderCol.englishName != null and "DESC".equalsIgnoreCase(orderCol.englishName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('leadingOfficial')"> <if test="orderCol.containsKey('createUserId')">
a.leadingOfficial a.createUserId
<if test='orderCol.leadingOfficial != null and "DESC".equalsIgnoreCase(orderCol.leadingOfficial)'>DESC</if> <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('leadingOfficialTelephone')"> <if test="orderCol.containsKey('updateTime')">
a.leadingOfficialTelephone a.updateTime
<if test='orderCol.leadingOfficialTelephone != null and "DESC".equalsIgnoreCase(orderCol.leadingOfficialTelephone)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('modelIds')"> <if test="orderCol.containsKey('modelIds')">
...@@ -1543,19 +1765,24 @@ ...@@ -1543,19 +1765,24 @@
<if test='orderCol.modelIds != null and "DESC".equalsIgnoreCase(orderCol.modelIds)'>DESC</if> <if test='orderCol.modelIds != null and "DESC".equalsIgnoreCase(orderCol.modelIds)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('areaName')">
a.createTime a.areaName
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if> <if test='orderCol.areaName != null and "DESC".equalsIgnoreCase(orderCol.areaName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createUserId')"> <if test="orderCol.containsKey('onlineTake')">
a.createUserId a.onlineTake
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if> <if test='orderCol.onlineTake != null and "DESC".equalsIgnoreCase(orderCol.onlineTake)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('updateTime')"> <if test="orderCol.containsKey('appointment')">
a.updateTime a.appointment
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.appointment != null and "DESC".equalsIgnoreCase(orderCol.appointment)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('gowMap')">
a.gowMap
<if test='orderCol.gowMap != null and "DESC".equalsIgnoreCase(orderCol.gowMap)'>DESC</if>
, ,
</if> </if>
</trim> </trim>
......
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