Skip to content

S
smart_gov_platform
Commit 7b74adc5 authored by “yiyousong”'s avatar “yiyousong”
Browse files
Options

Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

parents 0b3e418d e88949d2
Show whitespace changes
Inline Side-by-side
Showing with 1451 additions and 1134 deletions
base-manager/db/add.sql
View file @ 7b74adc5
...@@ -156,7 +156,9 @@ CREATE TABLE mortals_xhx_device_blackapp( ...@@ -156,7 +156,9 @@ CREATE TABLE mortals_xhx_device_blackapp(
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备应用黑名单'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备应用黑名单';
-- ----------------------------
2023-5-07
-- ----------------------------
ALTER TABLE mortals_sys_site ADD COLUMN `onlineTake` tinyint(2) DEFAULT '1' COMMENT '在线取号（0.否，1.是）' AFTER workday7; 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 `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; ALTER TABLE mortals_sys_site ADD COLUMN `gowMap` tinyint(2) DEFAULT '1' COMMENT '在线取号（0.否，1.是）' AFTER appointment;
base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteEntity.java
View file @ 7b74adc5
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;
...@@ -25,17 +26,21 @@ public class SiteEntity extends SiteVo { ...@@ -25,17 +26,21 @@ public class SiteEntity extends SiteVo {
*/ */
private String siteCode; private String siteCode;
/** /**
* 省编码 * 区域Id
*/
private String proCode;
/**
* 区域ID
*/ */
private String areaID; private String areaID;
/** /**
* 区域编码 * 区域编号
*/ */
private String areaCode; private String areaCode;
/**
* 区域名称
*/
private String areaName;
/**
* 省编码
*/
private String proCode;
/** /**
* 市编码 * 市编码
*/ */
...@@ -75,19 +80,19 @@ public class SiteEntity extends SiteVo { ...@@ -75,19 +80,19 @@ public class SiteEntity extends SiteVo {
/** /**
* 上午上班开始时间 * 上午上班开始时间
*/ */
private String amWorkStartTime; private Date amWorkStartTime;
/** /**
* 上午上班结束时间 * 上午上班结束时间
*/ */
private String amWorkEndTime; private Date amWorkEndTime;
/** /**
* 下午上班开始时间 * 下午上班开始时间
*/ */
private String pmWorkStartTime; private Date pmWorkStartTime;
/** /**
* 下午上班结束时间 * 下午上班结束时间
*/ */
private String pmWorkEndTime; private Date pmWorkEndTime;
/** /**
* 周一 (1.上班，0.不上) * 周一 (1.上班，0.不上)
*/ */
...@@ -116,6 +121,18 @@ public class SiteEntity extends SiteVo { ...@@ -116,6 +121,18 @@ public class SiteEntity extends SiteVo {
* 周日 (1.上班，0.不上) * 周日 (1.上班，0.不上)
*/ */
private Integer workday7; private Integer workday7;
/**
* 在线取号（0.否，1.是）
*/
private Integer onlineTake;
/**
* 在线取号（0.否，1.是）
*/
private Integer appointment;
/**
* 在线取号（0.否，1.是）
*/
private Integer gowMap;
/** /**
* 楼层 * 楼层
*/ */
...@@ -125,25 +142,25 @@ public class SiteEntity extends SiteVo { ...@@ -125,25 +142,25 @@ public class SiteEntity extends SiteVo {
*/ */
private Integer building; private Integer building;
/** /**
* 部署模块，逗号分隔 * logo图片地址
*/ */
private String modelIds; private String logoPath;
/** /**
* 区域名称 * 英文名称
*/ */
private String areaName; private String englishName;
/** /**
* 在线取号（0.否，1.是） * 负责人
*/ */
private Integer onlineTake; private String leadingOfficial;
/** /**
* 微预约（0.否，1.是） * 联系电话
*/ */
private Integer appointment; private String leadingOfficialTelephone;
/** /**
* 政务地图（0.否，1.是） * 部署模块，逗号分隔
*/ */
private Integer gowMap; private String modelIds;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -162,6 +179,7 @@ public class SiteEntity extends SiteVo { ...@@ -162,6 +179,7 @@ public class SiteEntity extends SiteVo {
public void initAttrValue(){ public void initAttrValue(){
this.siteName = ""; this.siteName = "";
this.siteCode = ""; this.siteCode = "";
...@@ -190,13 +208,13 @@ public class SiteEntity extends SiteVo { ...@@ -190,13 +208,13 @@ public class SiteEntity extends SiteVo {
this.siteRemark = ""; this.siteRemark = "";
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;
...@@ -225,5 +243,9 @@ public class SiteEntity extends SiteVo { ...@@ -225,5 +243,9 @@ public class SiteEntity extends SiteVo {
this.appointment = 1; this.appointment = 1;
this.gowMap = 1; this.gowMap = 1;
this.logoPath = "";
this.englishName = "";
} }
} }
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteQuery.java
View file @ 7b74adc5
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;
/** /**
...@@ -34,21 +35,26 @@ public class SiteQuery extends SiteEntity { ...@@ -34,21 +35,26 @@ public class SiteQuery extends SiteEntity {
/** 站点编号排除列表 */ /** 站点编号排除列表 */
private List <String> siteCodeNotList; private List <String> siteCodeNotList;
/** 省编码 */ /** 区域Id */
private List<String> proCodeList;
/** 省编码排除列表 */
private List <String> proCodeNotList;
/** 区域ID */
private List<String> areaIDList; private List<String> areaIDList;
/** 区域ID排除列表 */ /** 区域Id排除列表 */
private List <String> areaIDNotList; private List <String> areaIDNotList;
/** 区域编码 */ /** 区域编号 */
private List<String> areaCodeList; private List<String> areaCodeList;
/** 区域编码排除列表 */ /** 区域编号排除列表 */
private List <String> areaCodeNotList; private List <String> areaCodeNotList;
/** 区域名称 */
private List<String> areaNameList;
/** 区域名称排除列表 */
private List <String> areaNameNotList;
/** 省编码 */
private List<String> proCodeList;
/** 省编码排除列表 */
private List <String> proCodeNotList;
/** 市编码 */ /** 市编码 */
private List<String> cityCodeList; private List<String> cityCodeList;
...@@ -94,26 +100,30 @@ public class SiteQuery extends SiteEntity { ...@@ -94,26 +100,30 @@ public class SiteQuery extends SiteEntity {
/** 中心介绍排除列表 */ /** 中心介绍排除列表 */
private List <String> siteRemarkNotList; private List <String> siteRemarkNotList;
/** 上午上班开始时间 */ /** 开始 上午上班开始时间 */
private List<String> amWorkStartTimeList; private String amWorkStartTimeStart;
/** 上午上班开始时间排除列表 */ /** 结束 上午上班开始时间 */
private List <String> amWorkStartTimeNotList; private String amWorkStartTimeEnd;
/** 上午上班结束时间 */
private List<String> amWorkEndTimeList; /** 开始 上午上班结束时间 */
private String amWorkEndTimeStart;
/** 上午上班结束时间排除列表 */
private List <String> amWorkEndTimeNotList; /** 结束 上午上班结束时间 */
/** 下午上班开始时间 */ private String amWorkEndTimeEnd;
private List<String> pmWorkStartTimeList;
/** 开始 下午上班开始时间 */
/** 下午上班开始时间排除列表 */ private String pmWorkStartTimeStart;
private List <String> pmWorkStartTimeNotList;
/** 下午上班结束时间 */ /** 结束 下午上班开始时间 */
private List<String> pmWorkEndTimeList; private String pmWorkStartTimeEnd;
/** 下午上班结束时间排除列表 */ /** 开始 下午上班结束时间 */
private List <String> pmWorkEndTimeNotList; private String pmWorkEndTimeStart;
/** 结束 下午上班结束时间 */
private String pmWorkEndTimeEnd;
/** 开始 周一 (1.上班，0.不上) */ /** 开始 周一 (1.上班，0.不上) */
private Integer workday1Start; private Integer workday1Start;
...@@ -219,6 +229,51 @@ public class SiteQuery extends SiteEntity { ...@@ -219,6 +229,51 @@ public class SiteQuery extends SiteEntity {
/** 周日 (1.上班，0.不上)排除列表 */ /** 周日 (1.上班，0.不上)排除列表 */
private List <Integer> workday7NotList; private List <Integer> workday7NotList;
/** 开始 在线取号（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;
/** 开始 楼层 */ /** 开始 楼层 */
private Integer levelStart; private Integer levelStart;
...@@ -249,6 +304,31 @@ public class SiteQuery extends SiteEntity { ...@@ -249,6 +304,31 @@ public class SiteQuery extends SiteEntity {
/** 楼栋排除列表 */ /** 楼栋排除列表 */
private List <Integer> buildingNotList; private List <Integer> buildingNotList;
/** logo图片地址 */
private List<String> logoPathList;
/** logo图片地址排除列表 */
private List <String> logoPathNotList;
/** 英文名称 */
private List<String> englishNameList;
/** 英文名称排除列表 */
private List <String> englishNameNotList;
/** 负责人 */
private List<String> leadingOfficialList;
/** 负责人排除列表 */
private List <String> leadingOfficialNotList;
/** 联系电话 */
private List<String> leadingOfficialTelephoneList;
/** 联系电话排除列表 */
private List <String> leadingOfficialTelephoneNotList;
/** 部署模块，逗号分隔 */
private List<String> modelIdsList;
/** 部署模块，逗号分隔排除列表 */
private List <String> modelIdsNotList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -276,61 +356,6 @@ public class SiteQuery extends SiteEntity { ...@@ -276,61 +356,6 @@ public class SiteQuery extends SiteEntity {
/** 结束 修改时间 */ /** 结束 修改时间 */
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;
...@@ -485,39 +510,7 @@ public class SiteQuery extends SiteEntity { ...@@ -485,39 +510,7 @@ public class SiteQuery extends SiteEntity {
} }
/** /**
* 获取 省编码 * 获取 区域Id
* @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
* @return areaIDList * @return areaIDList
*/ */
public List<String> getAreaIDList(){ public List<String> getAreaIDList(){
...@@ -525,7 +518,7 @@ public class SiteQuery extends SiteEntity { ...@@ -525,7 +518,7 @@ public class SiteQuery extends SiteEntity {
} }
/** /**
* 设置 区域ID * 设置 区域Id
* @param areaIDList * @param areaIDList
*/ */
public void setAreaIDList(List<String> areaIDList){ public void setAreaIDList(List<String> areaIDList){
...@@ -533,7 +526,7 @@ public class SiteQuery extends SiteEntity { ...@@ -533,7 +526,7 @@ public class SiteQuery extends SiteEntity {
} }
/** /**
* 获取 区域ID * 获取 区域Id
* @return areaIDNotList * @return areaIDNotList
*/ */
public List<String> getAreaIDNotList(){ public List<String> getAreaIDNotList(){
...@@ -541,7 +534,7 @@ public class SiteQuery extends SiteEntity { ...@@ -541,7 +534,7 @@ public class SiteQuery extends SiteEntity {
} }
/** /**
* 设置 区域ID * 设置 区域Id
* @param areaIDNotList * @param areaIDNotList
*/ */
public void setAreaIDNotList(List<String> areaIDNotList){ public void setAreaIDNotList(List<String> areaIDNotList){
...@@ -549,7 +542,7 @@ public class SiteQuery extends SiteEntity { ...@@ -549,7 +542,7 @@ public class SiteQuery extends SiteEntity {
} }
/** /**
* 获取 区域编码 * 获取 区域编号
* @return areaCodeList * @return areaCodeList
*/ */
public List<String> getAreaCodeList(){ public List<String> getAreaCodeList(){
...@@ -557,7 +550,7 @@ public class SiteQuery extends SiteEntity { ...@@ -557,7 +550,7 @@ public class SiteQuery extends SiteEntity {
} }
/** /**
* 设置 区域编码 * 设置 区域编号
* @param areaCodeList * @param areaCodeList
*/ */
public void setAreaCodeList(List<String> areaCodeList){ public void setAreaCodeList(List<String> areaCodeList){
...@@ -565,7 +558,7 @@ public class SiteQuery extends SiteEntity { ...@@ -565,7 +558,7 @@ public class SiteQuery extends SiteEntity {
} }
/** /**
* 获取 区域编码 * 获取 区域编号
* @return areaCodeNotList * @return areaCodeNotList
*/ */
public List<String> getAreaCodeNotList(){ public List<String> getAreaCodeNotList(){
...@@ -573,13 +566,77 @@ public class SiteQuery extends SiteEntity { ...@@ -573,13 +566,77 @@ public class SiteQuery extends SiteEntity {
} }
/** /**
* 设置 区域编码 * 设置 区域编号
* @param areaCodeNotList * @param areaCodeNotList
*/ */
public void setAreaCodeNotList(List<String> areaCodeNotList){ public void setAreaCodeNotList(List<String> areaCodeNotList){
this.areaCodeNotList = areaCodeNotList; this.areaCodeNotList = areaCodeNotList;
} }
/**
* 获取 区域名称
* @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;
}
/**
* 获取 省编码
* @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;
}
/** /**
* 获取 市编码 * 获取 市编码
* @return cityCodeList * @return cityCodeList
...@@ -869,131 +926,131 @@ public class SiteQuery extends SiteEntity { ...@@ -869,131 +926,131 @@ public class SiteQuery extends SiteEntity {
} }
/** /**
* 获取 上午上班开始时间 * 获取 开始 上午上班开始时间
* @return amWorkStartTimeList * @return amWorkStartTimeStart
*/ */
public List<String> getAmWorkStartTimeList(){ public String getAmWorkStartTimeStart(){
return this.amWorkStartTimeList; return this.amWorkStartTimeStart;
} }
/** /**
* 设置 上午上班开始时间 * 设置 开始 上午上班开始时间
* @param amWorkStartTimeList * @param amWorkStartTimeStart
*/ */
public void setAmWorkStartTimeList(List<String> amWorkStartTimeList){ public void setAmWorkStartTimeStart(String amWorkStartTimeStart){
this.amWorkStartTimeList = amWorkStartTimeList; this.amWorkStartTimeStart = amWorkStartTimeStart;
} }
/** /**
* 获取 上午上班开始时间 * 获取 结束 上午上班开始时间
* @return amWorkStartTimeNotList * @return amWorkStartTimeEnd
*/ */
public List<String> getAmWorkStartTimeNotList(){ public String getAmWorkStartTimeEnd(){
return this.amWorkStartTimeNotList; return this.amWorkStartTimeEnd;
} }
/** /**
* 设置 上午上班开始时间 * 设置 结束 上午上班开始时间
* @param amWorkStartTimeNotList * @param amWorkStartTimeEnd
*/ */
public void setAmWorkStartTimeNotList(List<String> amWorkStartTimeNotList){ public void setAmWorkStartTimeEnd(String amWorkStartTimeEnd){
this.amWorkStartTimeNotList = amWorkStartTimeNotList; this.amWorkStartTimeEnd = amWorkStartTimeEnd;
} }
/** /**
* 获取 上午上班结束时间 * 获取 开始 上午上班结束时间
* @return amWorkEndTimeList * @return amWorkEndTimeStart
*/ */
public List<String> getAmWorkEndTimeList(){ public String getAmWorkEndTimeStart(){
return this.amWorkEndTimeList; return this.amWorkEndTimeStart;
} }
/** /**
* 设置 上午上班结束时间 * 设置 开始 上午上班结束时间
* @param amWorkEndTimeList * @param amWorkEndTimeStart
*/ */
public void setAmWorkEndTimeList(List<String> amWorkEndTimeList){ public void setAmWorkEndTimeStart(String amWorkEndTimeStart){
this.amWorkEndTimeList = amWorkEndTimeList; this.amWorkEndTimeStart = amWorkEndTimeStart;
} }
/** /**
* 获取 上午上班结束时间 * 获取 结束 上午上班结束时间
* @return amWorkEndTimeNotList * @return amWorkEndTimeEnd
*/ */
public List<String> getAmWorkEndTimeNotList(){ public String getAmWorkEndTimeEnd(){
return this.amWorkEndTimeNotList; return this.amWorkEndTimeEnd;
} }
/** /**
* 设置 上午上班结束时间 * 设置 结束 上午上班结束时间
* @param amWorkEndTimeNotList * @param amWorkEndTimeEnd
*/ */
public void setAmWorkEndTimeNotList(List<String> amWorkEndTimeNotList){ public void setAmWorkEndTimeEnd(String amWorkEndTimeEnd){
this.amWorkEndTimeNotList = amWorkEndTimeNotList; this.amWorkEndTimeEnd = amWorkEndTimeEnd;
} }
/** /**
* 获取 下午上班开始时间 * 获取 开始 下午上班开始时间
* @return pmWorkStartTimeList * @return pmWorkStartTimeStart
*/ */
public List<String> getPmWorkStartTimeList(){ public String getPmWorkStartTimeStart(){
return this.pmWorkStartTimeList; return this.pmWorkStartTimeStart;
} }
/** /**
* 设置 下午上班开始时间 * 设置 开始 下午上班开始时间
* @param pmWorkStartTimeList * @param pmWorkStartTimeStart
*/ */
public void setPmWorkStartTimeList(List<String> pmWorkStartTimeList){ public void setPmWorkStartTimeStart(String pmWorkStartTimeStart){
this.pmWorkStartTimeList = pmWorkStartTimeList; this.pmWorkStartTimeStart = pmWorkStartTimeStart;
} }
/** /**
* 获取 下午上班开始时间 * 获取 结束 下午上班开始时间
* @return pmWorkStartTimeNotList * @return pmWorkStartTimeEnd
*/ */
public List<String> getPmWorkStartTimeNotList(){ public String getPmWorkStartTimeEnd(){
return this.pmWorkStartTimeNotList; return this.pmWorkStartTimeEnd;
} }
/** /**
* 设置 下午上班开始时间 * 设置 结束 下午上班开始时间
* @param pmWorkStartTimeNotList * @param pmWorkStartTimeEnd
*/ */
public void setPmWorkStartTimeNotList(List<String> pmWorkStartTimeNotList){ public void setPmWorkStartTimeEnd(String pmWorkStartTimeEnd){
this.pmWorkStartTimeNotList = pmWorkStartTimeNotList; this.pmWorkStartTimeEnd = pmWorkStartTimeEnd;
} }
/** /**
* 获取 下午上班结束时间 * 获取 开始 下午上班结束时间
* @return pmWorkEndTimeList * @return pmWorkEndTimeStart
*/ */
public List<String> getPmWorkEndTimeList(){ public String getPmWorkEndTimeStart(){
return this.pmWorkEndTimeList; return this.pmWorkEndTimeStart;
} }
/** /**
* 设置 下午上班结束时间 * 设置 开始 下午上班结束时间
* @param pmWorkEndTimeList * @param pmWorkEndTimeStart
*/ */
public void setPmWorkEndTimeList(List<String> pmWorkEndTimeList){ public void setPmWorkEndTimeStart(String pmWorkEndTimeStart){
this.pmWorkEndTimeList = pmWorkEndTimeList; this.pmWorkEndTimeStart = pmWorkEndTimeStart;
} }
/** /**
* 获取 下午上班结束时间 * 获取 结束 下午上班结束时间
* @return pmWorkEndTimeNotList * @return pmWorkEndTimeEnd
*/ */
public List<String> getPmWorkEndTimeNotList(){ public String getPmWorkEndTimeEnd(){
return this.pmWorkEndTimeNotList; return this.pmWorkEndTimeEnd;
} }
/** /**
* 设置 下午上班结束时间 * 设置 结束 下午上班结束时间
* @param pmWorkEndTimeNotList * @param pmWorkEndTimeEnd
*/ */
public void setPmWorkEndTimeNotList(List<String> pmWorkEndTimeNotList){ public void setPmWorkEndTimeEnd(String pmWorkEndTimeEnd){
this.pmWorkEndTimeNotList = pmWorkEndTimeNotList; this.pmWorkEndTimeEnd = pmWorkEndTimeEnd;
} }
/** /**
...@@ -1564,618 +1621,714 @@ public class SiteQuery extends SiteEntity { ...@@ -1564,618 +1621,714 @@ public class SiteQuery extends SiteEntity {
/** /**
* 获取 开始 楼层 * 获取 开始 在线取号（0.否，1.是）
* @return levelStart * @return onlineTakeStart
*/ */
public Integer getLevelStart(){ public Integer getOnlineTakeStart(){
return this.levelStart; return this.onlineTakeStart;
} }
/** /**
* 设置 开始 楼层 * 设置 开始 在线取号（0.否，1.是）
* @param levelStart * @param onlineTakeStart
*/ */
public void setLevelStart(Integer levelStart){ public void setOnlineTakeStart(Integer onlineTakeStart){
this.levelStart = levelStart; this.onlineTakeStart = onlineTakeStart;
} }
/** /**
* 获取 结束 楼层 * 获取 结束 在线取号（0.否，1.是）
* @return $levelEnd * @return $onlineTakeEnd
*/ */
public Integer getLevelEnd(){ public Integer getOnlineTakeEnd(){
return this.levelEnd; return this.onlineTakeEnd;
} }
/** /**
* 设置 结束 楼层 * 设置 结束 在线取号（0.否，1.是）
* @param levelEnd * @param onlineTakeEnd
*/ */
public void setLevelEnd(Integer levelEnd){ public void setOnlineTakeEnd(Integer onlineTakeEnd){
this.levelEnd = levelEnd; this.onlineTakeEnd = onlineTakeEnd;
} }
/** /**
* 获取 增加 楼层 * 获取 增加 在线取号（0.否，1.是）
* @return levelIncrement * @return onlineTakeIncrement
*/ */
public Integer getLevelIncrement(){ public Integer getOnlineTakeIncrement(){
return this.levelIncrement; return this.onlineTakeIncrement;
} }
/** /**
* 设置 增加 楼层 * 设置 增加 在线取号（0.否，1.是）
* @param levelIncrement * @param onlineTakeIncrement
*/ */
public void setLevelIncrement(Integer levelIncrement){ public void setOnlineTakeIncrement(Integer onlineTakeIncrement){
this.levelIncrement = levelIncrement; this.onlineTakeIncrement = onlineTakeIncrement;
} }
/** /**
* 获取 楼层 * 获取 在线取号（0.否，1.是）
* @return levelList * @return onlineTakeList
*/ */
public List<Integer> getLevelList(){ public List<Integer> getOnlineTakeList(){
return this.levelList; return this.onlineTakeList;
} }
/** /**
* 设置 楼层 * 设置 在线取号（0.否，1.是）
* @param levelList * @param onlineTakeList
*/ */
public void setLevelList(List<Integer> levelList){ public void setOnlineTakeList(List<Integer> onlineTakeList){
this.levelList = levelList; this.onlineTakeList = onlineTakeList;
} }
/** /**
* 获取 楼层 * 获取 在线取号（0.否，1.是）
* @return levelNotList * @return onlineTakeNotList
*/ */
public List<Integer> getLevelNotList(){ public List<Integer> getOnlineTakeNotList(){
return this.levelNotList; return this.onlineTakeNotList;
} }
/** /**
* 设置 楼层 * 设置 在线取号（0.否，1.是）
* @param levelNotList * @param onlineTakeNotList
*/ */
public void setLevelNotList(List<Integer> levelNotList){ public void setOnlineTakeNotList(List<Integer> onlineTakeNotList){
this.levelNotList = levelNotList; this.onlineTakeNotList = onlineTakeNotList;
} }
/** /**
* 获取 开始 楼栋 * 获取 开始 在线取号（0.否，1.是）
* @return buildingStart * @return appointmentStart
*/ */
public Integer getBuildingStart(){ public Integer getAppointmentStart(){
return this.buildingStart; return this.appointmentStart;
} }
/** /**
* 设置 开始 楼栋 * 设置 开始 在线取号（0.否，1.是）
* @param buildingStart * @param appointmentStart
*/ */
public void setBuildingStart(Integer buildingStart){ public void setAppointmentStart(Integer appointmentStart){
this.buildingStart = buildingStart; this.appointmentStart = appointmentStart;
} }
/** /**
* 获取 结束 楼栋 * 获取 结束 在线取号（0.否，1.是）
* @return $buildingEnd * @return $appointmentEnd
*/ */
public Integer getBuildingEnd(){ public Integer getAppointmentEnd(){
return this.buildingEnd; return this.appointmentEnd;
} }
/** /**
* 设置 结束 楼栋 * 设置 结束 在线取号（0.否，1.是）
* @param buildingEnd * @param appointmentEnd
*/ */
public void setBuildingEnd(Integer buildingEnd){ public void setAppointmentEnd(Integer appointmentEnd){
this.buildingEnd = buildingEnd; this.appointmentEnd = appointmentEnd;
} }
/** /**
* 获取 增加 楼栋 * 获取 增加 在线取号（0.否，1.是）
* @return buildingIncrement * @return appointmentIncrement
*/ */
public Integer getBuildingIncrement(){ public Integer getAppointmentIncrement(){
return this.buildingIncrement; return this.appointmentIncrement;
} }
/** /**
* 设置 增加 楼栋 * 设置 增加 在线取号（0.否，1.是）
* @param buildingIncrement * @param appointmentIncrement
*/ */
public void setBuildingIncrement(Integer buildingIncrement){ public void setAppointmentIncrement(Integer appointmentIncrement){
this.buildingIncrement = buildingIncrement; this.appointmentIncrement = appointmentIncrement;
} }
/** /**
* 获取 楼栋 * 获取 在线取号（0.否，1.是）
* @return buildingList * @return appointmentList
*/ */
public List<Integer> getBuildingList(){ public List<Integer> getAppointmentList(){
return this.buildingList; return this.appointmentList;
} }
/** /**
* 设置 楼栋 * 设置 在线取号（0.否，1.是）
* @param buildingList * @param appointmentList
*/ */
public void setBuildingList(List<Integer> buildingList){ public void setAppointmentList(List<Integer> appointmentList){
this.buildingList = buildingList; this.appointmentList = appointmentList;
} }
/** /**
* 获取 楼栋 * 获取 在线取号（0.否，1.是）
* @return buildingNotList * @return appointmentNotList
*/ */
public List<Integer> getBuildingNotList(){ public List<Integer> getAppointmentNotList(){
return this.buildingNotList; return this.appointmentNotList;
} }
/** /**
* 设置 楼栋 * 设置 在线取号（0.否，1.是）
* @param buildingNotList * @param appointmentNotList
*/ */
public void setBuildingNotList(List<Integer> buildingNotList){ public void setAppointmentNotList(List<Integer> appointmentNotList){
this.buildingNotList = buildingNotList; this.appointmentNotList = appointmentNotList;
} }
/** /**
* 获取 开始 创建时间 * 获取 开始 在线取号（0.否，1.是）
* @return createTimeStart * @return gowMapStart
*/ */
public String getCreateTimeStart(){ public Integer getGowMapStart(){
return this.createTimeStart; return this.gowMapStart;
} }
/** /**
* 设置 开始 创建时间 * 设置 开始 在线取号（0.否，1.是）
* @param createTimeStart * @param gowMapStart
*/ */
public void setCreateTimeStart(String createTimeStart){ public void setGowMapStart(Integer gowMapStart){
this.createTimeStart = createTimeStart; this.gowMapStart = gowMapStart;
} }
/** /**
* 获取 结束 创建时间 * 获取 结束 在线取号（0.否，1.是）
* @return createTimeEnd * @return $gowMapEnd
*/ */
public String getCreateTimeEnd(){ public Integer getGowMapEnd(){
return this.createTimeEnd; return this.gowMapEnd;
} }
/** /**
* 设置 结束 创建时间 * 设置 结束 在线取号（0.否，1.是）
* @param createTimeEnd * @param gowMapEnd
*/ */
public void setCreateTimeEnd(String createTimeEnd){ public void setGowMapEnd(Integer gowMapEnd){
this.createTimeEnd = createTimeEnd; this.gowMapEnd = gowMapEnd;
} }
/** /**
* 获取 开始 创建用户 * 获取 增加 在线取号（0.否，1.是）
* @return createUserIdStart * @return gowMapIncrement
*/ */
public Long getCreateUserIdStart(){ public Integer getGowMapIncrement(){
return this.createUserIdStart; return this.gowMapIncrement;
} }
/** /**
* 设置 开始 创建用户 * 设置 增加 在线取号（0.否，1.是）
* @param createUserIdStart * @param gowMapIncrement
*/ */
public void setCreateUserIdStart(Long createUserIdStart){ public void setGowMapIncrement(Integer gowMapIncrement){
this.createUserIdStart = createUserIdStart; this.gowMapIncrement = gowMapIncrement;
} }
/** /**
* 获取 结束 创建用户 * 获取 在线取号（0.否，1.是）
* @return $createUserIdEnd * @return gowMapList
*/ */
public Long getCreateUserIdEnd(){ public List<Integer> getGowMapList(){
return this.createUserIdEnd; return this.gowMapList;
} }
/** /**
* 设置 结束 创建用户 * 设置 在线取号（0.否，1.是）
* @param createUserIdEnd * @param gowMapList
*/ */
public void setCreateUserIdEnd(Long createUserIdEnd){ public void setGowMapList(List<Integer> gowMapList){
this.createUserIdEnd = createUserIdEnd; this.gowMapList = gowMapList;
} }
/** /**
* 获取 增加 创建用户 * 获取 在线取号（0.否，1.是）
* @return createUserIdIncrement * @return gowMapNotList
*/ */
public Long getCreateUserIdIncrement(){ public List<Integer> getGowMapNotList(){
return this.createUserIdIncrement; return this.gowMapNotList;
} }
/** /**
* 设置 增加 创建用户 * 设置 在线取号（0.否，1.是）
* @param createUserIdIncrement * @param gowMapNotList
*/ */
public void setCreateUserIdIncrement(Long createUserIdIncrement){ public void setGowMapNotList(List<Integer> gowMapNotList){
this.createUserIdIncrement = createUserIdIncrement; this.gowMapNotList = gowMapNotList;
} }
/** /**
* 获取 创建用户 * 获取 开始 楼层
* @return createUserIdList * @return levelStart
*/ */
public List<Long> getCreateUserIdList(){ public Integer getLevelStart(){
return this.createUserIdList; return this.levelStart;
} }
/** /**
* 设置 创建用户 * 设置 开始 楼层
* @param createUserIdList * @param levelStart
*/ */
public void setCreateUserIdList(List<Long> createUserIdList){ public void setLevelStart(Integer levelStart){
this.createUserIdList = createUserIdList; this.levelStart = levelStart;
} }
/** /**
* 获取 创建用户 * 获取 结束 楼层
* @return createUserIdNotList * @return $levelEnd
*/ */
public List<Long> getCreateUserIdNotList(){ public Integer getLevelEnd(){
return this.createUserIdNotList; return this.levelEnd;
} }
/** /**
* 设置 创建用户 * 设置 结束 楼层
* @param createUserIdNotList * @param levelEnd
*/ */
public void setCreateUserIdNotList(List<Long> createUserIdNotList){ public void setLevelEnd(Integer levelEnd){
this.createUserIdNotList = createUserIdNotList; this.levelEnd = levelEnd;
} }
/**
* 获取 增加 楼层
* @return levelIncrement
*/
public Integer getLevelIncrement(){
return this.levelIncrement;
}
/** /**
* 获取 开始 修改时间 * 设置 增加 楼层
* @return updateTimeStart * @param levelIncrement
*/ */
public String getUpdateTimeStart(){ public void setLevelIncrement(Integer levelIncrement){
return this.updateTimeStart; this.levelIncrement = levelIncrement;
}
/**
* 获取 楼层
* @return levelList
*/
public List<Integer> getLevelList(){
return this.levelList;
}
/**
* 设置 楼层
* @param levelList
*/
public void setLevelList(List<Integer> 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
*/
public Integer getBuildingStart(){
return this.buildingStart;
}
/**
* 设置 开始 楼栋
* @param buildingStart
*/
public void setBuildingStart(Integer buildingStart){
this.buildingStart = buildingStart;
}
/**
* 获取 结束 楼栋
* @return $buildingEnd
*/
public Integer getBuildingEnd(){
return this.buildingEnd;
}
/**
* 设置 结束 楼栋
* @param buildingEnd
*/
public void setBuildingEnd(Integer buildingEnd){
this.buildingEnd = buildingEnd;
}
/**
* 获取 增加 楼栋
* @return buildingIncrement
*/
public Integer getBuildingIncrement(){
return this.buildingIncrement;
}
/**
* 设置 增加 楼栋
* @param buildingIncrement
*/
public void setBuildingIncrement(Integer buildingIncrement){
this.buildingIncrement = buildingIncrement;
} }
/** /**
* 设置 开始 修改时间 * 获取 楼栋
* @param updateTimeStart * @return buildingList
*/ */
public void setUpdateTimeStart(String updateTimeStart){ public List<Integer> getBuildingList(){
this.updateTimeStart = updateTimeStart; return this.buildingList;
} }
/** /**
* 获取 结束 修改时间 * 设置 楼栋
* @return updateTimeEnd * @param buildingList
*/ */
public String getUpdateTimeEnd(){ public void setBuildingList(List<Integer> buildingList){
return this.updateTimeEnd; this.buildingList = buildingList;
} }
/** /**
* 设置 结束 修改时间 * 获取 楼栋
* @param updateTimeEnd * @return buildingNotList
*/ */
public void setUpdateTimeEnd(String updateTimeEnd){ public List<Integer> getBuildingNotList(){
this.updateTimeEnd = updateTimeEnd; return this.buildingNotList;
} }
/** /**
* 获取 部署模块，逗号分隔 * 设置 楼栋
* @return modelIdsList * @param buildingNotList
*/ */
public List<String> getModelIdsList(){ public void setBuildingNotList(List<Integer> buildingNotList){
return this.modelIdsList; this.buildingNotList = buildingNotList;
} }
/** /**
* 设置 部署模块，逗号分隔 * 获取 logo图片地址
* @param modelIdsList * @return logoPathList
*/ */
public void setModelIdsList(List<String> modelIdsList){ public List<String> getLogoPathList(){
this.modelIdsList = modelIdsList; return this.logoPathList;
} }
/** /**
* 获取 部署模块，逗号分隔 * 设置 logo图片地址
* @return modelIdsNotList * @param logoPathList
*/ */
public List<String> getModelIdsNotList(){ public void setLogoPathList(List<String> logoPathList){
return this.modelIdsNotList; this.logoPathList = logoPathList;
} }
/** /**
* 设置 部署模块，逗号分隔 * 获取 logo图片地址
* @param modelIdsNotList * @return logoPathNotList
*/ */
public void setModelIdsNotList(List<String> modelIdsNotList){ public List<String> getLogoPathNotList(){
this.modelIdsNotList = modelIdsNotList; return this.logoPathNotList;
} }
/** /**
* 获取 区域名称 * 设置 logo图片地址
* @return areaNameList * @param logoPathNotList
*/ */
public List<String> getAreaNameList(){ public void setLogoPathNotList(List<String> logoPathNotList){
return this.areaNameList; this.logoPathNotList = logoPathNotList;
} }
/** /**
* 设置 区域名称 * 获取 英文名称
* @param areaNameList * @return englishNameList
*/ */
public void setAreaNameList(List<String> areaNameList){ public List<String> getEnglishNameList(){
this.areaNameList = areaNameList; return this.englishNameList;
} }
/** /**
* 获取 区域名称 * 设置 英文名称
* @return areaNameNotList * @param englishNameList
*/ */
public List<String> getAreaNameNotList(){ public void setEnglishNameList(List<String> englishNameList){
return this.areaNameNotList; this.englishNameList = englishNameList;
} }
/** /**
* 设置 区域名称 * 获取 英文名称
* @param areaNameNotList * @return englishNameNotList
*/ */
public void setAreaNameNotList(List<String> areaNameNotList){ public List<String> getEnglishNameNotList(){
this.areaNameNotList = areaNameNotList; return this.englishNameNotList;
} }
/** /**
* 获取 开始 在线取号（0.否，1.是） * 设置 英文名称
* @return onlineTakeStart * @param englishNameNotList
*/ */
public Integer getOnlineTakeStart(){ public void setEnglishNameNotList(List<String> englishNameNotList){
return this.onlineTakeStart; this.englishNameNotList = englishNameNotList;
} }
/** /**
* 设置 开始 在线取号（0.否，1.是） * 获取 负责人
* @param onlineTakeStart * @return leadingOfficialList
*/ */
public void setOnlineTakeStart(Integer onlineTakeStart){ public List<String> getLeadingOfficialList(){
this.onlineTakeStart = onlineTakeStart; return this.leadingOfficialList;
} }
/** /**
* 获取 结束 在线取号（0.否，1.是） * 设置 负责人
* @return $onlineTakeEnd * @param leadingOfficialList
*/ */
public Integer getOnlineTakeEnd(){ public void setLeadingOfficialList(List<String> leadingOfficialList){
return this.onlineTakeEnd; this.leadingOfficialList = leadingOfficialList;
} }
/** /**
* 设置 结束 在线取号（0.否，1.是） * 获取 负责人
* @param onlineTakeEnd * @return leadingOfficialNotList
*/ */
public void setOnlineTakeEnd(Integer onlineTakeEnd){ public List<String> getLeadingOfficialNotList(){
this.onlineTakeEnd = onlineTakeEnd; return this.leadingOfficialNotList;
} }
/** /**
* 获取 增加 在线取号（0.否，1.是） * 设置 负责人
* @return onlineTakeIncrement * @param leadingOfficialNotList
*/ */
public Integer getOnlineTakeIncrement(){ public void setLeadingOfficialNotList(List<String> leadingOfficialNotList){
return this.onlineTakeIncrement; this.leadingOfficialNotList = leadingOfficialNotList;
} }
/** /**
* 设置 增加 在线取号（0.否，1.是） * 获取 联系电话
* @param onlineTakeIncrement * @return leadingOfficialTelephoneList
*/ */
public void setOnlineTakeIncrement(Integer onlineTakeIncrement){ public List<String> getLeadingOfficialTelephoneList(){
this.onlineTakeIncrement = onlineTakeIncrement; return this.leadingOfficialTelephoneList;
} }
/** /**
* 获取 在线取号（0.否，1.是） * 设置 联系电话
* @return onlineTakeList * @param leadingOfficialTelephoneList
*/ */
public List<Integer> getOnlineTakeList(){ public void setLeadingOfficialTelephoneList(List<String> leadingOfficialTelephoneList){
return this.onlineTakeList; this.leadingOfficialTelephoneList = leadingOfficialTelephoneList;
} }
/** /**
* 设置 在线取号（0.否，1.是） * 获取 联系电话
* @param onlineTakeList * @return leadingOfficialTelephoneNotList
*/ */
public void setOnlineTakeList(List<Integer> onlineTakeList){ public List<String> getLeadingOfficialTelephoneNotList(){
this.onlineTakeList = onlineTakeList; return this.leadingOfficialTelephoneNotList;
} }
/** /**
* 获取 在线取号（0.否，1.是） * 设置 联系电话
* @return onlineTakeNotList * @param leadingOfficialTelephoneNotList
*/ */
public List<Integer> getOnlineTakeNotList(){ public void setLeadingOfficialTelephoneNotList(List<String> leadingOfficialTelephoneNotList){
return this.onlineTakeNotList; this.leadingOfficialTelephoneNotList = leadingOfficialTelephoneNotList;
} }
/** /**
* 设置 在线取号（0.否，1.是） * 获取 部署模块，逗号分隔
* @param onlineTakeNotList * @return modelIdsList
*/ */
public void setOnlineTakeNotList(List<Integer> onlineTakeNotList){ public List<String> getModelIdsList(){
this.onlineTakeNotList = onlineTakeNotList; return this.modelIdsList;
} }
/** /**
* 获取 开始 微预约（0.否，1.是） * 设置 部署模块，逗号分隔
* @return appointmentStart * @param modelIdsList
*/ */
public Integer getAppointmentStart(){ public void setModelIdsList(List<String> modelIdsList){
return this.appointmentStart; this.modelIdsList = modelIdsList;
} }
/** /**
* 设置 开始 微预约（0.否，1.是） * 获取 部署模块，逗号分隔
* @param appointmentStart * @return modelIdsNotList
*/ */
public void setAppointmentStart(Integer appointmentStart){ public List<String> getModelIdsNotList(){
this.appointmentStart = appointmentStart; return this.modelIdsNotList;
} }
/** /**
* 获取 结束 微预约（0.否，1.是） * 设置 部署模块，逗号分隔
* @return $appointmentEnd * @param modelIdsNotList
*/ */
public Integer getAppointmentEnd(){ public void setModelIdsNotList(List<String> modelIdsNotList){
return this.appointmentEnd; this.modelIdsNotList = modelIdsNotList;
} }
/** /**
* 设置 结束 微预约（0.否，1.是） * 获取 开始 创建时间
* @param appointmentEnd * @return createTimeStart
*/ */
public void setAppointmentEnd(Integer appointmentEnd){ public String getCreateTimeStart(){
this.appointmentEnd = appointmentEnd; return this.createTimeStart;
} }
/** /**
* 获取 增加 微预约（0.否，1.是） * 设置 开始 创建时间
* @return appointmentIncrement * @param createTimeStart
*/ */
public Integer getAppointmentIncrement(){ public void setCreateTimeStart(String createTimeStart){
return this.appointmentIncrement; this.createTimeStart = createTimeStart;
} }
/** /**
* 设置 增加 微预约（0.否，1.是） * 获取 结束 创建时间
* @param appointmentIncrement * @return createTimeEnd
*/ */
public void setAppointmentIncrement(Integer appointmentIncrement){ public String getCreateTimeEnd(){
this.appointmentIncrement = appointmentIncrement; return this.createTimeEnd;
} }
/** /**
* 获取 微预约（0.否，1.是） * 设置 结束 创建时间
* @return appointmentList * @param createTimeEnd
*/ */
public List<Integer> getAppointmentList(){ public void setCreateTimeEnd(String createTimeEnd){
return this.appointmentList; this.createTimeEnd = createTimeEnd;
} }
/** /**
* 设置 微预约（0.否，1.是） * 获取 开始 创建用户
* @param appointmentList * @return createUserIdStart
*/ */
public void setAppointmentList(List<Integer> appointmentList){ public Long getCreateUserIdStart(){
this.appointmentList = appointmentList; return this.createUserIdStart;
} }
/** /**
* 获取 微预约（0.否，1.是） * 设置 开始 创建用户
* @return appointmentNotList * @param createUserIdStart
*/ */
public List<Integer> getAppointmentNotList(){ public void setCreateUserIdStart(Long createUserIdStart){
return this.appointmentNotList; this.createUserIdStart = createUserIdStart;
} }
/** /**
* 设置 微预约（0.否，1.是） * 获取 结束 创建用户
* @param appointmentNotList * @return $createUserIdEnd
*/ */
public void setAppointmentNotList(List<Integer> appointmentNotList){ public Long getCreateUserIdEnd(){
this.appointmentNotList = appointmentNotList; return this.createUserIdEnd;
} }
/** /**
* 获取 开始 政务地图（0.否，1.是） * 设置 结束 创建用户
* @return gowMapStart * @param createUserIdEnd
*/ */
public Integer getGowMapStart(){ public void setCreateUserIdEnd(Long createUserIdEnd){
return this.gowMapStart; this.createUserIdEnd = createUserIdEnd;
} }
/** /**
* 设置 开始 政务地图（0.否，1.是） * 获取 增加 创建用户
* @param gowMapStart * @return createUserIdIncrement
*/ */
public void setGowMapStart(Integer gowMapStart){ public Long getCreateUserIdIncrement(){
this.gowMapStart = gowMapStart; return this.createUserIdIncrement;
} }
/** /**
* 获取 结束 政务地图（0.否，1.是） * 设置 增加 创建用户
* @return $gowMapEnd * @param createUserIdIncrement
*/ */
public Integer getGowMapEnd(){ public void setCreateUserIdIncrement(Long createUserIdIncrement){
return this.gowMapEnd; this.createUserIdIncrement = createUserIdIncrement;
} }
/** /**
* 设置 结束 政务地图（0.否，1.是） * 获取 创建用户
* @param gowMapEnd * @return createUserIdList
*/ */
public void setGowMapEnd(Integer gowMapEnd){ public List<Long> getCreateUserIdList(){
this.gowMapEnd = gowMapEnd; return this.createUserIdList;
} }
/** /**
* 获取 增加 政务地图（0.否，1.是） * 设置 创建用户
* @return gowMapIncrement * @param createUserIdList
*/ */
public Integer getGowMapIncrement(){ public void setCreateUserIdList(List<Long> createUserIdList){
return this.gowMapIncrement; this.createUserIdList = createUserIdList;
} }
/** /**
* 设置 增加 政务地图（0.否，1.是） * 获取 创建用户
* @param gowMapIncrement * @return createUserIdNotList
*/ */
public void setGowMapIncrement(Integer gowMapIncrement){ public List<Long> getCreateUserIdNotList(){
this.gowMapIncrement = gowMapIncrement; return this.createUserIdNotList;
} }
/** /**
* 获取 政务地图（0.否，1.是） * 设置 创建用户
* @return gowMapList * @param createUserIdNotList
*/ */
public List<Integer> getGowMapList(){ public void setCreateUserIdNotList(List<Long> createUserIdNotList){
return this.gowMapList; this.createUserIdNotList = createUserIdNotList;
} }
/** /**
* 设置 政务地图（0.否，1.是） * 获取 开始 修改时间
* @param gowMapList * @return updateTimeStart
*/ */
public void setGowMapList(List<Integer> gowMapList){ public String getUpdateTimeStart(){
this.gowMapList = gowMapList; return this.updateTimeStart;
} }
/** /**
* 获取 政务地图（0.否，1.是） * 设置 开始 修改时间
* @return gowMapNotList * @param updateTimeStart
*/ */
public List<Integer> getGowMapNotList(){ public void setUpdateTimeStart(String updateTimeStart){
return this.gowMapNotList; this.updateTimeStart = updateTimeStart;
} }
/** /**
* 设置 政务地图（0.否，1.是） * 获取 结束 修改时间
* @param gowMapNotList * @return updateTimeEnd
*/ */
public void setGowMapNotList(List<Integer> gowMapNotList){ public String getUpdateTimeEnd(){
this.gowMapNotList = gowMapNotList; return this.updateTimeEnd;
} }
/**
* 设置 结束 修改时间
* @param updateTimeEnd
*/
public void setUpdateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
...@@ -2271,26 +2424,7 @@ public class SiteQuery extends SiteEntity { ...@@ -2271,26 +2424,7 @@ public class SiteQuery extends SiteEntity {
/** /**
* 设置 省编码 * 设置 区域Id
* @param proCode
*/
public SiteQuery proCode(String proCode){
setProCode(proCode);
return this;
}
/**
* 设置 省编码
* @param proCodeList
*/
public SiteQuery proCodeList(List<String> proCodeList){
this.proCodeList = proCodeList;
return this;
}
/**
* 设置 区域ID
* @param areaID * @param areaID
*/ */
public SiteQuery areaID(String areaID){ public SiteQuery areaID(String areaID){
...@@ -2299,7 +2433,7 @@ public class SiteQuery extends SiteEntity { ...@@ -2299,7 +2433,7 @@ public class SiteQuery extends SiteEntity {
} }
/** /**
* 设置 区域ID * 设置 区域Id
* @param areaIDList * @param areaIDList
*/ */
public SiteQuery areaIDList(List<String> areaIDList){ public SiteQuery areaIDList(List<String> areaIDList){
...@@ -2309,7 +2443,7 @@ public class SiteQuery extends SiteEntity { ...@@ -2309,7 +2443,7 @@ public class SiteQuery extends SiteEntity {
/** /**
* 设置 区域编码 * 设置 区域编号
* @param areaCode * @param areaCode
*/ */
public SiteQuery areaCode(String areaCode){ public SiteQuery areaCode(String areaCode){
...@@ -2318,7 +2452,7 @@ public class SiteQuery extends SiteEntity { ...@@ -2318,7 +2452,7 @@ public class SiteQuery extends SiteEntity {
} }
/** /**
* 设置 区域编码 * 设置 区域编号
* @param areaCodeList * @param areaCodeList
*/ */
public SiteQuery areaCodeList(List<String> areaCodeList){ public SiteQuery areaCodeList(List<String> areaCodeList){
...@@ -2327,6 +2461,44 @@ public class SiteQuery extends SiteEntity { ...@@ -2327,6 +2461,44 @@ public class SiteQuery extends SiteEntity {
} }
/**
* 设置 区域名称
* @param areaName
*/
public SiteQuery areaName(String areaName){
setAreaName(areaName);
return this;
}
/**
* 设置 区域名称
* @param areaNameList
*/
public SiteQuery areaNameList(List<String> areaNameList){
this.areaNameList = areaNameList;
return this;
}
/**
* 设置 省编码
* @param proCode
*/
public SiteQuery proCode(String proCode){
setProCode(proCode);
return this;
}
/**
* 设置 省编码
* @param proCodeList
*/
public SiteQuery proCodeList(List<String> proCodeList){
this.proCodeList = proCodeList;
return this;
}
/** /**
* 设置 市编码 * 设置 市编码
* @param cityCode * @param cityCode
...@@ -2498,80 +2670,8 @@ public class SiteQuery extends SiteEntity { ...@@ -2498,80 +2670,8 @@ 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.不上)
...@@ -2880,74 +2980,236 @@ public class SiteQuery extends SiteEntity { ...@@ -2880,74 +2980,236 @@ public class SiteQuery extends SiteEntity {
} }
/** /**
* 设置 周六 (1.上班，0.不上) * 设置 周六 (1.上班，0.不上)
* @param workday6List * @param workday6List
*/
public SiteQuery workday6List(List<Integer> workday6List){
this.workday6List = workday6List;
return this;
}
/**
* 设置 周六 (1.上班，0.不上)
* @param workday6NotList
*/
public SiteQuery workday6NotList(List<Integer> workday6NotList){
this.workday6NotList = workday6NotList;
return this;
}
/**
* 设置 周日 (1.上班，0.不上)
* @param workday7
*/
public SiteQuery workday7(Integer workday7){
setWorkday7(workday7);
return this;
}
/**
* 设置 开始 周日 (1.上班，0.不上)
* @param workday7Start
*/
public SiteQuery workday7Start(Integer workday7Start){
this.workday7Start = workday7Start;
return this;
}
/**
* 设置 结束 周日 (1.上班，0.不上)
* @param workday7End
*/
public SiteQuery workday7End(Integer workday7End){
this.workday7End = workday7End;
return this;
}
/**
* 设置 增加 周日 (1.上班，0.不上)
* @param workday7Increment
*/
public SiteQuery workday7Increment(Integer workday7Increment){
this.workday7Increment = workday7Increment;
return this;
}
/**
* 设置 周日 (1.上班，0.不上)
* @param workday7List
*/
public SiteQuery workday7List(List<Integer> workday7List){
this.workday7List = workday7List;
return this;
}
/**
* 设置 周日 (1.上班，0.不上)
* @param workday7NotList
*/
public SiteQuery workday7NotList(List<Integer> workday7NotList){
this.workday7NotList = workday7NotList;
return this;
}
/**
* 设置 在线取号（0.否，1.是）
* @param onlineTake
*/
public SiteQuery onlineTake(Integer onlineTake){
setOnlineTake(onlineTake);
return this;
}
/**
* 设置 开始 在线取号（0.否，1.是）
* @param onlineTakeStart
*/
public SiteQuery onlineTakeStart(Integer onlineTakeStart){
this.onlineTakeStart = onlineTakeStart;
return this;
}
/**
* 设置 结束 在线取号（0.否，1.是）
* @param onlineTakeEnd
*/
public SiteQuery onlineTakeEnd(Integer onlineTakeEnd){
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;
}
/**
* 设置 在线取号（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 workday6List(List<Integer> workday6List){ public SiteQuery appointmentList(List<Integer> appointmentList){
this.workday6List = workday6List; this.appointmentList = appointmentList;
return this; return this;
} }
/** /**
* 设置 周六 (1.上班，0.不上) * 设置 在线取号（0.否，1.是）
* @param workday6NotList * @param appointmentNotList
*/ */
public SiteQuery workday6NotList(List<Integer> workday6NotList){ public SiteQuery appointmentNotList(List<Integer> appointmentNotList){
this.workday6NotList = workday6NotList; this.appointmentNotList = appointmentNotList;
return this; return this;
} }
/** /**
* 设置 周日 (1.上班，0.不上) * 设置 在线取号（0.否，1.是）
* @param workday7 * @param gowMap
*/ */
public SiteQuery workday7(Integer workday7){ public SiteQuery gowMap(Integer gowMap){
setWorkday7(workday7); setGowMap(gowMap);
return this; return this;
} }
/** /**
* 设置 开始 周日 (1.上班，0.不上) * 设置 开始 在线取号（0.否，1.是）
* @param workday7Start * @param gowMapStart
*/ */
public SiteQuery workday7Start(Integer workday7Start){ public SiteQuery gowMapStart(Integer gowMapStart){
this.workday7Start = workday7Start; this.gowMapStart = gowMapStart;
return this; return this;
} }
/** /**
* 设置 结束 周日 (1.上班，0.不上) * 设置 结束 在线取号（0.否，1.是）
* @param workday7End * @param gowMapEnd
*/ */
public SiteQuery workday7End(Integer workday7End){ public SiteQuery gowMapEnd(Integer gowMapEnd){
this.workday7End = workday7End; this.gowMapEnd = gowMapEnd;
return this; return this;
} }
/** /**
* 设置 增加 周日 (1.上班，0.不上) * 设置 增加 在线取号（0.否，1.是）
* @param workday7Increment * @param gowMapIncrement
*/ */
public SiteQuery workday7Increment(Integer workday7Increment){ public SiteQuery gowMapIncrement(Integer gowMapIncrement){
this.workday7Increment = workday7Increment; this.gowMapIncrement = gowMapIncrement;
return this; return this;
} }
/** /**
* 设置 周日 (1.上班，0.不上) * 设置 在线取号（0.否，1.是）
* @param workday7List * @param gowMapList
*/ */
public SiteQuery workday7List(List<Integer> workday7List){ public SiteQuery gowMapList(List<Integer> gowMapList){
this.workday7List = workday7List; this.gowMapList = gowMapList;
return this; return this;
} }
/** /**
* 设置 周日 (1.上班，0.不上) * 设置 在线取号（0.否，1.是）
* @param workday7NotList * @param gowMapNotList
*/ */
public SiteQuery workday7NotList(List<Integer> workday7NotList){ public SiteQuery gowMapNotList(List<Integer> gowMapNotList){
this.workday7NotList = workday7NotList; this.gowMapNotList = gowMapNotList;
return this; return this;
} }
...@@ -3061,259 +3323,154 @@ public class SiteQuery extends SiteEntity { ...@@ -3061,259 +3323,154 @@ public class SiteQuery extends SiteEntity {
/** /**
* 设置 创建用户 * 设置 logo图片地址
* @param createUserId * @param logoPath
*/
public SiteQuery createUserId(Long createUserId){
setCreateUserId(createUserId);
return this;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
public SiteQuery createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
return this;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public SiteQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
return this;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public SiteQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
return this;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
public SiteQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
return this;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public SiteQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/**
* 设置 部署模块，逗号分隔
* @param modelIds
*/ */
public SiteQuery modelIds(String modelIds){ public SiteQuery logoPath(String logoPath){
setModelIds(modelIds); setLogoPath(logoPath);
return this; return this;
} }
/** /**
* 设置 部署模块，逗号分隔 * 设置 logo图片地址
* @param modelIdsList * @param logoPathList
*/ */
public SiteQuery modelIdsList(List<String> modelIdsList){ public SiteQuery logoPathList(List<String> logoPathList){
this.modelIdsList = modelIdsList; this.logoPathList = logoPathList;
return this; return this;
} }
/** /**
* 设置 区域名称 * 设置 英文名称
* @param areaName * @param englishName
*/
public SiteQuery areaName(String areaName){
setAreaName(areaName);
return this;
}
/**
* 设置 区域名称
* @param areaNameList
*/ */
public SiteQuery areaNameList(List<String> areaNameList){ public SiteQuery englishName(String englishName){
this.areaNameList = areaNameList; setEnglishName(englishName);
return this; return this;
} }
/** /**
* 设置 在线取号（0.否，1.是） * 设置 英文名称
* @param onlineTake * @param englishNameList
*/ */
public SiteQuery onlineTake(Integer onlineTake){ public SiteQuery englishNameList(List<String> englishNameList){
setOnlineTake(onlineTake); this.englishNameList = englishNameList;
return this; return this;
} }
/**
* 设置 开始 在线取号（0.否，1.是）
* @param onlineTakeStart
*/
public SiteQuery onlineTakeStart(Integer onlineTakeStart){
this.onlineTakeStart = onlineTakeStart;
return this;
}
/** /**
* 设置 结束 在线取号（0.否，1.是） * 设置 负责人
* @param onlineTakeEnd * @param leadingOfficial
*/ */
public SiteQuery onlineTakeEnd(Integer onlineTakeEnd){ public SiteQuery leadingOfficial(String leadingOfficial){
this.onlineTakeEnd = onlineTakeEnd; setLeadingOfficial(leadingOfficial);
return this; return this;
} }
/** /**
* 设置 增加 在线取号（0.否，1.是） * 设置 负责人
* @param onlineTakeIncrement * @param leadingOfficialList
*/ */
public SiteQuery onlineTakeIncrement(Integer onlineTakeIncrement){ public SiteQuery leadingOfficialList(List<String> leadingOfficialList){
this.onlineTakeIncrement = onlineTakeIncrement; this.leadingOfficialList = leadingOfficialList;
return this; return this;
} }
/**
* 设置 在线取号（0.否，1.是）
* @param onlineTakeList
*/
public SiteQuery onlineTakeList(List<Integer> onlineTakeList){
this.onlineTakeList = onlineTakeList;
return this;
}
/** /**
* 设置 在线取号（0.否，1.是） * 设置 联系电话
* @param onlineTakeNotList * @param leadingOfficialTelephone
*/ */
public SiteQuery onlineTakeNotList(List<Integer> onlineTakeNotList){ public SiteQuery leadingOfficialTelephone(String leadingOfficialTelephone){
this.onlineTakeNotList = onlineTakeNotList; setLeadingOfficialTelephone(leadingOfficialTelephone);
return this; return this;
} }
/** /**
* 设置 微预约（0.否，1.是） * 设置 联系电话
* @param appointment * @param leadingOfficialTelephoneList
*/ */
public SiteQuery appointment(Integer appointment){ public SiteQuery leadingOfficialTelephoneList(List<String> leadingOfficialTelephoneList){
setAppointment(appointment); this.leadingOfficialTelephoneList = leadingOfficialTelephoneList;
return this; return this;
} }
/**
* 设置 开始 微预约（0.否，1.是）
* @param appointmentStart
*/
public SiteQuery appointmentStart(Integer appointmentStart){
this.appointmentStart = appointmentStart;
return this;
}
/** /**
* 设置 结束 微预约（0.否，1.是） * 设置 部署模块，逗号分隔
* @param appointmentEnd * @param modelIds
*/ */
public SiteQuery appointmentEnd(Integer appointmentEnd){ public SiteQuery modelIds(String modelIds){
this.appointmentEnd = appointmentEnd; setModelIds(modelIds);
return this; return this;
} }
/** /**
* 设置 增加 微预约（0.否，1.是） * 设置 部署模块，逗号分隔
* @param appointmentIncrement * @param modelIdsList
*/ */
public SiteQuery appointmentIncrement(Integer appointmentIncrement){ public SiteQuery modelIdsList(List<String> modelIdsList){
this.appointmentIncrement = appointmentIncrement; this.modelIdsList = modelIdsList;
return this; return this;
} }
/**
* 设置 微预约（0.否，1.是）
* @param appointmentList
*/
public SiteQuery appointmentList(List<Integer> appointmentList){
this.appointmentList = appointmentList;
return this;
}
/** /**
* 设置 微预约（0.否，1.是） * 设置 创建用户
* @param appointmentNotList * @param createUserId
*/ */
public SiteQuery appointmentNotList(List<Integer> appointmentNotList){ public SiteQuery createUserId(Long createUserId){
this.appointmentNotList = appointmentNotList; setCreateUserId(createUserId);
return this; return this;
} }
/** /**
* 设置 政务地图（0.否，1.是） * 设置 开始 创建用户
* @param gowMap * @param createUserIdStart
*/ */
public SiteQuery gowMap(Integer gowMap){ public SiteQuery createUserIdStart(Long createUserIdStart){
setGowMap(gowMap); this.createUserIdStart = createUserIdStart;
return this; return this;
} }
/** /**
* 设置 开始 政务地图（0.否，1.是） * 设置 结束 创建用户
* @param gowMapStart * @param createUserIdEnd
*/ */
public SiteQuery gowMapStart(Integer gowMapStart){ public SiteQuery createUserIdEnd(Long createUserIdEnd){
this.gowMapStart = gowMapStart; this.createUserIdEnd = createUserIdEnd;
return this; return this;
} }
/** /**
* 设置 结束 政务地图（0.否，1.是） * 设置 增加 创建用户
* @param gowMapEnd * @param createUserIdIncrement
*/ */
public SiteQuery gowMapEnd(Integer gowMapEnd){ public SiteQuery createUserIdIncrement(Long createUserIdIncrement){
this.gowMapEnd = gowMapEnd; this.createUserIdIncrement = createUserIdIncrement;
return this; return this;
} }
/** /**
* 设置 增加 政务地图（0.否，1.是） * 设置 创建用户
* @param gowMapIncrement * @param createUserIdList
*/ */
public SiteQuery gowMapIncrement(Integer gowMapIncrement){ public SiteQuery createUserIdList(List<Long> createUserIdList){
this.gowMapIncrement = gowMapIncrement; this.createUserIdList = createUserIdList;
return this; return this;
} }
/** /**
* 设置 政务地图（0.否，1.是） * 设置 创建用户
* @param gowMapList * @param createUserIdNotList
*/ */
public SiteQuery gowMapList(List<Integer> gowMapList){ public SiteQuery createUserIdNotList(List<Long> createUserIdNotList){
this.gowMapList = gowMapList; this.createUserIdNotList = createUserIdNotList;
return this; 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 @ 7b74adc5
...@@ -8,9 +8,10 @@ ...@@ -8,9 +8,10 @@
<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" />
...@@ -31,16 +32,19 @@ ...@@ -31,16 +32,19 @@
<result property="workday5" column="workday5" /> <result property="workday5" column="workday5" />
<result property="workday6" column="workday6" /> <result property="workday6" column="workday6" />
<result property="workday7" column="workday7" /> <result property="workday7" column="workday7" />
<result property="onlineTake" column="onlineTake" />
<result property="appointment" column="appointment" />
<result property="gowMap" column="gowMap" />
<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>
...@@ -57,15 +61,18 @@ ...@@ -57,15 +61,18 @@
<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>
...@@ -126,53 +133,62 @@ ...@@ -126,53 +133,62 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workday7') or colPickMode == 1 and data.containsKey('workday7')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workday7') or colPickMode == 1 and data.containsKey('workday7')))">
a.workday7, a.workday7,
</if> </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>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('level') or colPickMode == 1 and data.containsKey('level')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('level') or colPickMode == 1 and data.containsKey('level')))">
a.level, a.level,
</if> </if>
<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('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('logoPath') or colPickMode == 1 and data.containsKey('logoPath')))">
a.createTime, a.logoPath,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('englishName') or colPickMode == 1 and data.containsKey('englishName')))">
a.createUserId, a.englishName,
</if> </if>
<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('leadingOfficial') or colPickMode == 1 and data.containsKey('leadingOfficial')))">
a.updateTime, 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>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('modelIds') or colPickMode == 1 and data.containsKey('modelIds')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('modelIds') or colPickMode == 1 and data.containsKey('modelIds')))">
a.modelIds, a.modelIds,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('areaName') or colPickMode == 1 and data.containsKey('areaName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.areaName, a.createTime,
</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>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('appointment') or colPickMode == 1 and data.containsKey('appointment')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.appointment, a.createUserId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('gowMap') or colPickMode == 1 and data.containsKey('gowMap')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.gowMap, a.updateTime,
</if> </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,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) (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,onlineTake,appointment,gowMap,level,building,logoPath,englishName,leadingOfficial,leadingOfficialTelephone,modelIds,createTime,createUserId,updateTime)
VALUES VALUES
(#{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}) (#{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},#{onlineTake},#{appointment},#{gowMap},#{level},#{building},#{logoPath},#{englishName},#{leadingOfficial},#{leadingOfficialTelephone},#{modelIds},#{createTime},#{createUserId},#{updateTime})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_site insert into mortals_sys_site
(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) (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,onlineTake,appointment,gowMap,level,building,logoPath,englishName,leadingOfficial,leadingOfficialTelephone,modelIds,createTime,createUserId,updateTime)
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.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}) (#{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.onlineTake},#{item.appointment},#{item.gowMap},#{item.level},#{item.building},#{item.logoPath},#{item.englishName},#{item.leadingOfficial},#{item.leadingOfficialTelephone},#{item.modelIds},#{item.createTime},#{item.createUserId},#{item.updateTime})
</foreach> </foreach>
</insert> </insert>
...@@ -188,15 +204,18 @@ ...@@ -188,15 +204,18 @@
<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>
...@@ -278,6 +297,24 @@ ...@@ -278,6 +297,24 @@
<if test="(colPickMode==0 and data.containsKey('workday7Increment')) or (colPickMode==1 and !data.containsKey('workday7Increment'))"> <if test="(colPickMode==0 and data.containsKey('workday7Increment')) or (colPickMode==1 and !data.containsKey('workday7Increment'))">
a.workday7=ifnull(a.workday7,0) + #{data.workday7Increment}, a.workday7=ifnull(a.workday7,0) + #{data.workday7Increment},
</if> </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>
<if test="(colPickMode==0 and data.containsKey('level')) or (colPickMode==1 and !data.containsKey('level'))"> <if test="(colPickMode==0 and data.containsKey('level')) or (colPickMode==1 and !data.containsKey('level'))">
a.level=#{data.level}, a.level=#{data.level},
</if> </if>
...@@ -290,6 +327,21 @@ ...@@ -290,6 +327,21 @@
<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>
...@@ -302,30 +354,6 @@ ...@@ -302,30 +354,6 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('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
...@@ -352,13 +380,6 @@ ...@@ -352,13 +380,6 @@
</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'))">
...@@ -373,6 +394,20 @@ ...@@ -373,6 +394,20 @@
</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'))">
...@@ -548,6 +583,42 @@ ...@@ -548,6 +583,42 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="onlineTake=(case" suffix="ELSE onlineTake end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('onlineTake')) or (colPickMode==1 and !item.containsKey('onlineTake'))">
when a.id=#{item.id} then #{item.onlineTake}
</when>
<when test="(colPickMode==0 and item.containsKey('onlineTakeIncrement')) or (colPickMode==1 and !item.containsKey('onlineTakeIncrement'))">
when a.id=#{item.id} then ifnull(a.onlineTake,0) + #{item.onlineTakeIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="appointment=(case" suffix="ELSE appointment end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('appointment')) or (colPickMode==1 and !item.containsKey('appointment'))">
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>
</trim>
<trim prefix="level=(case" suffix="ELSE level end),"> <trim prefix="level=(case" suffix="ELSE level end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
...@@ -572,80 +643,65 @@ ...@@ -572,80 +643,65 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),"> <trim prefix="logoPath=(case" suffix="ELSE logoPath 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('logoPath')) or (colPickMode==1 and !item.containsKey('logoPath'))">
when a.id=#{item.id} then #{item.createTime} when a.id=#{item.id} then #{item.logoPath}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),"> <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="" >
<choose> <if test="(colPickMode==0 and item.containsKey('englishName')) or (colPickMode==1 and !item.containsKey('englishName'))">
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))"> when a.id=#{item.id} then #{item.englishName}
when a.id=#{item.id} then #{item.createUserId} </if>
</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="updateTime=(case" suffix="ELSE updateTime end),"> <trim prefix="leadingOfficial=(case" suffix="ELSE leadingOfficial end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))"> <if test="(colPickMode==0 and item.containsKey('leadingOfficial')) or (colPickMode==1 and !item.containsKey('leadingOfficial'))">
when a.id=#{item.id} then #{item.updateTime} when a.id=#{item.id} then #{item.leadingOfficial}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="modelIds=(case" suffix="ELSE modelIds end),"> <trim prefix="leadingOfficialTelephone=(case" suffix="ELSE leadingOfficialTelephone 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('modelIds')) or (colPickMode==1 and !item.containsKey('modelIds'))"> <if test="(colPickMode==0 and item.containsKey('leadingOfficialTelephone')) or (colPickMode==1 and !item.containsKey('leadingOfficialTelephone'))">
when a.id=#{item.id} then #{item.modelIds} when a.id=#{item.id} then #{item.leadingOfficialTelephone}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="areaName=(case" suffix="ELSE areaName end),"> <trim prefix="modelIds=(case" suffix="ELSE modelIds 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('areaName')) or (colPickMode==1 and !item.containsKey('areaName'))"> <if test="(colPickMode==0 and item.containsKey('modelIds')) or (colPickMode==1 and !item.containsKey('modelIds'))">
when a.id=#{item.id} then #{item.areaName} when a.id=#{item.id} then #{item.modelIds}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="onlineTake=(case" suffix="ELSE onlineTake end),"> <trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
<when test="(colPickMode==0 and item.containsKey('onlineTake')) or (colPickMode==1 and !item.containsKey('onlineTake'))"> when a.id=#{item.id} then #{item.createTime}
when a.id=#{item.id} then #{item.onlineTake} </if>
</when>
<when test="(colPickMode==0 and item.containsKey('onlineTakeIncrement')) or (colPickMode==1 and !item.containsKey('onlineTakeIncrement'))">
when a.id=#{item.id} then ifnull(a.onlineTake,0) + #{item.onlineTakeIncrement}
</when>
</choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="appointment=(case" suffix="ELSE appointment 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="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('appointment')) or (colPickMode==1 and !item.containsKey('appointment'))"> <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
when a.id=#{item.id} then #{item.appointment} when a.id=#{item.id} then #{item.createUserId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('appointmentIncrement')) or (colPickMode==1 and !item.containsKey('appointmentIncrement'))"> <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.appointment,0) + #{item.appointmentIncrement} when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="gowMap=(case" suffix="ELSE gowMap 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="" >
<choose> <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
<when test="(colPickMode==0 and item.containsKey('gowMap')) or (colPickMode==1 and !item.containsKey('gowMap'))"> when a.id=#{item.id} then #{item.updateTime}
when a.id=#{item.id} then #{item.gowMap} </if>
</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>
...@@ -834,27 +890,6 @@ ...@@ -834,27 +890,6 @@
</foreach> </foreach>
</if> </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 != ''">
${_conditionType_} a.areaID like #{${_conditionParam_}.areaID} ${_conditionType_} a.areaID like #{${_conditionParam_}.areaID}
...@@ -897,11 +932,53 @@ ...@@ -897,11 +932,53 @@
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('cityCode')"> <if test="conditionParamRef.containsKey('areaName')">
<if test="conditionParamRef.cityCode != null and conditionParamRef.cityCode != ''"> <if test="conditionParamRef.areaName != null and conditionParamRef.areaName != ''">
${_conditionType_} a.cityCode like #{${_conditionParam_}.cityCode} ${_conditionType_} a.areaName like #{${_conditionParam_}.areaName}
</if> </if>
<if test="conditionParamRef.cityCode == null"> <if test="conditionParamRef.areaName == null">
${_conditionType_} a.areaName is null
</if>
</if>
<if test="conditionParamRef.containsKey('areaNameList') and conditionParamRef.areaNameList.size() > 0">
${_conditionType_} a.areaName in
<foreach collection="conditionParamRef.areaNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('areaNameNotList') and conditionParamRef.areaNameNotList.size() > 0">
${_conditionType_} a.areaName not in
<foreach collection="conditionParamRef.areaNameNotList" 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('cityCode')">
<if test="conditionParamRef.cityCode != null and conditionParamRef.cityCode != ''">
${_conditionType_} a.cityCode like #{${_conditionParam_}.cityCode}
</if>
<if test="conditionParamRef.cityCode == null">
${_conditionType_} a.cityCode is null ${_conditionType_} a.cityCode is null
</if> </if>
</if> </if>
...@@ -1087,87 +1164,63 @@ ...@@ -1087,87 +1164,63 @@
</if> </if>
<if test="conditionParamRef.containsKey('amWorkStartTime')"> <if test="conditionParamRef.containsKey('amWorkStartTime')">
<if test="conditionParamRef.amWorkStartTime != null and conditionParamRef.amWorkStartTime != ''"> <if test="conditionParamRef.amWorkStartTime != null ">
${_conditionType_} a.amWorkStartTime like #{${_conditionParam_}.amWorkStartTime} ${_conditionType_} a.amWorkStartTime = #{${_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('amWorkStartTimeList') and conditionParamRef.amWorkStartTimeList.size() > 0"> <if test="conditionParamRef.containsKey('amWorkStartTimeStart') and conditionParamRef.amWorkStartTimeStart != null and conditionParamRef.amWorkStartTimeStart!=''">
${_conditionType_} a.amWorkStartTime in ${_conditionType_} a.amWorkStartTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.amWorkStartTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
<foreach collection="conditionParamRef.amWorkStartTimeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('amWorkStartTimeNotList') and conditionParamRef.amWorkStartTimeNotList.size() > 0"> <if test="conditionParamRef.containsKey('amWorkStartTimeEnd') and conditionParamRef.amWorkStartTimeEnd != null and conditionParamRef.amWorkStartTimeEnd!=''">
${_conditionType_} a.amWorkStartTime not in ${_conditionType_} a.amWorkStartTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.amWorkStartTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
<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 and conditionParamRef.amWorkEndTime != ''"> <if test="conditionParamRef.amWorkEndTime != null ">
${_conditionType_} a.amWorkEndTime like #{${_conditionParam_}.amWorkEndTime} ${_conditionType_} a.amWorkEndTime = #{${_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('amWorkEndTimeList') and conditionParamRef.amWorkEndTimeList.size() > 0"> <if test="conditionParamRef.containsKey('amWorkEndTimeStart') and conditionParamRef.amWorkEndTimeStart != null and conditionParamRef.amWorkEndTimeStart!=''">
${_conditionType_} a.amWorkEndTime in ${_conditionType_} a.amWorkEndTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.amWorkEndTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
<foreach collection="conditionParamRef.amWorkEndTimeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('amWorkEndTimeNotList') and conditionParamRef.amWorkEndTimeNotList.size() > 0"> <if test="conditionParamRef.containsKey('amWorkEndTimeEnd') and conditionParamRef.amWorkEndTimeEnd != null and conditionParamRef.amWorkEndTimeEnd!=''">
${_conditionType_} a.amWorkEndTime not in ${_conditionType_} a.amWorkEndTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.amWorkEndTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
<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 and conditionParamRef.pmWorkStartTime != ''"> <if test="conditionParamRef.pmWorkStartTime != null ">
${_conditionType_} a.pmWorkStartTime like #{${_conditionParam_}.pmWorkStartTime} ${_conditionType_} a.pmWorkStartTime = #{${_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('pmWorkStartTimeList') and conditionParamRef.pmWorkStartTimeList.size() > 0"> <if test="conditionParamRef.containsKey('pmWorkStartTimeStart') and conditionParamRef.pmWorkStartTimeStart != null and conditionParamRef.pmWorkStartTimeStart!=''">
${_conditionType_} a.pmWorkStartTime in ${_conditionType_} a.pmWorkStartTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.pmWorkStartTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
<foreach collection="conditionParamRef.pmWorkStartTimeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('pmWorkStartTimeNotList') and conditionParamRef.pmWorkStartTimeNotList.size() > 0"> <if test="conditionParamRef.containsKey('pmWorkStartTimeEnd') and conditionParamRef.pmWorkStartTimeEnd != null and conditionParamRef.pmWorkStartTimeEnd!=''">
${_conditionType_} a.pmWorkStartTime not in ${_conditionType_} a.pmWorkStartTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.pmWorkStartTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
<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 and conditionParamRef.pmWorkEndTime != ''"> <if test="conditionParamRef.pmWorkEndTime != null ">
${_conditionType_} a.pmWorkEndTime like #{${_conditionParam_}.pmWorkEndTime} ${_conditionType_} a.pmWorkEndTime = #{${_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('pmWorkEndTimeList') and conditionParamRef.pmWorkEndTimeList.size() > 0"> <if test="conditionParamRef.containsKey('pmWorkEndTimeStart') and conditionParamRef.pmWorkEndTimeStart != null and conditionParamRef.pmWorkEndTimeStart!=''">
${_conditionType_} a.pmWorkEndTime in ${_conditionType_} a.pmWorkEndTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.pmWorkEndTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
<foreach collection="conditionParamRef.pmWorkEndTimeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('pmWorkEndTimeNotList') and conditionParamRef.pmWorkEndTimeNotList.size() > 0"> <if test="conditionParamRef.containsKey('pmWorkEndTimeEnd') and conditionParamRef.pmWorkEndTimeEnd != null and conditionParamRef.pmWorkEndTimeEnd!=''">
${_conditionType_} a.pmWorkEndTime not in ${_conditionType_} a.pmWorkEndTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.pmWorkEndTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
<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 ">
...@@ -1358,6 +1411,87 @@ ...@@ -1358,6 +1411,87 @@
${_conditionType_} a.workday7 <![CDATA[ <= ]]> #{${_conditionParam_}.workday7End} ${_conditionType_} a.workday7 <![CDATA[ <= ]]> #{${_conditionParam_}.workday7End}
</if> </if>
<if test="conditionParamRef.containsKey('onlineTake')">
<if test="conditionParamRef.onlineTake != null ">
${_conditionType_} a.onlineTake = #{${_conditionParam_}.onlineTake}
</if>
<if test="conditionParamRef.onlineTake == null">
${_conditionType_} a.onlineTake is null
</if>
</if>
<if test="conditionParamRef.containsKey('onlineTakeList') and conditionParamRef.onlineTakeList.size() > 0">
${_conditionType_} a.onlineTake in
<foreach collection="conditionParamRef.onlineTakeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('onlineTakeNotList') and conditionParamRef.onlineTakeNotList.size() > 0">
${_conditionType_} a.onlineTake not in
<foreach collection="conditionParamRef.onlineTakeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('onlineTakeStart') and conditionParamRef.onlineTakeStart != null">
${_conditionType_} a.onlineTake <![CDATA[ >= ]]> #{${_conditionParam_}.onlineTakeStart}
</if>
<if test="conditionParamRef.containsKey('onlineTakeEnd') and conditionParamRef.onlineTakeEnd != null">
${_conditionType_} a.onlineTake <![CDATA[ <= ]]> #{${_conditionParam_}.onlineTakeEnd}
</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('gowMap')">
<if test="conditionParamRef.gowMap != null ">
${_conditionType_} a.gowMap = #{${_conditionParam_}.gowMap}
</if>
<if test="conditionParamRef.gowMap == null">
${_conditionType_} a.gowMap is null
</if>
</if>
<if test="conditionParamRef.containsKey('gowMapList') and conditionParamRef.gowMapList.size() > 0">
${_conditionType_} a.gowMap in
<foreach collection="conditionParamRef.gowMapList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('gowMapNotList') and conditionParamRef.gowMapNotList.size() > 0">
${_conditionType_} a.gowMap not in
<foreach collection="conditionParamRef.gowMapNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</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>
<if test="conditionParamRef.containsKey('level')"> <if test="conditionParamRef.containsKey('level')">
<if test="conditionParamRef.level != null "> <if test="conditionParamRef.level != null ">
${_conditionType_} a.level = #{${_conditionParam_}.level} ${_conditionType_} a.level = #{${_conditionParam_}.level}
...@@ -1413,61 +1547,88 @@ ...@@ -1413,61 +1547,88 @@
</if> </if>
<if test="conditionParamRef.containsKey('createTime')"> <if test="conditionParamRef.containsKey('logoPath')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.logoPath != null and conditionParamRef.logoPath != ''">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime} ${_conditionType_} a.logoPath like #{${_conditionParam_}.logoPath}
</if> </if>
<if test="conditionParamRef.createTime == null"> <if test="conditionParamRef.logoPath == null">
${_conditionType_} a.createTime is null ${_conditionType_} a.logoPath is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''"> <if test="conditionParamRef.containsKey('logoPathList') and conditionParamRef.logoPathList.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.logoPath in
<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('logoPathNotList') and conditionParamRef.logoPathNotList.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.logoPath not in
<foreach collection="conditionParamRef.logoPathNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null "> <if test="conditionParamRef.containsKey('englishName')">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId} <if test="conditionParamRef.englishName != null and conditionParamRef.englishName != ''">
${_conditionType_} a.englishName like #{${_conditionParam_}.englishName}
</if> </if>
<if test="conditionParamRef.createUserId == null"> <if test="conditionParamRef.englishName == null">
${_conditionType_} a.createUserId is null ${_conditionType_} a.englishName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0"> <if test="conditionParamRef.containsKey('englishNameList') and conditionParamRef.englishNameList.size() > 0">
${_conditionType_} a.createUserId in ${_conditionType_} a.englishName in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.englishNameList" 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('englishNameNotList') and conditionParamRef.englishNameNotList.size() > 0">
${_conditionType_} a.createUserId not in ${_conditionType_} a.englishName not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.englishNameNotList" 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 test="conditionParamRef.containsKey('leadingOfficial')">
<if test="conditionParamRef.leadingOfficial != null and conditionParamRef.leadingOfficial != ''">
${_conditionType_} a.leadingOfficial like #{${_conditionParam_}.leadingOfficial}
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null"> <if test="conditionParamRef.leadingOfficial == null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd} ${_conditionType_} a.leadingOfficial is null
</if>
</if>
<if test="conditionParamRef.containsKey('leadingOfficialList') and conditionParamRef.leadingOfficialList.size() > 0">
${_conditionType_} a.leadingOfficial in
<foreach collection="conditionParamRef.leadingOfficialList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('leadingOfficialNotList') and conditionParamRef.leadingOfficialNotList.size() > 0">
${_conditionType_} a.leadingOfficial not in
<foreach collection="conditionParamRef.leadingOfficialNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<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.updateTime == null"> <if test="conditionParamRef.leadingOfficialTelephone == null">
${_conditionType_} a.updateTime is null ${_conditionType_} a.leadingOfficialTelephone is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''"> <if test="conditionParamRef.containsKey('leadingOfficialTelephoneList') and conditionParamRef.leadingOfficialTelephoneList.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.leadingOfficialTelephone in
<foreach collection="conditionParamRef.leadingOfficialTelephoneList" 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('leadingOfficialTelephoneNotList') and conditionParamRef.leadingOfficialTelephoneNotList.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.leadingOfficialTelephone not in
<foreach collection="conditionParamRef.leadingOfficialTelephoneNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('modelIds')"> <if test="conditionParamRef.containsKey('modelIds')">
...@@ -1491,107 +1652,62 @@ ...@@ -1491,107 +1652,62 @@
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('areaName')"> <if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.areaName != null and conditionParamRef.areaName != ''"> <if test="conditionParamRef.createTime != null ">
${_conditionType_} a.areaName like #{${_conditionParam_}.areaName} ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</if> </if>
<if test="conditionParamRef.areaName == null"> <if test="conditionParamRef.createTime == null">
${_conditionType_} a.areaName is null ${_conditionType_} a.createTime is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('areaNameList') and conditionParamRef.areaNameList.size() > 0"> <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.areaName 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.areaNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('areaNameNotList') and conditionParamRef.areaNameNotList.size() > 0"> <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.areaName not in ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
<foreach collection="conditionParamRef.areaNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('onlineTake')"> <if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.onlineTake != null "> <if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.onlineTake = #{${_conditionParam_}.onlineTake} ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if> </if>
<if test="conditionParamRef.onlineTake == null"> <if test="conditionParamRef.createUserId == null">
${_conditionType_} a.onlineTake is null ${_conditionType_} a.createUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('onlineTakeList') and conditionParamRef.onlineTakeList.size() > 0"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.onlineTake in ${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.onlineTakeList" 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('onlineTakeNotList') and conditionParamRef.onlineTakeNotList.size() > 0"> <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.onlineTake not in ${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.onlineTakeNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('onlineTakeStart') and conditionParamRef.onlineTakeStart != null"> <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.onlineTake <![CDATA[ >= ]]> #{${_conditionParam_}.onlineTakeStart} ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if> </if>
<if test="conditionParamRef.containsKey('onlineTakeEnd') and conditionParamRef.onlineTakeEnd != null"> <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
${_conditionType_} a.onlineTake <![CDATA[ <= ]]> #{${_conditionParam_}.onlineTakeEnd} ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
</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('gowMap')"> <if test="conditionParamRef.containsKey('updateTime')">
<if test="conditionParamRef.gowMap != null "> <if test="conditionParamRef.updateTime != null ">
${_conditionType_} a.gowMap = #{${_conditionParam_}.gowMap} ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
</if>
<if test="conditionParamRef.gowMap == null">
${_conditionType_} a.gowMap is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('gowMapList') and conditionParamRef.gowMapList.size() > 0"> <if test="conditionParamRef.updateTime == null">
${_conditionType_} a.gowMap in ${_conditionType_} a.updateTime is null
<foreach collection="conditionParamRef.gowMapList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('gowMapNotList') and conditionParamRef.gowMapNotList.size() > 0">
${_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"> <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
${_conditionType_} a.gowMap <![CDATA[ >= ]]> #{${_conditionParam_}.gowMapStart} ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('gowMapEnd') and conditionParamRef.gowMapEnd != null"> <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.gowMap <![CDATA[ <= ]]> #{${_conditionParam_}.gowMapEnd} ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -1620,11 +1736,6 @@ ...@@ -1620,11 +1736,6 @@
<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>
...@@ -1635,6 +1746,16 @@ ...@@ -1635,6 +1746,16 @@
<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>
...@@ -1735,6 +1856,21 @@ ...@@ -1735,6 +1856,21 @@
<if test='orderCol.workday7 != null and "DESC".equalsIgnoreCase(orderCol.workday7)'>DESC</if> <if test='orderCol.workday7 != null and "DESC".equalsIgnoreCase(orderCol.workday7)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('onlineTake')">
a.onlineTake
<if test='orderCol.onlineTake != null and "DESC".equalsIgnoreCase(orderCol.onlineTake)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('appointment')">
a.appointment
<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 test="orderCol.containsKey('level')"> <if test="orderCol.containsKey('level')">
a.level a.level
<if test='orderCol.level != null and "DESC".equalsIgnoreCase(orderCol.level)'>DESC</if> <if test='orderCol.level != null and "DESC".equalsIgnoreCase(orderCol.level)'>DESC</if>
...@@ -1745,19 +1881,24 @@ ...@@ -1745,19 +1881,24 @@
<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('createTime')"> <if test="orderCol.containsKey('logoPath')">
a.createTime a.logoPath
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if> <if test='orderCol.logoPath != null and "DESC".equalsIgnoreCase(orderCol.logoPath)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createUserId')"> <if test="orderCol.containsKey('englishName')">
a.createUserId a.englishName
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if> <if test='orderCol.englishName != null and "DESC".equalsIgnoreCase(orderCol.englishName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('updateTime')"> <if test="orderCol.containsKey('leadingOfficial')">
a.updateTime a.leadingOfficial
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.leadingOfficial != null and "DESC".equalsIgnoreCase(orderCol.leadingOfficial)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('leadingOfficialTelephone')">
a.leadingOfficialTelephone
<if test='orderCol.leadingOfficialTelephone != null and "DESC".equalsIgnoreCase(orderCol.leadingOfficialTelephone)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('modelIds')"> <if test="orderCol.containsKey('modelIds')">
...@@ -1765,24 +1906,19 @@ ...@@ -1765,24 +1906,19 @@
<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('areaName')"> <if test="orderCol.containsKey('createTime')">
a.areaName a.createTime
<if test='orderCol.areaName != null and "DESC".equalsIgnoreCase(orderCol.areaName)'>DESC</if> <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('onlineTake')">
a.onlineTake
<if test='orderCol.onlineTake != null and "DESC".equalsIgnoreCase(orderCol.onlineTake)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('appointment')"> <if test="orderCol.containsKey('createUserId')">
a.appointment a.createUserId
<if test='orderCol.appointment != null and "DESC".equalsIgnoreCase(orderCol.appointment)'>DESC</if> <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('gowMap')"> <if test="orderCol.containsKey('updateTime')">
a.gowMap a.updateTime
<if test='orderCol.gowMap != null and "DESC".equalsIgnoreCase(orderCol.gowMap)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>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