Skip to content

S
smart_gov_platform
Commit 90b63ba0 authored by 赵啸非's avatar 赵啸非
Browse files
Options

添加站点基础名称和logo字段

parent cdcf911f
Hide whitespace changes
Inline Side-by-side
Showing with 520 additions and 1558 deletions
base-manager/db/base_modules.sql
View file @ 90b63ba0
......@@ -49,29 +49,25 @@ CREATE TABLE `mortals_sys_area` (
DROP TABLE IF EXISTS `mortals_sys_site`;
CREATE TABLE mortals_sys_site(
`id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长',
`siteName` varchar(64) COMMENT '站点名称',
`parentId` bigint(20) COMMENT '父级id,默认0',
`ancestors` varchar(255) COMMENT '祖级列表，逗号分隔',
`regionCode` varchar(32) COMMENT '区域编号',
`iid` varchar(32) COMMENT '标识ID',
`siteName` varchar(255) COMMENT '站点名称',
`siteCode` varchar(64) COMMENT '站点编号',
`areaID` varchar(32) COMMENT '区域Id',
`areaCode` varchar(32) COMMENT '区域编号',
`areaName` varchar(32) COMMENT '区域名称',
`proCode` varchar(32) COMMENT '省编码',
`areaCode` varchar(32) COMMENT '区编码',
`cityCode` varchar(32) COMMENT '市编码',
`districtCode` varchar(32) COMMENT '区编码',
`siteIp` varchar(32) COMMENT '站点服务器ip',
`sitePort` varchar(8) COMMENT '站点服务器端口',
`longitude` varchar(32) COMMENT '经度',
`latitude` varchar(32) COMMENT '纬度',
`haveSonArea` char(5) COMMENT '是否有下级(0.否，1.是)',
`siteTel` varchar(32) COMMENT '中心联系电话',
`detailAddress` varchar(255) COMMENT '中心详细地址',
`siteRemark` varchar(255) COMMENT '中心介绍',
`amWorkStartTime` varchar(32) COMMENT '上午上班开始时间',
`amWorkEndTime` varchar(32) COMMENT '上午上班结束时间',
`pmWorkStartTime` varchar(32) COMMENT '下午上班开始时间',
`pmWorkEndTime` varchar(32) COMMENT '下午上班结束时间',
`averageTime` int(5) COMMENT '平均等待时间,后期删除',
`waitingNumber` int(5) COMMENT '等待人数,后期删除',
`siteRemark` text COMMENT '中心介绍',
`amWorkStartTime` datetime COMMENT '上午上班开始时间',
`amWorkEndTime` datetime COMMENT '上午上班结束时间',
`pmWorkStartTime` datetime COMMENT '下午上班开始时间',
`pmWorkEndTime` datetime COMMENT '下午上班结束时间',
`workday1` tinyint(2) COMMENT '周一 (1.上班，0.不上)',
`workday2` tinyint(2) COMMENT '周二 (1.上班，0.不上)',
`workday3` tinyint(2) COMMENT '周三 (1.上班，0.不上)',
......@@ -79,16 +75,14 @@ CREATE TABLE mortals_sys_site(
`workday5` tinyint(2) COMMENT '周五 (1.上班，0.不上)',
`workday6` tinyint(2) COMMENT '周六 (1.上班，0.不上)',
`workday7` tinyint(2) COMMENT '周日 (1.上班，0.不上)',
`level` tinyint(2) COMMENT '楼层',
`building` tinyint(4) COMMENT '楼栋',
`isSite` tinyint(2) COMMENT '是否是站点 (1.是,0.否)',
`status` tinyint(2) COMMENT '站点状态 (0.停用，1.正常)',
`logoPath` varchar(32) COMMENT '设备logo地址',
`englishName` varchar(32) COMMENT '站点英文名称',
`level` int(4) COMMENT '楼层',
`building` int(4) COMMENT '楼栋',
`logoPath` varchar(255) COMMENT 'logo图片地址',
`englishName` varchar(255) COMMENT '英文名称',
`modelIds` varchar(256) COMMENT '部署模块，逗号分隔',
`createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户',
`updateTime` datetime COMMENT '修改时间',
`modelIds` varchar(256) COMMENT '部署模块，逗号分隔',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='站点';
......
base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteEntity.java
View file @ 90b63ba0
package com.mortals.xhx.module.site.model;
import java.util.Date;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
......@@ -21,37 +22,33 @@ public class SiteEntity extends SiteVo {
*/
private String siteName;
/**
* 父级id,默认0
* 站点编号
*/
private Long parentId;
private String siteCode;
/**
* 祖级列表，逗号分隔
* 区域Id
*/
private String ancestors;
private String areaID;
/**
* 区域编号
*/
private String regionCode;
/**
* 标识ID
*/
private String iid;
private String areaCode;
/**
* 站点编号
* 区域名称
*/
private String siteCode;
private String areaName;
/**
* 省编码
*/
private String proCode;
/**
* 区编码
*/
private String areaCode;
/**
* 市编码
*/
private String cityCode;
/**
* 区编码
*/
private String districtCode;
/**
* 站点服务器ip
*/
......@@ -68,10 +65,6 @@ public class SiteEntity extends SiteVo {
* 纬度
*/
private String latitude;
/**
* 是否有下级(0.否，1.是)
*/
private String haveSonArea;
/**
* 中心联系电话
*/
......@@ -87,27 +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 Integer averageTime;
/**
* 等待人数,后期删除
*/
private Integer waitingNumber;
private Date pmWorkEndTime;
/**
* 周一 (1.上班，0.不上)
*/
......@@ -145,19 +130,11 @@ public class SiteEntity extends SiteVo {
*/
private Integer building;
/**
* 是否是站点 (1.是,0.否)
*/
private Integer isSite;
/**
* 站点状态 (0.停用，1.正常)
*/
private Integer status;
/**
* 设备logo地址
* logo图片地址
*/
private String logoPath;
/**
* 站点英文名称
* 英文名称
*/
private String englishName;
/**
......@@ -183,74 +160,60 @@ public class SiteEntity extends SiteVo {
this.siteName = siteName;
}
/**
* 获取 父级id,默认0
* @return Long
* 获取 站点编号
* @return String
*/
public Long getParentId(){
return parentId;
public String getSiteCode(){
return siteCode;
}
/**
* 设置 父级id,默认0
* @param parentId
* 设置 站点编号
* @param siteCode
*/
public void setParentId(Long parentId){
this.parentId = parentId;
public void setSiteCode(String siteCode){
this.siteCode = siteCode;
}
/**
* 获取 祖级列表，逗号分隔
* 获取 区域Id
* @return String
*/
public String getAncestors(){
return ancestors;
public String getAreaID(){
return areaID;
}
/**
* 设置 祖级列表，逗号分隔
* @param ancestors
* 设置 区域Id
* @param areaID
*/
public void setAncestors(String ancestors){
this.ancestors = ancestors;
public void setAreaID(String areaID){
this.areaID = areaID;
}
/**
* 获取 区域编号
* @return String
*/
public String getRegionCode(){
return regionCode;
public String getAreaCode(){
return areaCode;
}
/**
* 设置 区域编号
* @param regionCode
*/
public void setRegionCode(String regionCode){
this.regionCode = regionCode;
}
/**
* 获取 标识ID
* @return String
*/
public String getIid(){
return iid;
}
/**
* 设置 标识ID
* @param iid
* @param areaCode
*/
public void setIid(String iid){
this.iid = iid;
public void setAreaCode(String areaCode){
this.areaCode = areaCode;
}
/**
* 获取 站点编号
* 获取 区域名称
* @return String
*/
public String getSiteCode(){
return siteCode;
public String getAreaName(){
return areaName;
}
/**
* 设置 站点编号
* @param siteCode
* 设置 区域名称
* @param areaName
*/
public void setSiteCode(String siteCode){
this.siteCode = siteCode;
public void setAreaName(String areaName){
this.areaName = areaName;
}
/**
* 获取 省编码
......@@ -266,20 +229,6 @@ public class SiteEntity extends SiteVo {
public void setProCode(String proCode){
this.proCode = proCode;
}
/**
* 获取 区编码
* @return String
*/
public String getAreaCode(){
return areaCode;
}
/**
* 设置 区编码
* @param areaCode
*/
public void setAreaCode(String areaCode){
this.areaCode = areaCode;
}
/**
* 获取 市编码
* @return String
......@@ -294,6 +243,20 @@ public class SiteEntity extends SiteVo {
public void setCityCode(String cityCode){
this.cityCode = cityCode;
}
/**
* 获取 区编码
* @return String
*/
public String getDistrictCode(){
return districtCode;
}
/**
* 设置 区编码
* @param districtCode
*/
public void setDistrictCode(String districtCode){
this.districtCode = districtCode;
}
/**
* 获取 站点服务器ip
* @return String
......@@ -350,20 +313,6 @@ public class SiteEntity extends SiteVo {
public void setLatitude(String latitude){
this.latitude = latitude;
}
/**
* 获取 是否有下级(0.否，1.是)
* @return String
*/
public String getHaveSonArea(){
return haveSonArea;
}
/**
* 设置 是否有下级(0.否，1.是)
* @param haveSonArea
*/
public void setHaveSonArea(String haveSonArea){
this.haveSonArea = haveSonArea;
}
/**
* 获取 中心联系电话
* @return String
......@@ -408,88 +357,60 @@ public class SiteEntity extends SiteVo {
}
/**
* 获取 上午上班开始时间
* @return String
* @return Date
*/
public String getAmWorkStartTime(){
public Date getAmWorkStartTime(){
return amWorkStartTime;
}
/**
* 设置 上午上班开始时间
* @param amWorkStartTime
*/
public void setAmWorkStartTime(String amWorkStartTime){
public void setAmWorkStartTime(Date amWorkStartTime){
this.amWorkStartTime = amWorkStartTime;
}
/**
* 获取 上午上班结束时间
* @return String
* @return Date
*/
public String getAmWorkEndTime(){
public Date getAmWorkEndTime(){
return amWorkEndTime;
}
/**
* 设置 上午上班结束时间
* @param amWorkEndTime
*/
public void setAmWorkEndTime(String amWorkEndTime){
public void setAmWorkEndTime(Date amWorkEndTime){
this.amWorkEndTime = amWorkEndTime;
}
/**
* 获取 下午上班开始时间
* @return String
* @return Date
*/
public String getPmWorkStartTime(){
public Date getPmWorkStartTime(){
return pmWorkStartTime;
}
/**
* 设置 下午上班开始时间
* @param pmWorkStartTime
*/
public void setPmWorkStartTime(String pmWorkStartTime){
public void setPmWorkStartTime(Date pmWorkStartTime){
this.pmWorkStartTime = pmWorkStartTime;
}
/**
* 获取 下午上班结束时间
* @return String
* @return Date
*/
public String getPmWorkEndTime(){
public Date getPmWorkEndTime(){
return pmWorkEndTime;
}
/**
* 设置 下午上班结束时间
* @param pmWorkEndTime
*/
public void setPmWorkEndTime(String pmWorkEndTime){
public void setPmWorkEndTime(Date pmWorkEndTime){
this.pmWorkEndTime = pmWorkEndTime;
}
/**
* 获取 平均等待时间,后期删除
* @return Integer
*/
public Integer getAverageTime(){
return averageTime;
}
/**
* 设置 平均等待时间,后期删除
* @param averageTime
*/
public void setAverageTime(Integer averageTime){
this.averageTime = averageTime;
}
/**
* 获取 等待人数,后期删除
* @return Integer
*/
public Integer getWaitingNumber(){
return waitingNumber;
}
/**
* 设置 等待人数,后期删除
* @param waitingNumber
*/
public void setWaitingNumber(Integer waitingNumber){
this.waitingNumber = waitingNumber;
}
/**
* 获取 周一 (1.上班，0.不上)
* @return Integer
......@@ -617,56 +538,28 @@ public class SiteEntity extends SiteVo {
this.building = building;
}
/**
* 获取 是否是站点 (1.是,0.否)
* @return Integer
*/
public Integer getIsSite(){
return isSite;
}
/**
* 设置 是否是站点 (1.是,0.否)
* @param isSite
*/
public void setIsSite(Integer isSite){
this.isSite = isSite;
}
/**
* 获取 站点状态 (0.停用，1.正常)
* @return Integer
*/
public Integer getStatus(){
return status;
}
/**
* 设置 站点状态 (0.停用，1.正常)
* @param status
*/
public void setStatus(Integer status){
this.status = status;
}
/**
* 获取 设备logo地址
* 获取 logo图片地址
* @return String
*/
public String getLogoPath(){
return logoPath;
}
/**
* 设置 设备logo地址
* 设置 logo图片地址
* @param logoPath
*/
public void setLogoPath(String logoPath){
this.logoPath = logoPath;
}
/**
* 获取 站点英文名称
* 获取 英文名称
* @return String
*/
public String getEnglishName(){
return englishName;
}
/**
* 设置 站点英文名称
* 设置 英文名称
* @param englishName
*/
public void setEnglishName(String englishName){
......@@ -709,19 +602,17 @@ public class SiteEntity extends SiteVo {
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",siteName:").append(getSiteName());
sb.append(",parentId:").append(getParentId());
sb.append(",ancestors:").append(getAncestors());
sb.append(",regionCode:").append(getRegionCode());
sb.append(",iid:").append(getIid());
sb.append(",siteCode:").append(getSiteCode());
sb.append(",proCode:").append(getProCode());
sb.append(",areaID:").append(getAreaID());
sb.append(",areaCode:").append(getAreaCode());
sb.append(",areaName:").append(getAreaName());
sb.append(",proCode:").append(getProCode());
sb.append(",cityCode:").append(getCityCode());
sb.append(",districtCode:").append(getDistrictCode());
sb.append(",siteIp:").append(getSiteIp());
sb.append(",sitePort:").append(getSitePort());
sb.append(",longitude:").append(getLongitude());
sb.append(",latitude:").append(getLatitude());
sb.append(",haveSonArea:").append(getHaveSonArea());
sb.append(",siteTel:").append(getSiteTel());
sb.append(",detailAddress:").append(getDetailAddress());
sb.append(",siteRemark:").append(getSiteRemark());
......@@ -729,8 +620,6 @@ public class SiteEntity extends SiteVo {
sb.append(",amWorkEndTime:").append(getAmWorkEndTime());
sb.append(",pmWorkStartTime:").append(getPmWorkStartTime());
sb.append(",pmWorkEndTime:").append(getPmWorkEndTime());
sb.append(",averageTime:").append(getAverageTime());
sb.append(",waitingNumber:").append(getWaitingNumber());
sb.append(",workday1:").append(getWorkday1());
sb.append(",workday2:").append(getWorkday2());
sb.append(",workday3:").append(getWorkday3());
......@@ -740,8 +629,6 @@ public class SiteEntity extends SiteVo {
sb.append(",workday7:").append(getWorkday7());
sb.append(",level:").append(getLevel());
sb.append(",building:").append(getBuilding());
sb.append(",isSite:").append(getIsSite());
sb.append(",status:").append(getStatus());
sb.append(",logoPath:").append(getLogoPath());
sb.append(",englishName:").append(getEnglishName());
sb.append(",modelIds:").append(getModelIds());
......@@ -750,51 +637,43 @@ public class SiteEntity extends SiteVo {
public void initAttrValue(){
this.siteName = "";
this.parentId = null;
this.ancestors = "";
this.regionCode = "";
this.siteName = null;
this.iid = "";
this.siteCode = null;
this.siteCode = "";
this.areaID = null;
this.proCode = "";
this.areaCode = null;
this.areaCode = "";
this.areaName = null;
this.cityCode = "";
this.proCode = null;
this.siteIp = "";
this.cityCode = null;
this.sitePort = "";
this.districtCode = null;
this.longitude = "";
this.siteIp = null;
this.latitude = "";
this.sitePort = null;
this.haveSonArea = "0";
this.longitude = null;
this.siteTel = "";
this.latitude = null;
this.detailAddress = "";
this.siteTel = null;
this.siteRemark = "";
this.detailAddress = null;
this.amWorkStartTime = "";
this.siteRemark = null;
this.amWorkEndTime = "";
this.amWorkStartTime = null;
this.pmWorkStartTime = "";
this.amWorkEndTime = null;
this.pmWorkEndTime = "";
this.pmWorkStartTime = null;
this.averageTime = null;
this.waitingNumber = null;
this.pmWorkEndTime = null;
this.workday1 = 1;
......@@ -810,17 +689,13 @@ public class SiteEntity extends SiteVo {
this.workday7 = 0;
this.level = null;
this.building = null;
this.isSite = 0;
this.level = 1;
this.status = 1;
this.building = 1;
this.logoPath = "";
this.logoPath = null;
this.englishName = "";
this.englishName = null;
this.modelIds = "";
}
......
base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteQuery.java
View file @ 90b63ba0
package com.mortals.xhx.module.site.model;
import java.util.Date;
import java.util.List;
import com.mortals.xhx.module.site.model.SiteEntity;
/**
......@@ -24,39 +25,27 @@ public class SiteQuery extends SiteEntity {
/** 站点名称 */
private List<String> siteNameList;
/** 开始 父级id,默认0 */
private Long parentIdStart;
/** 结束 父级id,默认0 */
private Long parentIdEnd;
/** 增加 父级id,默认0 */
private Long parentIdIncrement;
/** 父级id,默认0列表 */
private List <Long> parentIdList;
/** 站点编号 */
private List<String> siteCodeList;
/** 祖级列表，逗号分隔 */
private List<String> ancestorsList;
/** 区域Id */
private List<String> areaIDList;
/** 区域编号 */
private List<String> regionCodeList;
/** 标识ID */
private List<String> iidList;
private List<String> areaCodeList;
/** 站点编号 */
private List<String> siteCodeList;
/** 区域名称 */
private List<String> areaNameList;
/** 省编码 */
private List<String> proCodeList;
/** 区编码 */
private List<String> areaCodeList;
/** 市编码 */
private List<String> cityCodeList;
/** 区编码 */
private List<String> districtCodeList;
/** 站点服务器ip */
private List<String> siteIpList;
......@@ -69,9 +58,6 @@ public class SiteQuery extends SiteEntity {
/** 纬度 */
private List<String> latitudeList;
/** 是否有下级(0.否，1.是) */
private List<String> haveSonAreaList;
/** 中心联系电话 */
private List<String> siteTelList;
......@@ -81,41 +67,29 @@ public class SiteQuery extends SiteEntity {
/** 中心介绍 */
private List<String> siteRemarkList;
/** 上午上班开始时间 */
private List<String> amWorkStartTimeList;
/** 上午上班结束时间 */
private List<String> amWorkEndTimeList;
/** 开始 上午上班开始时间 */
private String amWorkStartTimeStart;
/** 下午上班开始时间 */
private List<String> pmWorkStartTimeList;
/** 结束 上午上班开始时间 */
private String amWorkStartTimeEnd;
/** 下午上班结束时间 */
private List<String> pmWorkEndTimeList;
/** 开始 上午上班结束时间 */
private String amWorkEndTimeStart;
/** 开始 平均等待时间,后期删除 */
private Integer averageTimeStart;
/** 结束 上午上班结束时间 */
private String amWorkEndTimeEnd;
/** 结束 平均等待时间,后期删除 */
private Integer averageTimeEnd;
/** 开始 下午上班开始时间 */
private String pmWorkStartTimeStart;
/** 增加 平均等待时间,后期删除 */
private Integer averageTimeIncrement;
/** 结束 下午上班开始时间 */
private String pmWorkStartTimeEnd;
/** 平均等待时间,后期删除列表 */
private List <Integer> averageTimeList;
/** 开始 下午上班结束时间 */
private String pmWorkEndTimeStart;
/** 开始 等待人数,后期删除 */
private Integer waitingNumberStart;
/** 结束 等待人数,后期删除 */
private Integer waitingNumberEnd;
/** 增加 等待人数,后期删除 */
private Integer waitingNumberIncrement;
/** 等待人数,后期删除列表 */
private List <Integer> waitingNumberList;
/** 结束 下午上班结束时间 */
private String pmWorkEndTimeEnd;
/** 开始 周一 (1.上班，0.不上) */
private Integer workday1Start;
......@@ -225,36 +199,15 @@ public class SiteQuery extends SiteEntity {
/** 楼栋列表 */
private List <Integer> buildingList;
/** 开始 是否是站点 (1.是,0.否) */
private Integer isSiteStart;
/** 结束 是否是站点 (1.是,0.否) */
private Integer isSiteEnd;
/** 增加 是否是站点 (1.是,0.否) */
private Integer isSiteIncrement;
/** 是否是站点 (1.是,0.否)列表 */
private List <Integer> isSiteList;
/** 开始 站点状态 (0.停用，1.正常) */
private Integer statusStart;
/** 结束 站点状态 (0.停用，1.正常) */
private Integer statusEnd;
/** 增加 站点状态 (0.停用，1.正常) */
private Integer statusIncrement;
/** 站点状态 (0.停用，1.正常)列表 */
private List <Integer> statusList;
/** 设备logo地址 */
/** logo图片地址 */
private List<String> logoPathList;
/** 站点英文名称 */
/** 英文名称 */
private List<String> englishNameList;
/** 部署模块，逗号分隔 */
private List<String> modelIdsList;
/** 开始 创建时间 */
private String createTimeStart;
......@@ -279,9 +232,6 @@ public class SiteQuery extends SiteEntity {
/** 结束 修改时间 */
private String updateTimeEnd;
/** 部署模块，逗号分隔 */
private List<String> modelIdsList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<SiteQuery> orConditionList;
......@@ -370,128 +320,64 @@ public class SiteQuery extends SiteEntity {
this.siteNameList = siteNameList;
}
/**
* 获取 开始 父级id,默认0
* @return parentIdStart
*/
public Long getParentIdStart(){
return this.parentIdStart;
}
/**
* 设置 开始 父级id,默认0
* @param parentIdStart
*/
public void setParentIdStart(Long parentIdStart){
this.parentIdStart = parentIdStart;
}
/**
* 获取 结束 父级id,默认0
* @return $parentIdEnd
*/
public Long getParentIdEnd(){
return this.parentIdEnd;
}
/**
* 设置 结束 父级id,默认0
* @param parentIdEnd
*/
public void setParentIdEnd(Long parentIdEnd){
this.parentIdEnd = parentIdEnd;
}
/**
* 获取 增加 父级id,默认0
* @return parentIdIncrement
*/
public Long getParentIdIncrement(){
return this.parentIdIncrement;
}
/**
* 设置 增加 父级id,默认0
* @param parentIdIncrement
*/
public void setParentIdIncrement(Long parentIdIncrement){
this.parentIdIncrement = parentIdIncrement;
}
/**
* 获取 父级id,默认0
* @return parentIdList
* 获取 站点编号
* @return siteCodeList
*/
public List<Long> getParentIdList(){
return this.parentIdList;
public List<String> getSiteCodeList(){
return this.siteCodeList;
}
/**
* 设置 父级id,默认0
* @param parentIdList
* 设置 站点编号
* @param siteCodeList
*/
public void setParentIdList(List<Long> parentIdList){
this.parentIdList = parentIdList;
public void setSiteCodeList(List<String> siteCodeList){
this.siteCodeList = siteCodeList;
}
/**
* 获取 祖级列表，逗号分隔
* @return ancestorsList
* 获取 区域Id
* @return areaIDList
*/
public List<String> getAncestorsList(){
return this.ancestorsList;
public List<String> getAreaIDList(){
return this.areaIDList;
}
/**
* 设置 祖级列表，逗号分隔
* @param ancestorsList
* 设置 区域Id
* @param areaIDList
*/
public void setAncestorsList(List<String> ancestorsList){
this.ancestorsList = ancestorsList;
public void setAreaIDList(List<String> areaIDList){
this.areaIDList = areaIDList;
}
/**
* 获取 区域编号
* @return regionCodeList
* @return areaCodeList
*/
public List<String> getRegionCodeList(){
return this.regionCodeList;
public List<String> getAreaCodeList(){
return this.areaCodeList;
}
/**
* 设置 区域编号
* @param regionCodeList
*/
public void setRegionCodeList(List<String> regionCodeList){
this.regionCodeList = regionCodeList;
}
/**
* 获取 标识ID
* @return iidList
*/
public List<String> getIidList(){
return this.iidList;
}
/**
* 设置 标识ID
* @param iidList
* @param areaCodeList
*/
public void setIidList(List<String> iidList){
this.iidList = iidList;
public void setAreaCodeList(List<String> areaCodeList){
this.areaCodeList = areaCodeList;
}
/**
* 获取 站点编号
* @return siteCodeList
* 获取 区域名称
* @return areaNameList
*/
public List<String> getSiteCodeList(){
return this.siteCodeList;
public List<String> getAreaNameList(){
return this.areaNameList;
}
/**
* 设置 站点编号
* @param siteCodeList
* 设置 区域名称
* @param areaNameList
*/
public void setSiteCodeList(List<String> siteCodeList){
this.siteCodeList = siteCodeList;
public void setAreaNameList(List<String> areaNameList){
this.areaNameList = areaNameList;
}
/**
* 获取 省编码
......@@ -508,21 +394,6 @@ public class SiteQuery extends SiteEntity {
public void setProCodeList(List<String> proCodeList){
this.proCodeList = proCodeList;
}
/**
* 获取 区编码
* @return areaCodeList
*/
public List<String> getAreaCodeList(){
return this.areaCodeList;
}
/**
* 设置 区编码
* @param areaCodeList
*/
public void setAreaCodeList(List<String> areaCodeList){
this.areaCodeList = areaCodeList;
}
/**
* 获取 市编码
* @return cityCodeList
......@@ -538,6 +409,21 @@ public class SiteQuery extends SiteEntity {
public void setCityCodeList(List<String> cityCodeList){
this.cityCodeList = cityCodeList;
}
/**
* 获取 区编码
* @return districtCodeList
*/
public List<String> getDistrictCodeList(){
return this.districtCodeList;
}
/**
* 设置 区编码
* @param districtCodeList
*/
public void setDistrictCodeList(List<String> districtCodeList){
this.districtCodeList = districtCodeList;
}
/**
* 获取 站点服务器ip
* @return siteIpList
......@@ -598,21 +484,6 @@ public class SiteQuery extends SiteEntity {
public void setLatitudeList(List<String> latitudeList){
this.latitudeList = latitudeList;
}
/**
* 获取 是否有下级(0.否，1.是)
* @return haveSonAreaList
*/
public List<String> getHaveSonAreaList(){
return this.haveSonAreaList;
}
/**
* 设置 是否有下级(0.否，1.是)
* @param haveSonAreaList
*/
public void setHaveSonAreaList(List<String> haveSonAreaList){
this.haveSonAreaList = haveSonAreaList;
}
/**
* 获取 中心联系电话
* @return siteTelList
......@@ -659,191 +530,131 @@ public class SiteQuery extends SiteEntity {
this.siteRemarkList = siteRemarkList;
}
/**
* 获取 上午上班开始时间
* @return amWorkStartTimeList
* 获取 开始 上午上班开始时间
* @return amWorkStartTimeStart
*/
public List<String> getAmWorkStartTimeList(){
return this.amWorkStartTimeList;
public String getAmWorkStartTimeStart(){
return this.amWorkStartTimeStart;
}
/**
* 设置 上午上班开始时间
* @param amWorkStartTimeList
* 设置 开始 上午上班开始时间
* @param amWorkStartTimeStart
*/
public void setAmWorkStartTimeList(List<String> amWorkStartTimeList){
this.amWorkStartTimeList = amWorkStartTimeList;
}
/**
* 获取 上午上班结束时间
* @return amWorkEndTimeList
*/
public List<String> getAmWorkEndTimeList(){
return this.amWorkEndTimeList;
public void setAmWorkStartTimeStart(String amWorkStartTimeStart){
this.amWorkStartTimeStart = amWorkStartTimeStart;
}
/**
* 设置 上午上班结束时间
* @param amWorkEndTimeList
* 获取 结束 上午上班开始时间
* @return amWorkStartTimeEnd
*/
public void setAmWorkEndTimeList(List<String> amWorkEndTimeList){
this.amWorkEndTimeList = amWorkEndTimeList;
}
/**
* 获取 下午上班开始时间
* @return pmWorkStartTimeList
*/
public List<String> getPmWorkStartTimeList(){
return this.pmWorkStartTimeList;
public String getAmWorkStartTimeEnd(){
return this.amWorkStartTimeEnd;
}
/**
* 设置 下午上班开始时间
* @param pmWorkStartTimeList
* 设置 结束 上午上班开始时间
* @param amWorkStartTimeEnd
*/
public void setPmWorkStartTimeList(List<String> pmWorkStartTimeList){
this.pmWorkStartTimeList = pmWorkStartTimeList;
}
/**
* 获取 下午上班结束时间
* @return pmWorkEndTimeList
*/
public List<String> getPmWorkEndTimeList(){
return this.pmWorkEndTimeList;
}
/**
* 设置 下午上班结束时间
* @param pmWorkEndTimeList
*/
public void setPmWorkEndTimeList(List<String> pmWorkEndTimeList){
this.pmWorkEndTimeList = pmWorkEndTimeList;
}
/**
* 获取 开始 平均等待时间,后期删除
* @return averageTimeStart
*/
public Integer getAverageTimeStart(){
return this.averageTimeStart;
}
/**
* 设置 开始 平均等待时间,后期删除
* @param averageTimeStart
*/
public void setAverageTimeStart(Integer averageTimeStart){
this.averageTimeStart = averageTimeStart;
}
/**
* 获取 结束 平均等待时间,后期删除
* @return $averageTimeEnd
*/
public Integer getAverageTimeEnd(){
return this.averageTimeEnd;
public void setAmWorkStartTimeEnd(String amWorkStartTimeEnd){
this.amWorkStartTimeEnd = amWorkStartTimeEnd;
}
/**
* 设置 结束 平均等待时间,后期删除
* @param averageTimeEnd
* 获取 开始 上午上班结束时间
* @return amWorkEndTimeStart
*/
public void setAverageTimeEnd(Integer averageTimeEnd){
this.averageTimeEnd = averageTimeEnd;
public String getAmWorkEndTimeStart(){
return this.amWorkEndTimeStart;
}
/**
* 获取 增加 平均等待时间,后期删除
* @return averageTimeIncrement
* 设置 开始 上午上班结束时间
* @param amWorkEndTimeStart
*/
public Integer getAverageTimeIncrement(){
return this.averageTimeIncrement;
public void setAmWorkEndTimeStart(String amWorkEndTimeStart){
this.amWorkEndTimeStart = amWorkEndTimeStart;
}
/**
* 设置 增加 平均等待时间,后期删除
* @param averageTimeIncrement
* 获取 结束 上午上班结束时间
* @return amWorkEndTimeEnd
*/
public void setAverageTimeIncrement(Integer averageTimeIncrement){
this.averageTimeIncrement = averageTimeIncrement;
public String getAmWorkEndTimeEnd(){
return this.amWorkEndTimeEnd;
}
/**
* 获取 平均等待时间,后期删除
* @return averageTimeList
* 设置 结束 上午上班结束时间
* @param amWorkEndTimeEnd
*/
public List<Integer> getAverageTimeList(){
return this.averageTimeList;
public void setAmWorkEndTimeEnd(String amWorkEndTimeEnd){
this.amWorkEndTimeEnd = amWorkEndTimeEnd;
}
/**
* 设置 平均等待时间,后期删除
* @param averageTimeList
* 获取 开始 下午上班开始时间
* @return pmWorkStartTimeStart
*/
public void setAverageTimeList(List<Integer> averageTimeList){
this.averageTimeList = averageTimeList;
public String getPmWorkStartTimeStart(){
return this.pmWorkStartTimeStart;
}
/**
* 获取 开始 等待人数,后期删除
* @return waitingNumberStart
* 设置 开始 下午上班开始时间
* @param pmWorkStartTimeStart
*/
public Integer getWaitingNumberStart(){
return this.waitingNumberStart;
public void setPmWorkStartTimeStart(String pmWorkStartTimeStart){
this.pmWorkStartTimeStart = pmWorkStartTimeStart;
}
/**
* 设置 开始 等待人数,后期删除
* @param waitingNumberStart
* 获取 结束 下午上班开始时间
* @return pmWorkStartTimeEnd
*/
public void setWaitingNumberStart(Integer waitingNumberStart){
this.waitingNumberStart = waitingNumberStart;
public String getPmWorkStartTimeEnd(){
return this.pmWorkStartTimeEnd;
}
/**
* 获取 结束 等待人数,后期删除
* @return $waitingNumberEnd
* 设置 结束 下午上班开始时间
* @param pmWorkStartTimeEnd
*/
public Integer getWaitingNumberEnd(){
return this.waitingNumberEnd;
public void setPmWorkStartTimeEnd(String pmWorkStartTimeEnd){
this.pmWorkStartTimeEnd = pmWorkStartTimeEnd;
}
/**
* 设置 结束 等待人数,后期删除
* @param waitingNumberEnd
* 获取 开始 下午上班结束时间
* @return pmWorkEndTimeStart
*/
public void setWaitingNumberEnd(Integer waitingNumberEnd){
this.waitingNumberEnd = waitingNumberEnd;
public String getPmWorkEndTimeStart(){
return this.pmWorkEndTimeStart;
}
/**
* 获取 增加 等待人数,后期删除
* @return waitingNumberIncrement
* 设置 开始 下午上班结束时间
* @param pmWorkEndTimeStart
*/
public Integer getWaitingNumberIncrement(){
return this.waitingNumberIncrement;
public void setPmWorkEndTimeStart(String pmWorkEndTimeStart){
this.pmWorkEndTimeStart = pmWorkEndTimeStart;
}
/**
* 设置 增加 等待人数,后期删除
* @param waitingNumberIncrement
* 获取 结束 下午上班结束时间
* @return pmWorkEndTimeEnd
*/
public void setWaitingNumberIncrement(Integer waitingNumberIncrement){
this.waitingNumberIncrement = waitingNumberIncrement;
public String getPmWorkEndTimeEnd(){
return this.pmWorkEndTimeEnd;
}
/**
* 获取 等待人数,后期删除
* @return waitingNumberList
* 设置 结束 下午上班结束时间
* @param pmWorkEndTimeEnd
*/
public List<Integer> getWaitingNumberList(){
return this.waitingNumberList;
}
/**
* 设置 等待人数,后期删除
* @param waitingNumberList
*/
public void setWaitingNumberList(List<Integer> waitingNumberList){
this.waitingNumberList = waitingNumberList;
public void setPmWorkEndTimeEnd(String pmWorkEndTimeEnd){
this.pmWorkEndTimeEnd = pmWorkEndTimeEnd;
}
/**
......@@ -1423,135 +1234,7 @@ public class SiteQuery extends SiteEntity {
}
/**
* 获取 开始 是否是站点 (1.是,0.否)
* @return isSiteStart
*/
public Integer getIsSiteStart(){
return this.isSiteStart;
}
/**
* 设置 开始 是否是站点 (1.是,0.否)
* @param isSiteStart
*/
public void setIsSiteStart(Integer isSiteStart){
this.isSiteStart = isSiteStart;
}
/**
* 获取 结束 是否是站点 (1.是,0.否)
* @return $isSiteEnd
*/
public Integer getIsSiteEnd(){
return this.isSiteEnd;
}
/**
* 设置 结束 是否是站点 (1.是,0.否)
* @param isSiteEnd
*/
public void setIsSiteEnd(Integer isSiteEnd){
this.isSiteEnd = isSiteEnd;
}
/**
* 获取 增加 是否是站点 (1.是,0.否)
* @return isSiteIncrement
*/
public Integer getIsSiteIncrement(){
return this.isSiteIncrement;
}
/**
* 设置 增加 是否是站点 (1.是,0.否)
* @param isSiteIncrement
*/
public void setIsSiteIncrement(Integer isSiteIncrement){
this.isSiteIncrement = isSiteIncrement;
}
/**
* 获取 是否是站点 (1.是,0.否)
* @return isSiteList
*/
public List<Integer> getIsSiteList(){
return this.isSiteList;
}
/**
* 设置 是否是站点 (1.是,0.否)
* @param isSiteList
*/
public void setIsSiteList(List<Integer> isSiteList){
this.isSiteList = isSiteList;
}
/**
* 获取 开始 站点状态 (0.停用，1.正常)
* @return statusStart
*/
public Integer getStatusStart(){
return this.statusStart;
}
/**
* 设置 开始 站点状态 (0.停用，1.正常)
* @param statusStart
*/
public void setStatusStart(Integer statusStart){
this.statusStart = statusStart;
}
/**
* 获取 结束 站点状态 (0.停用，1.正常)
* @return $statusEnd
*/
public Integer getStatusEnd(){
return this.statusEnd;
}
/**
* 设置 结束 站点状态 (0.停用，1.正常)
* @param statusEnd
*/
public void setStatusEnd(Integer statusEnd){
this.statusEnd = statusEnd;
}
/**
* 获取 增加 站点状态 (0.停用，1.正常)
* @return statusIncrement
*/
public Integer getStatusIncrement(){
return this.statusIncrement;
}
/**
* 设置 增加 站点状态 (0.停用，1.正常)
* @param statusIncrement
*/
public void setStatusIncrement(Integer statusIncrement){
this.statusIncrement = statusIncrement;
}
/**
* 获取 站点状态 (0.停用，1.正常)
* @return statusList
*/
public List<Integer> getStatusList(){
return this.statusList;
}
/**
* 设置 站点状态 (0.停用，1.正常)
* @param statusList
*/
public void setStatusList(List<Integer> statusList){
this.statusList = statusList;
}
/**
* 获取 设备logo地址
* 获取 logo图片地址
* @return logoPathList
*/
public List<String> getLogoPathList(){
......@@ -1559,14 +1242,14 @@ public class SiteQuery extends SiteEntity {
}
/**
* 设置 设备logo地址
* 设置 logo图片地址
* @param logoPathList
*/
public void setLogoPathList(List<String> logoPathList){
this.logoPathList = logoPathList;
}
/**
* 获取 站点英文名称
* 获取 英文名称
* @return englishNameList
*/
public List<String> getEnglishNameList(){
......@@ -1574,12 +1257,27 @@ public class SiteQuery extends SiteEntity {
}
/**
* 设置 站点英文名称
* 设置 英文名称
* @param englishNameList
*/
public void setEnglishNameList(List<String> englishNameList){
this.englishNameList = englishNameList;
}
/**
* 获取 部署模块，逗号分隔
* @return modelIdsList
*/
public List<String> getModelIdsList(){
return this.modelIdsList;
}
/**
* 设置 部署模块，逗号分隔
* @param modelIdsList
*/
public void setModelIdsList(List<String> modelIdsList){
this.modelIdsList = modelIdsList;
}
/**
* 获取 开始 创建时间
* @return createTimeStart
......@@ -1708,21 +1406,6 @@ public class SiteQuery extends SiteEntity {
this.updateTimeEnd = updateTimeEnd;
}
/**
* 获取 部署模块，逗号分隔
* @return modelIdsList
*/
public List<String> getModelIdsList(){
return this.modelIdsList;
}
/**
* 设置 部署模块，逗号分隔
* @param modelIdsList
*/
public void setModelIdsList(List<String> modelIdsList){
this.modelIdsList = modelIdsList;
}
/**
* 设置 序号，主键，自增长
* @param id
......@@ -1787,124 +1470,79 @@ public class SiteQuery extends SiteEntity {
return this;
}
/**
* 设置 父级id,默认0
* @param parentId
*/
public SiteQuery parentId(Long parentId){
setParentId(parentId);
return this;
}
/**
* 设置 开始 父级id,默认0
* @param parentIdStart
*/
public SiteQuery parentIdStart(Long parentIdStart){
this.parentIdStart = parentIdStart;
return this;
}
/**
* 设置 结束 父级id,默认0
* @param parentIdEnd
*/
public SiteQuery parentIdEnd(Long parentIdEnd){
this.parentIdEnd = parentIdEnd;
return this;
}
/**
* 设置 增加 父级id,默认0
* @param parentIdIncrement
* 设置 站点编号
* @param siteCode
*/
public SiteQuery parentIdIncrement(Long parentIdIncrement){
this.parentIdIncrement = parentIdIncrement;
public SiteQuery siteCode(String siteCode){
setSiteCode(siteCode);
return this;
}
/**
* 设置 父级id,默认0
* @param parentIdList
* 设置 站点编号
* @param siteCodeList
*/
public SiteQuery parentIdList(List<Long> parentIdList){
this.parentIdList = parentIdList;
public SiteQuery siteCodeList(List<String> siteCodeList){
this.siteCodeList = siteCodeList;
return this;
}
/**
* 设置 祖级列表，逗号分隔
* @param ancestors
* 设置 区域Id
* @param areaID
*/
public SiteQuery ancestors(String ancestors){
setAncestors(ancestors);
public SiteQuery areaID(String areaID){
setAreaID(areaID);
return this;
}
/**
* 设置 祖级列表，逗号分隔
* @param ancestorsList
* 设置 区域Id
* @param areaIDList
*/
public SiteQuery ancestorsList(List<String> ancestorsList){
this.ancestorsList = ancestorsList;
public SiteQuery areaIDList(List<String> areaIDList){
this.areaIDList = areaIDList;
return this;
}
/**
* 设置 区域编号
* @param regionCode
* @param areaCode
*/
public SiteQuery regionCode(String regionCode){
setRegionCode(regionCode);
public SiteQuery areaCode(String areaCode){
setAreaCode(areaCode);
return this;
}
/**
* 设置 区域编号
* @param regionCodeList
* @param areaCodeList
*/
public SiteQuery regionCodeList(List<String> regionCodeList){
this.regionCodeList = regionCodeList;
public SiteQuery areaCodeList(List<String> areaCodeList){
this.areaCodeList = areaCodeList;
return this;
}
/**
* 设置 标识ID
* @param iid
* 设置 区域名称
* @param areaName
*/
public SiteQuery iid(String iid){
setIid(iid);
public SiteQuery areaName(String areaName){
setAreaName(areaName);
return this;
}
/**
* 设置 标识ID
* @param iidList
* 设置 区域名称
* @param areaNameList
*/
public SiteQuery iidList(List<String> iidList){
this.iidList = iidList;
return this;
}
/**
* 设置 站点编号
* @param siteCode
*/
public SiteQuery siteCode(String siteCode){
setSiteCode(siteCode);
return this;
}
/**
* 设置 站点编号
* @param siteCodeList
*/
public SiteQuery siteCodeList(List<String> siteCodeList){
this.siteCodeList = siteCodeList;
public SiteQuery areaNameList(List<String> areaNameList){
this.areaNameList = areaNameList;
return this;
}
......@@ -1929,39 +1567,39 @@ public class SiteQuery extends SiteEntity {
/**
* 设置 区编码
* @param areaCode
* 设置 市编码
* @param cityCode
*/
public SiteQuery areaCode(String areaCode){
setAreaCode(areaCode);
public SiteQuery cityCode(String cityCode){
setCityCode(cityCode);
return this;
}
/**
* 设置 区编码
* @param areaCodeList
* 设置 市编码
* @param cityCodeList
*/
public SiteQuery areaCodeList(List<String> areaCodeList){
this.areaCodeList = areaCodeList;
public SiteQuery cityCodeList(List<String> cityCodeList){
this.cityCodeList = cityCodeList;
return this;
}
/**
* 设置 市编码
* @param cityCode
* 设置 区编码
* @param districtCode
*/
public SiteQuery cityCode(String cityCode){
setCityCode(cityCode);
public SiteQuery districtCode(String districtCode){
setDistrictCode(districtCode);
return this;
}
/**
* 设置 市编码
* @param cityCodeList
* 设置 区编码
* @param districtCodeList
*/
public SiteQuery cityCodeList(List<String> cityCodeList){
this.cityCodeList = cityCodeList;
public SiteQuery districtCodeList(List<String> districtCodeList){
this.districtCodeList = districtCodeList;
return this;
}
......@@ -2042,25 +1680,6 @@ public class SiteQuery extends SiteEntity {
}
/**
* 设置 是否有下级(0.否，1.是)
* @param haveSonArea
*/
public SiteQuery haveSonArea(String haveSonArea){
setHaveSonArea(haveSonArea);
return this;
}
/**
* 设置 是否有下级(0.否，1.是)
* @param haveSonAreaList
*/
public SiteQuery haveSonAreaList(List<String> haveSonAreaList){
this.haveSonAreaList = haveSonAreaList;
return this;
}
/**
* 设置 中心联系电话
* @param siteTel
......@@ -2118,171 +1737,9 @@ 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;
}
/**
* 设置 平均等待时间,后期删除
* @param averageTime
*/
public SiteQuery averageTime(Integer averageTime){
setAverageTime(averageTime);
return this;
}
/**
* 设置 开始 平均等待时间,后期删除
* @param averageTimeStart
*/
public SiteQuery averageTimeStart(Integer averageTimeStart){
this.averageTimeStart = averageTimeStart;
return this;
}
/**
* 设置 结束 平均等待时间,后期删除
* @param averageTimeEnd
*/
public SiteQuery averageTimeEnd(Integer averageTimeEnd){
this.averageTimeEnd = averageTimeEnd;
return this;
}
/**
* 设置 增加 平均等待时间,后期删除
* @param averageTimeIncrement
*/
public SiteQuery averageTimeIncrement(Integer averageTimeIncrement){
this.averageTimeIncrement = averageTimeIncrement;
return this;
}
/**
* 设置 平均等待时间,后期删除
* @param averageTimeList
*/
public SiteQuery averageTimeList(List<Integer> averageTimeList){
this.averageTimeList = averageTimeList;
return this;
}
/**
* 设置 等待人数,后期删除
* @param waitingNumber
*/
public SiteQuery waitingNumber(Integer waitingNumber){
setWaitingNumber(waitingNumber);
return this;
}
/**
* 设置 开始 等待人数,后期删除
* @param waitingNumberStart
*/
public SiteQuery waitingNumberStart(Integer waitingNumberStart){
this.waitingNumberStart = waitingNumberStart;
return this;
}
/**
* 设置 结束 等待人数,后期删除
* @param waitingNumberEnd
*/
public SiteQuery waitingNumberEnd(Integer waitingNumberEnd){
this.waitingNumberEnd = waitingNumberEnd;
return this;
}
/**
* 设置 增加 等待人数,后期删除
* @param waitingNumberIncrement
*/
public SiteQuery waitingNumberIncrement(Integer waitingNumberIncrement){
this.waitingNumberIncrement = waitingNumberIncrement;
return this;
}
/**
* 设置 等待人数,后期删除
* @param waitingNumberList
*/
public SiteQuery waitingNumberList(List<Integer> waitingNumberList){
this.waitingNumberList = waitingNumberList;
return this;
}
/**
* 设置 周一 (1.上班，0.不上)
* @param workday1
......@@ -2688,99 +2145,9 @@ public class SiteQuery extends SiteEntity {
return this;
}
/**
* 设置 是否是站点 (1.是,0.否)
* @param isSite
*/
public SiteQuery isSite(Integer isSite){
setIsSite(isSite);
return this;
}
/**
* 设置 开始 是否是站点 (1.是,0.否)
* @param isSiteStart
*/
public SiteQuery isSiteStart(Integer isSiteStart){
this.isSiteStart = isSiteStart;
return this;
}
/**
* 设置 结束 是否是站点 (1.是,0.否)
* @param isSiteEnd
*/
public SiteQuery isSiteEnd(Integer isSiteEnd){
this.isSiteEnd = isSiteEnd;
return this;
}
/**
* 设置 增加 是否是站点 (1.是,0.否)
* @param isSiteIncrement
*/
public SiteQuery isSiteIncrement(Integer isSiteIncrement){
this.isSiteIncrement = isSiteIncrement;
return this;
}
/**
* 设置 是否是站点 (1.是,0.否)
* @param isSiteList
*/
public SiteQuery isSiteList(List<Integer> isSiteList){
this.isSiteList = isSiteList;
return this;
}
/**
* 设置 站点状态 (0.停用，1.正常)
* @param status
*/
public SiteQuery status(Integer status){
setStatus(status);
return this;
}
/**
* 设置 开始 站点状态 (0.停用，1.正常)
* @param statusStart
*/
public SiteQuery statusStart(Integer statusStart){
this.statusStart = statusStart;
return this;
}
/**
* 设置 结束 站点状态 (0.停用，1.正常)
* @param statusEnd
*/
public SiteQuery statusEnd(Integer statusEnd){
this.statusEnd = statusEnd;
return this;
}
/**
* 设置 增加 站点状态 (0.停用，1.正常)
* @param statusIncrement
*/
public SiteQuery statusIncrement(Integer statusIncrement){
this.statusIncrement = statusIncrement;
return this;
}
/**
* 设置 站点状态 (0.停用，1.正常)
* @param statusList
*/
public SiteQuery statusList(List<Integer> statusList){
this.statusList = statusList;
return this;
}
/**
* 设置 设备logo地址
* 设置 logo图片地址
* @param logoPath
*/
public SiteQuery logoPath(String logoPath){
......@@ -2789,7 +2156,7 @@ public class SiteQuery extends SiteEntity {
}
/**
* 设置 设备logo地址
* 设置 logo图片地址
* @param logoPathList
*/
public SiteQuery logoPathList(List<String> logoPathList){
......@@ -2799,7 +2166,7 @@ public class SiteQuery extends SiteEntity {
/**
* 设置 站点英文名称
* 设置 英文名称
* @param englishName
*/
public SiteQuery englishName(String englishName){
......@@ -2808,7 +2175,7 @@ public class SiteQuery extends SiteEntity {
}
/**
* 设置 站点英文名称
* 设置 英文名称
* @param englishNameList
*/
public SiteQuery englishNameList(List<String> englishNameList){
......@@ -2817,6 +2184,25 @@ public class SiteQuery extends SiteEntity {
}
/**
* 设置 部署模块，逗号分隔
* @param modelIds
*/
public SiteQuery modelIds(String modelIds){
setModelIds(modelIds);
return this;
}
/**
* 设置 部署模块，逗号分隔
* @param modelIdsList
*/
public SiteQuery modelIdsList(List<String> modelIdsList){
this.modelIdsList = modelIdsList;
return this;
}
/**
* 设置 创建用户
* @param createUserId
......@@ -2863,25 +2249,6 @@ public class SiteQuery extends SiteEntity {
}
/**
* 设置 部署模块，逗号分隔
* @param modelIds
*/
public SiteQuery modelIds(String modelIds){
setModelIds(modelIds);
return this;
}
/**
* 设置 部署模块，逗号分隔
* @param modelIdsList
*/
public SiteQuery modelIdsList(List<String> modelIdsList){
this.modelIdsList = modelIdsList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
......
base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java
View file @ 90b63ba0
......@@ -122,7 +122,7 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
Map<String, Object> model = new HashMap<>();
String busiDesc = "根据区域编码查询站点列表" + this.getModuleDesc();
try {
String siteIds = site.getAreaIDList().stream().flatMap(areaId ->
String siteIds = site.getAreaCodeList().stream().flatMap(areaId ->
this.service.getFlatSitesByAreaCode(areaId, getContext()).stream()
).map(item -> item.getId().toString()).distinct().collect(Collectors.joining(","));
......
base-manager/src/main/resources/sqlmap/module/site/SiteMapper.xml
View file @ 90b63ba0
......@@ -7,19 +7,17 @@
<resultMap type="SiteEntity" id="SiteEntity-Map">
<id property="id" column="id" />
<result property="siteName" column="siteName" />
<result property="parentId" column="parentId" />
<result property="ancestors" column="ancestors" />
<result property="regionCode" column="regionCode" />
<result property="iid" column="iid" />
<result property="siteCode" column="siteCode" />
<result property="proCode" column="proCode" />
<result property="areaID" column="areaID" />
<result property="areaCode" column="areaCode" />
<result property="areaName" column="areaName" />
<result property="proCode" column="proCode" />
<result property="cityCode" column="cityCode" />
<result property="districtCode" column="districtCode" />
<result property="siteIp" column="siteIp" />
<result property="sitePort" column="sitePort" />
<result property="longitude" column="longitude" />
<result property="latitude" column="latitude" />
<result property="haveSonArea" column="haveSonArea" />
<result property="siteTel" column="siteTel" />
<result property="detailAddress" column="detailAddress" />
<result property="siteRemark" column="siteRemark" />
......@@ -27,8 +25,6 @@
<result property="amWorkEndTime" column="amWorkEndTime" />
<result property="pmWorkStartTime" column="pmWorkStartTime" />
<result property="pmWorkEndTime" column="pmWorkEndTime" />
<result property="averageTime" column="averageTime" />
<result property="waitingNumber" column="waitingNumber" />
<result property="workday1" column="workday1" />
<result property="workday2" column="workday2" />
<result property="workday3" column="workday3" />
......@@ -38,14 +34,12 @@
<result property="workday7" column="workday7" />
<result property="level" column="level" />
<result property="building" column="building" />
<result property="isSite" column="isSite" />
<result property="status" column="status" />
<result property="logoPath" column="logoPath" />
<result property="englishName" column="englishName" />
<result property="modelIds" column="modelIds" />
<result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" />
<result property="updateTime" column="updateTime" />
<result property="modelIds" column="modelIds" />
</resultMap>
......@@ -59,30 +53,27 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
a.siteName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('parentId') or colPickMode == 1 and data.containsKey('parentId')))">
a.parentId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ancestors') or colPickMode == 1 and data.containsKey('ancestors')))">
a.ancestors,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('regionCode') or colPickMode == 1 and data.containsKey('regionCode')))">
a.regionCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('iid') or colPickMode == 1 and data.containsKey('iid')))">
a.iid,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteCode') or colPickMode == 1 and data.containsKey('siteCode')))">
a.siteCode,
</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 test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('areaID') or colPickMode == 1 and data.containsKey('areaID')))">
a.areaID,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('areaCode') or colPickMode == 1 and data.containsKey('areaCode')))">
a.areaCode,
</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')))">
a.cityCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('districtCode') or colPickMode == 1 and data.containsKey('districtCode')))">
a.districtCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteIp') or colPickMode == 1 and data.containsKey('siteIp')))">
a.siteIp,
</if>
......@@ -95,9 +86,6 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('latitude') or colPickMode == 1 and data.containsKey('latitude')))">
a.latitude,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('haveSonArea') or colPickMode == 1 and data.containsKey('haveSonArea')))">
a.haveSonArea,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteTel') or colPickMode == 1 and data.containsKey('siteTel')))">
a.siteTel,
</if>
......@@ -119,12 +107,6 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('pmWorkEndTime') or colPickMode == 1 and data.containsKey('pmWorkEndTime')))">
a.pmWorkEndTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('averageTime') or colPickMode == 1 and data.containsKey('averageTime')))">
a.averageTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('waitingNumber') or colPickMode == 1 and data.containsKey('waitingNumber')))">
a.waitingNumber,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workday1') or colPickMode == 1 and data.containsKey('workday1')))">
a.workday1,
</if>
......@@ -152,18 +134,15 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('building') or colPickMode == 1 and data.containsKey('building')))">
a.building,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isSite') or colPickMode == 1 and data.containsKey('isSite')))">
a.isSite,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))">
a.status,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('logoPath') or colPickMode == 1 and data.containsKey('logoPath')))">
a.logoPath,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('englishName') or colPickMode == 1 and data.containsKey('englishName')))">
a.englishName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('modelIds') or colPickMode == 1 and data.containsKey('modelIds')))">
a.modelIds,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime,
</if>
......@@ -173,26 +152,23 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('modelIds') or colPickMode == 1 and data.containsKey('modelIds')))">
a.modelIds,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="SiteEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_site
(siteName,parentId,ancestors,regionCode,iid,siteCode,proCode,areaCode,cityCode,siteIp,sitePort,longitude,latitude,haveSonArea,siteTel,detailAddress,siteRemark,amWorkStartTime,amWorkEndTime,pmWorkStartTime,pmWorkEndTime,averageTime,waitingNumber,workday1,workday2,workday3,workday4,workday5,workday6,workday7,level,building,isSite,status,logoPath,englishName,createTime,createUserId,updateTime,modelIds)
(siteName,siteCode,areaID,areaCode,areaName,proCode,cityCode,districtCode,siteIp,sitePort,longitude,latitude,siteTel,detailAddress,siteRemark,amWorkStartTime,amWorkEndTime,pmWorkStartTime,pmWorkEndTime,workday1,workday2,workday3,workday4,workday5,workday6,workday7,level,building,logoPath,englishName,modelIds,createTime,createUserId,updateTime)
VALUES
(#{siteName},#{parentId},#{ancestors},#{regionCode},#{iid},#{siteCode},#{proCode},#{areaCode},#{cityCode},#{siteIp},#{sitePort},#{longitude},#{latitude},#{haveSonArea},#{siteTel},#{detailAddress},#{siteRemark},#{amWorkStartTime},#{amWorkEndTime},#{pmWorkStartTime},#{pmWorkEndTime},#{averageTime},#{waitingNumber},#{workday1},#{workday2},#{workday3},#{workday4},#{workday5},#{workday6},#{workday7},#{level},#{building},#{isSite},#{status},#{logoPath},#{englishName},#{createTime},#{createUserId},#{updateTime},#{modelIds})
(#{siteName},#{siteCode},#{areaID},#{areaCode},#{areaName},#{proCode},#{cityCode},#{districtCode},#{siteIp},#{sitePort},#{longitude},#{latitude},#{siteTel},#{detailAddress},#{siteRemark},#{amWorkStartTime},#{amWorkEndTime},#{pmWorkStartTime},#{pmWorkEndTime},#{workday1},#{workday2},#{workday3},#{workday4},#{workday5},#{workday6},#{workday7},#{level},#{building},#{logoPath},#{englishName},#{modelIds},#{createTime},#{createUserId},#{updateTime})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_site
(siteName,parentId,ancestors,regionCode,iid,siteCode,proCode,areaCode,cityCode,siteIp,sitePort,longitude,latitude,haveSonArea,siteTel,detailAddress,siteRemark,amWorkStartTime,amWorkEndTime,pmWorkStartTime,pmWorkEndTime,averageTime,waitingNumber,workday1,workday2,workday3,workday4,workday5,workday6,workday7,level,building,isSite,status,logoPath,englishName,createTime,createUserId,updateTime,modelIds)
(siteName,siteCode,areaID,areaCode,areaName,proCode,cityCode,districtCode,siteIp,sitePort,longitude,latitude,siteTel,detailAddress,siteRemark,amWorkStartTime,amWorkEndTime,pmWorkStartTime,pmWorkEndTime,workday1,workday2,workday3,workday4,workday5,workday6,workday7,level,building,logoPath,englishName,modelIds,createTime,createUserId,updateTime)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteName},#{item.parentId},#{item.ancestors},#{item.regionCode},#{item.iid},#{item.siteCode},#{item.proCode},#{item.areaCode},#{item.cityCode},#{item.siteIp},#{item.sitePort},#{item.longitude},#{item.latitude},#{item.haveSonArea},#{item.siteTel},#{item.detailAddress},#{item.siteRemark},#{item.amWorkStartTime},#{item.amWorkEndTime},#{item.pmWorkStartTime},#{item.pmWorkEndTime},#{item.averageTime},#{item.waitingNumber},#{item.workday1},#{item.workday2},#{item.workday3},#{item.workday4},#{item.workday5},#{item.workday6},#{item.workday7},#{item.level},#{item.building},#{item.isSite},#{item.status},#{item.logoPath},#{item.englishName},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.modelIds})
(#{item.siteName},#{item.siteCode},#{item.areaID},#{item.areaCode},#{item.areaName},#{item.proCode},#{item.cityCode},#{item.districtCode},#{item.siteIp},#{item.sitePort},#{item.longitude},#{item.latitude},#{item.siteTel},#{item.detailAddress},#{item.siteRemark},#{item.amWorkStartTime},#{item.amWorkEndTime},#{item.pmWorkStartTime},#{item.pmWorkEndTime},#{item.workday1},#{item.workday2},#{item.workday3},#{item.workday4},#{item.workday5},#{item.workday6},#{item.workday7},#{item.level},#{item.building},#{item.logoPath},#{item.englishName},#{item.modelIds},#{item.createTime},#{item.createUserId},#{item.updateTime})
</foreach>
</insert>
......@@ -205,33 +181,27 @@
<if test="(colPickMode==0 and data.containsKey('siteName')) or (colPickMode==1 and !data.containsKey('siteName'))">
a.siteName=#{data.siteName},
</if>
<if test="(colPickMode==0 and data.containsKey('parentId')) or (colPickMode==1 and !data.containsKey('parentId'))">
a.parentId=#{data.parentId},
</if>
<if test="(colPickMode==0 and data.containsKey('parentIdIncrement')) or (colPickMode==1 and !data.containsKey('parentIdIncrement'))">
a.parentId=ifnull(a.parentId,0) + #{data.parentIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('ancestors')) or (colPickMode==1 and !data.containsKey('ancestors'))">
a.ancestors=#{data.ancestors},
</if>
<if test="(colPickMode==0 and data.containsKey('regionCode')) or (colPickMode==1 and !data.containsKey('regionCode'))">
a.regionCode=#{data.regionCode},
</if>
<if test="(colPickMode==0 and data.containsKey('iid')) or (colPickMode==1 and !data.containsKey('iid'))">
a.iid=#{data.iid},
</if>
<if test="(colPickMode==0 and data.containsKey('siteCode')) or (colPickMode==1 and !data.containsKey('siteCode'))">
a.siteCode=#{data.siteCode},
</if>
<if test="(colPickMode==0 and data.containsKey('proCode')) or (colPickMode==1 and !data.containsKey('proCode'))">
a.proCode=#{data.proCode},
<if test="(colPickMode==0 and data.containsKey('areaID')) or (colPickMode==1 and !data.containsKey('areaID'))">
a.areaID=#{data.areaID},
</if>
<if test="(colPickMode==0 and data.containsKey('areaCode')) or (colPickMode==1 and !data.containsKey('areaCode'))">
a.areaCode=#{data.areaCode},
</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'))">
a.cityCode=#{data.cityCode},
</if>
<if test="(colPickMode==0 and data.containsKey('districtCode')) or (colPickMode==1 and !data.containsKey('districtCode'))">
a.districtCode=#{data.districtCode},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIp')) or (colPickMode==1 and !data.containsKey('siteIp'))">
a.siteIp=#{data.siteIp},
</if>
......@@ -244,9 +214,6 @@
<if test="(colPickMode==0 and data.containsKey('latitude')) or (colPickMode==1 and !data.containsKey('latitude'))">
a.latitude=#{data.latitude},
</if>
<if test="(colPickMode==0 and data.containsKey('haveSonArea')) or (colPickMode==1 and !data.containsKey('haveSonArea'))">
a.haveSonArea=#{data.haveSonArea},
</if>
<if test="(colPickMode==0 and data.containsKey('siteTel')) or (colPickMode==1 and !data.containsKey('siteTel'))">
a.siteTel=#{data.siteTel},
</if>
......@@ -268,18 +235,6 @@
<if test="(colPickMode==0 and data.containsKey('pmWorkEndTime')) or (colPickMode==1 and !data.containsKey('pmWorkEndTime'))">
a.pmWorkEndTime=#{data.pmWorkEndTime},
</if>
<if test="(colPickMode==0 and data.containsKey('averageTime')) or (colPickMode==1 and !data.containsKey('averageTime'))">
a.averageTime=#{data.averageTime},
</if>
<if test="(colPickMode==0 and data.containsKey('averageTimeIncrement')) or (colPickMode==1 and !data.containsKey('averageTimeIncrement'))">
a.averageTime=ifnull(a.averageTime,0) + #{data.averageTimeIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('waitingNumber')) or (colPickMode==1 and !data.containsKey('waitingNumber'))">
a.waitingNumber=#{data.waitingNumber},
</if>
<if test="(colPickMode==0 and data.containsKey('waitingNumberIncrement')) or (colPickMode==1 and !data.containsKey('waitingNumberIncrement'))">
a.waitingNumber=ifnull(a.waitingNumber,0) + #{data.waitingNumberIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('workday1')) or (colPickMode==1 and !data.containsKey('workday1'))">
a.workday1=#{data.workday1},
</if>
......@@ -334,24 +289,15 @@
<if test="(colPickMode==0 and data.containsKey('buildingIncrement')) or (colPickMode==1 and !data.containsKey('buildingIncrement'))">
a.building=ifnull(a.building,0) + #{data.buildingIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('isSite')) or (colPickMode==1 and !data.containsKey('isSite'))">
a.isSite=#{data.isSite},
</if>
<if test="(colPickMode==0 and data.containsKey('isSiteIncrement')) or (colPickMode==1 and !data.containsKey('isSiteIncrement'))">
a.isSite=ifnull(a.isSite,0) + #{data.isSiteIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('status')) or (colPickMode==1 and !data.containsKey('status'))">
a.status=#{data.status},
</if>
<if test="(colPickMode==0 and data.containsKey('statusIncrement')) or (colPickMode==1 and !data.containsKey('statusIncrement'))">
a.status=ifnull(a.status,0) + #{data.statusIncrement},
</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('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'))">
a.createTime=#{data.createTime},
</if>
......@@ -364,9 +310,6 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
<if test="(colPickMode==0 and data.containsKey('modelIds')) or (colPickMode==1 and !data.containsKey('modelIds'))">
a.modelIds=#{data.modelIds},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -386,43 +329,31 @@
</if>
</foreach>
</trim>
<trim prefix="parentId=(case" suffix="ELSE parentId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('parentId')) or (colPickMode==1 and !item.containsKey('parentId'))">
when a.id=#{item.id} then #{item.parentId}
</when>
<when test="(colPickMode==0 and item.containsKey('parentIdIncrement')) or (colPickMode==1 and !item.containsKey('parentIdIncrement'))">
when a.id=#{item.id} then ifnull(a.parentId,0) + #{item.parentIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="ancestors=(case" suffix="ELSE ancestors end),">
<trim prefix="siteCode=(case" suffix="ELSE siteCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('ancestors')) or (colPickMode==1 and !item.containsKey('ancestors'))">
when a.id=#{item.id} then #{item.ancestors}
<if test="(colPickMode==0 and item.containsKey('siteCode')) or (colPickMode==1 and !item.containsKey('siteCode'))">
when a.id=#{item.id} then #{item.siteCode}
</if>
</foreach>
</trim>
<trim prefix="regionCode=(case" suffix="ELSE regionCode end),">
<trim prefix="areaID=(case" suffix="ELSE areaID end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('regionCode')) or (colPickMode==1 and !item.containsKey('regionCode'))">
when a.id=#{item.id} then #{item.regionCode}
<if test="(colPickMode==0 and item.containsKey('areaID')) or (colPickMode==1 and !item.containsKey('areaID'))">
when a.id=#{item.id} then #{item.areaID}
</if>
</foreach>
</trim>
<trim prefix="iid=(case" suffix="ELSE iid end),">
<trim prefix="areaCode=(case" suffix="ELSE areaCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('iid')) or (colPickMode==1 and !item.containsKey('iid'))">
when a.id=#{item.id} then #{item.iid}
<if test="(colPickMode==0 and item.containsKey('areaCode')) or (colPickMode==1 and !item.containsKey('areaCode'))">
when a.id=#{item.id} then #{item.areaCode}
</if>
</foreach>
</trim>
<trim prefix="siteCode=(case" suffix="ELSE siteCode end),">
<trim prefix="areaName=(case" suffix="ELSE areaName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('siteCode')) or (colPickMode==1 and !item.containsKey('siteCode'))">
when a.id=#{item.id} then #{item.siteCode}
<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>
......@@ -433,17 +364,17 @@
</if>
</foreach>
</trim>
<trim prefix="areaCode=(case" suffix="ELSE areaCode end),">
<trim prefix="cityCode=(case" suffix="ELSE cityCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('areaCode')) or (colPickMode==1 and !item.containsKey('areaCode'))">
when a.id=#{item.id} then #{item.areaCode}
<if test="(colPickMode==0 and item.containsKey('cityCode')) or (colPickMode==1 and !item.containsKey('cityCode'))">
when a.id=#{item.id} then #{item.cityCode}
</if>
</foreach>
</trim>
<trim prefix="cityCode=(case" suffix="ELSE cityCode end),">
<trim prefix="districtCode=(case" suffix="ELSE districtCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('cityCode')) or (colPickMode==1 and !item.containsKey('cityCode'))">
when a.id=#{item.id} then #{item.cityCode}
<if test="(colPickMode==0 and item.containsKey('districtCode')) or (colPickMode==1 and !item.containsKey('districtCode'))">
when a.id=#{item.id} then #{item.districtCode}
</if>
</foreach>
</trim>
......@@ -475,13 +406,6 @@
</if>
</foreach>
</trim>
<trim prefix="haveSonArea=(case" suffix="ELSE haveSonArea end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('haveSonArea')) or (colPickMode==1 and !item.containsKey('haveSonArea'))">
when a.id=#{item.id} then #{item.haveSonArea}
</if>
</foreach>
</trim>
<trim prefix="siteTel=(case" suffix="ELSE siteTel end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('siteTel')) or (colPickMode==1 and !item.containsKey('siteTel'))">
......@@ -531,30 +455,6 @@
</if>
</foreach>
</trim>
<trim prefix="averageTime=(case" suffix="ELSE averageTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('averageTime')) or (colPickMode==1 and !item.containsKey('averageTime'))">
when a.id=#{item.id} then #{item.averageTime}
</when>
<when test="(colPickMode==0 and item.containsKey('averageTimeIncrement')) or (colPickMode==1 and !item.containsKey('averageTimeIncrement'))">
when a.id=#{item.id} then ifnull(a.averageTime,0) + #{item.averageTimeIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="waitingNumber=(case" suffix="ELSE waitingNumber end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('waitingNumber')) or (colPickMode==1 and !item.containsKey('waitingNumber'))">
when a.id=#{item.id} then #{item.waitingNumber}
</when>
<when test="(colPickMode==0 and item.containsKey('waitingNumberIncrement')) or (colPickMode==1 and !item.containsKey('waitingNumberIncrement'))">
when a.id=#{item.id} then ifnull(a.waitingNumber,0) + #{item.waitingNumberIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="workday1=(case" suffix="ELSE workday1 end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
......@@ -663,30 +563,6 @@
</choose>
</foreach>
</trim>
<trim prefix="isSite=(case" suffix="ELSE isSite end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('isSite')) or (colPickMode==1 and !item.containsKey('isSite'))">
when a.id=#{item.id} then #{item.isSite}
</when>
<when test="(colPickMode==0 and item.containsKey('isSiteIncrement')) or (colPickMode==1 and !item.containsKey('isSiteIncrement'))">
when a.id=#{item.id} then ifnull(a.isSite,0) + #{item.isSiteIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="status=(case" suffix="ELSE status end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('status')) or (colPickMode==1 and !item.containsKey('status'))">
when a.id=#{item.id} then #{item.status}
</when>
<when test="(colPickMode==0 and item.containsKey('statusIncrement')) or (colPickMode==1 and !item.containsKey('statusIncrement'))">
when a.id=#{item.id} then ifnull(a.status,0) + #{item.statusIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="logoPath=(case" suffix="ELSE logoPath end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('logoPath')) or (colPickMode==1 and !item.containsKey('logoPath'))">
......@@ -701,6 +577,13 @@
</if>
</foreach>
</trim>
<trim prefix="modelIds=(case" suffix="ELSE modelIds end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('modelIds')) or (colPickMode==1 and !item.containsKey('modelIds'))">
when a.id=#{item.id} then #{item.modelIds}
</if>
</foreach>
</trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
......@@ -727,13 +610,6 @@
</if>
</foreach>
</trim>
<trim prefix="modelIds=(case" suffix="ELSE modelIds end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('modelIds')) or (colPickMode==1 and !item.containsKey('modelIds'))">
when a.id=#{item.id} then #{item.modelIds}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -871,84 +747,63 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('parentId')">
<if test="conditionParamRef.parentId != null ">
${_conditionType_} a.parentId = #{${_conditionParam_}.parentId}
</if>
<if test="conditionParamRef.parentId == null">
${_conditionType_} a.parentId is null
</if>
</if>
<if test="conditionParamRef.containsKey('parentIdList')">
${_conditionType_} a.parentId in
<foreach collection="conditionParamRef.parentIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('parentIdStart') and conditionParamRef.parentIdStart != null">
${_conditionType_} a.parentId <![CDATA[ >= ]]> #{${_conditionParam_}.parentIdStart}
</if>
<if test="conditionParamRef.containsKey('parentIdEnd') and conditionParamRef.parentIdEnd != null">
${_conditionType_} a.parentId <![CDATA[ <= ]]> #{${_conditionParam_}.parentIdEnd}
</if>
<if test="conditionParamRef.containsKey('ancestors')">
<if test="conditionParamRef.ancestors != null and conditionParamRef.ancestors != ''">
${_conditionType_} a.ancestors like #{${_conditionParam_}.ancestors}
<if test="conditionParamRef.containsKey('siteCode')">
<if test="conditionParamRef.siteCode != null and conditionParamRef.siteCode != ''">
${_conditionType_} a.siteCode like #{${_conditionParam_}.siteCode}
</if>
<if test="conditionParamRef.ancestors == null">
${_conditionType_} a.ancestors is null
<if test="conditionParamRef.siteCode == null">
${_conditionType_} a.siteCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('ancestorsList')">
${_conditionType_} a.ancestors in
<foreach collection="conditionParamRef.ancestorsList" open="(" close=")" index="index" item="item" separator=",">
<if test="conditionParamRef.containsKey('siteCodeList')">
${_conditionType_} a.siteCode in
<foreach collection="conditionParamRef.siteCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('regionCode')">
<if test="conditionParamRef.regionCode != null and conditionParamRef.regionCode != ''">
${_conditionType_} a.regionCode like #{${_conditionParam_}.regionCode}
<if test="conditionParamRef.containsKey('areaID')">
<if test="conditionParamRef.areaID != null and conditionParamRef.areaID != ''">
${_conditionType_} a.areaID like #{${_conditionParam_}.areaID}
</if>
<if test="conditionParamRef.regionCode == null">
${_conditionType_} a.regionCode is null
<if test="conditionParamRef.areaID == null">
${_conditionType_} a.areaID is null
</if>
</if>
<if test="conditionParamRef.containsKey('regionCodeList')">
${_conditionType_} a.regionCode in
<foreach collection="conditionParamRef.regionCodeList" open="(" close=")" index="index" item="item" separator=",">
<if test="conditionParamRef.containsKey('areaIDList')">
${_conditionType_} a.areaID in
<foreach collection="conditionParamRef.areaIDList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('iid')">
<if test="conditionParamRef.iid != null and conditionParamRef.iid != ''">
${_conditionType_} a.iid like #{${_conditionParam_}.iid}
<if test="conditionParamRef.containsKey('areaCode')">
<if test="conditionParamRef.areaCode != null and conditionParamRef.areaCode != ''">
${_conditionType_} a.areaCode like #{${_conditionParam_}.areaCode}
</if>
<if test="conditionParamRef.iid == null">
${_conditionType_} a.iid is null
<if test="conditionParamRef.areaCode == null">
${_conditionType_} a.areaCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('iidList')">
${_conditionType_} a.iid in
<foreach collection="conditionParamRef.iidList" open="(" close=")" index="index" item="item" separator=",">
<if test="conditionParamRef.containsKey('areaCodeList')">
${_conditionType_} a.areaCode in
<foreach collection="conditionParamRef.areaCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteCode')">
<if test="conditionParamRef.siteCode != null and conditionParamRef.siteCode != ''">
${_conditionType_} a.siteCode like #{${_conditionParam_}.siteCode}
<if test="conditionParamRef.containsKey('areaName')">
<if test="conditionParamRef.areaName != null and conditionParamRef.areaName != ''">
${_conditionType_} a.areaName like #{${_conditionParam_}.areaName}
</if>
<if test="conditionParamRef.siteCode == null">
${_conditionType_} a.siteCode is null
<if test="conditionParamRef.areaName == null">
${_conditionType_} a.areaName is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteCodeList')">
${_conditionType_} a.siteCode in
<foreach collection="conditionParamRef.siteCodeList" open="(" close=")" index="index" item="item" separator=",">
<if test="conditionParamRef.containsKey('areaNameList')">
${_conditionType_} a.areaName in
<foreach collection="conditionParamRef.areaNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
......@@ -968,21 +823,6 @@
</foreach>
</if>
<if test="conditionParamRef.containsKey('areaCode')">
<if test="conditionParamRef.areaCode != null and conditionParamRef.areaCode != ''">
${_conditionType_} a.areaCode like #{${_conditionParam_}.areaCode}
</if>
<if test="conditionParamRef.areaCode == null">
${_conditionType_} a.areaCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('areaCodeList')">
${_conditionType_} a.areaCode in
<foreach collection="conditionParamRef.areaCodeList" 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}
......@@ -998,6 +838,21 @@
</foreach>
</if>
<if test="conditionParamRef.containsKey('districtCode')">
<if test="conditionParamRef.districtCode != null and conditionParamRef.districtCode != ''">
${_conditionType_} a.districtCode like #{${_conditionParam_}.districtCode}
</if>
<if test="conditionParamRef.districtCode == null">
${_conditionType_} a.districtCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('districtCodeList')">
${_conditionType_} a.districtCode in
<foreach collection="conditionParamRef.districtCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIp')">
<if test="conditionParamRef.siteIp != null and conditionParamRef.siteIp != ''">
${_conditionType_} a.siteIp like #{${_conditionParam_}.siteIp}
......@@ -1058,21 +913,6 @@
</foreach>
</if>
<if test="conditionParamRef.containsKey('haveSonArea')">
<if test="conditionParamRef.haveSonArea != null and conditionParamRef.haveSonArea != ''">
${_conditionType_} a.haveSonArea like #{${_conditionParam_}.haveSonArea}
</if>
<if test="conditionParamRef.haveSonArea == null">
${_conditionType_} a.haveSonArea is null
</if>
</if>
<if test="conditionParamRef.containsKey('haveSonAreaList')">
${_conditionType_} a.haveSonArea in
<foreach collection="conditionParamRef.haveSonAreaList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteTel')">
<if test="conditionParamRef.siteTel != null and conditionParamRef.siteTel != ''">
${_conditionType_} a.siteTel like #{${_conditionParam_}.siteTel}
......@@ -1119,106 +959,64 @@
</if>
<if test="conditionParamRef.containsKey('amWorkStartTime')">
<if test="conditionParamRef.amWorkStartTime != null and conditionParamRef.amWorkStartTime != ''">
${_conditionType_} a.amWorkStartTime like #{${_conditionParam_}.amWorkStartTime}
<if test="conditionParamRef.amWorkStartTime != null ">
${_conditionType_} a.amWorkStartTime = #{${_conditionParam_}.amWorkStartTime}
</if>
<if test="conditionParamRef.amWorkStartTime == null">
${_conditionType_} a.amWorkStartTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('amWorkStartTimeList')">
${_conditionType_} a.amWorkStartTime in
<foreach collection="conditionParamRef.amWorkStartTimeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
<if test="conditionParamRef.containsKey('amWorkStartTimeStart') and conditionParamRef.amWorkStartTimeStart != null and conditionParamRef.amWorkStartTimeStart!=''">
${_conditionType_} a.amWorkStartTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.amWorkStartTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('amWorkStartTimeEnd') and conditionParamRef.amWorkStartTimeEnd != null and conditionParamRef.amWorkStartTimeEnd!=''">
${_conditionType_} a.amWorkStartTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.amWorkStartTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('amWorkEndTime')">
<if test="conditionParamRef.amWorkEndTime != null and conditionParamRef.amWorkEndTime != ''">
${_conditionType_} a.amWorkEndTime like #{${_conditionParam_}.amWorkEndTime}
<if test="conditionParamRef.amWorkEndTime != null ">
${_conditionType_} a.amWorkEndTime = #{${_conditionParam_}.amWorkEndTime}
</if>
<if test="conditionParamRef.amWorkEndTime == null">
${_conditionType_} a.amWorkEndTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('amWorkEndTimeList')">
${_conditionType_} a.amWorkEndTime in
<foreach collection="conditionParamRef.amWorkEndTimeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
<if test="conditionParamRef.containsKey('amWorkEndTimeStart') and conditionParamRef.amWorkEndTimeStart != null and conditionParamRef.amWorkEndTimeStart!=''">
${_conditionType_} a.amWorkEndTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.amWorkEndTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('amWorkEndTimeEnd') and conditionParamRef.amWorkEndTimeEnd != null and conditionParamRef.amWorkEndTimeEnd!=''">
${_conditionType_} a.amWorkEndTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.amWorkEndTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('pmWorkStartTime')">
<if test="conditionParamRef.pmWorkStartTime != null and conditionParamRef.pmWorkStartTime != ''">
${_conditionType_} a.pmWorkStartTime like #{${_conditionParam_}.pmWorkStartTime}
<if test="conditionParamRef.pmWorkStartTime != null ">
${_conditionType_} a.pmWorkStartTime = #{${_conditionParam_}.pmWorkStartTime}
</if>
<if test="conditionParamRef.pmWorkStartTime == null">
${_conditionType_} a.pmWorkStartTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('pmWorkStartTimeList')">
${_conditionType_} a.pmWorkStartTime in
<foreach collection="conditionParamRef.pmWorkStartTimeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
<if test="conditionParamRef.containsKey('pmWorkStartTimeStart') and conditionParamRef.pmWorkStartTimeStart != null and conditionParamRef.pmWorkStartTimeStart!=''">
${_conditionType_} a.pmWorkStartTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.pmWorkStartTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('pmWorkStartTimeEnd') and conditionParamRef.pmWorkStartTimeEnd != null and conditionParamRef.pmWorkStartTimeEnd!=''">
${_conditionType_} a.pmWorkStartTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.pmWorkStartTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('pmWorkEndTime')">
<if test="conditionParamRef.pmWorkEndTime != null and conditionParamRef.pmWorkEndTime != ''">
${_conditionType_} a.pmWorkEndTime like #{${_conditionParam_}.pmWorkEndTime}
<if test="conditionParamRef.pmWorkEndTime != null ">
${_conditionType_} a.pmWorkEndTime = #{${_conditionParam_}.pmWorkEndTime}
</if>
<if test="conditionParamRef.pmWorkEndTime == null">
${_conditionType_} a.pmWorkEndTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('pmWorkEndTimeList')">
${_conditionType_} a.pmWorkEndTime in
<foreach collection="conditionParamRef.pmWorkEndTimeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
<if test="conditionParamRef.containsKey('pmWorkEndTimeStart') and conditionParamRef.pmWorkEndTimeStart != null and conditionParamRef.pmWorkEndTimeStart!=''">
${_conditionType_} a.pmWorkEndTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.pmWorkEndTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('averageTime')">
<if test="conditionParamRef.averageTime != null ">
${_conditionType_} a.averageTime = #{${_conditionParam_}.averageTime}
</if>
<if test="conditionParamRef.averageTime == null">
${_conditionType_} a.averageTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('averageTimeList')">
${_conditionType_} a.averageTime in
<foreach collection="conditionParamRef.averageTimeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('averageTimeStart') and conditionParamRef.averageTimeStart != null">
${_conditionType_} a.averageTime <![CDATA[ >= ]]> #{${_conditionParam_}.averageTimeStart}
<if test="conditionParamRef.containsKey('pmWorkEndTimeEnd') and conditionParamRef.pmWorkEndTimeEnd != null and conditionParamRef.pmWorkEndTimeEnd!=''">
${_conditionType_} a.pmWorkEndTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.pmWorkEndTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('averageTimeEnd') and conditionParamRef.averageTimeEnd != null">
${_conditionType_} a.averageTime <![CDATA[ <= ]]> #{${_conditionParam_}.averageTimeEnd}
</if>
<if test="conditionParamRef.containsKey('waitingNumber')">
<if test="conditionParamRef.waitingNumber != null ">
${_conditionType_} a.waitingNumber = #{${_conditionParam_}.waitingNumber}
</if>
<if test="conditionParamRef.waitingNumber == null">
${_conditionType_} a.waitingNumber is null
</if>
</if>
<if test="conditionParamRef.containsKey('waitingNumberList')">
${_conditionType_} a.waitingNumber in
<foreach collection="conditionParamRef.waitingNumberList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('waitingNumberStart') and conditionParamRef.waitingNumberStart != null">
${_conditionType_} a.waitingNumber <![CDATA[ >= ]]> #{${_conditionParam_}.waitingNumberStart}
</if>
<if test="conditionParamRef.containsKey('waitingNumberEnd') and conditionParamRef.waitingNumberEnd != null">
${_conditionType_} a.waitingNumber <![CDATA[ <= ]]> #{${_conditionParam_}.waitingNumberEnd}
</if>
<if test="conditionParamRef.containsKey('workday1')">
<if test="conditionParamRef.workday1 != null ">
${_conditionType_} a.workday1 = #{${_conditionParam_}.workday1}
......@@ -1408,48 +1206,6 @@
${_conditionType_} a.building <![CDATA[ <= ]]> #{${_conditionParam_}.buildingEnd}
</if>
<if test="conditionParamRef.containsKey('isSite')">
<if test="conditionParamRef.isSite != null ">
${_conditionType_} a.isSite = #{${_conditionParam_}.isSite}
</if>
<if test="conditionParamRef.isSite == null">
${_conditionType_} a.isSite is null
</if>
</if>
<if test="conditionParamRef.containsKey('isSiteList')">
${_conditionType_} a.isSite in
<foreach collection="conditionParamRef.isSiteList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isSiteStart') and conditionParamRef.isSiteStart != null">
${_conditionType_} a.isSite <![CDATA[ >= ]]> #{${_conditionParam_}.isSiteStart}
</if>
<if test="conditionParamRef.containsKey('isSiteEnd') and conditionParamRef.isSiteEnd != null">
${_conditionType_} a.isSite <![CDATA[ <= ]]> #{${_conditionParam_}.isSiteEnd}
</if>
<if test="conditionParamRef.containsKey('status')">
<if test="conditionParamRef.status != null ">
${_conditionType_} a.status = #{${_conditionParam_}.status}
</if>
<if test="conditionParamRef.status == null">
${_conditionType_} a.status is null
</if>
</if>
<if test="conditionParamRef.containsKey('statusList')">
${_conditionType_} a.status in
<foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('statusStart') and conditionParamRef.statusStart != null">
${_conditionType_} a.status <![CDATA[ >= ]]> #{${_conditionParam_}.statusStart}
</if>
<if test="conditionParamRef.containsKey('statusEnd') and conditionParamRef.statusEnd != null">
${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd}
</if>
<if test="conditionParamRef.containsKey('logoPath')">
<if test="conditionParamRef.logoPath != null and conditionParamRef.logoPath != ''">
......@@ -1481,6 +1237,21 @@
</foreach>
</if>
<if test="conditionParamRef.containsKey('modelIds')">
<if test="conditionParamRef.modelIds != null and conditionParamRef.modelIds != ''">
${_conditionType_} a.modelIds like #{${_conditionParam_}.modelIds}
</if>
<if test="conditionParamRef.modelIds == null">
${_conditionType_} a.modelIds is null
</if>
</if>
<if test="conditionParamRef.containsKey('modelIdsList')">
${_conditionType_} a.modelIds in
<foreach collection="conditionParamRef.modelIdsList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
......@@ -1531,21 +1302,6 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('modelIds')">
<if test="conditionParamRef.modelIds != null and conditionParamRef.modelIds != ''">
${_conditionType_} a.modelIds like #{${_conditionParam_}.modelIds}
</if>
<if test="conditionParamRef.modelIds == null">
${_conditionType_} a.modelIds is null
</if>
</if>
<if test="conditionParamRef.containsKey('modelIdsList')">
${_conditionType_} a.modelIds in
<foreach collection="conditionParamRef.modelIdsList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -1569,29 +1325,24 @@
<if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('parentId')">
a.parentId
<if test='orderCol.parentId != null and "DESC".equalsIgnoreCase(orderCol.parentId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('ancestors')">
a.ancestors
<if test='orderCol.ancestors != null and "DESC".equalsIgnoreCase(orderCol.ancestors)'>DESC</if>
<if test="orderCol.containsKey('siteCode')">
a.siteCode
<if test='orderCol.siteCode != null and "DESC".equalsIgnoreCase(orderCol.siteCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('regionCode')">
a.regionCode
<if test='orderCol.regionCode != null and "DESC".equalsIgnoreCase(orderCol.regionCode)'>DESC</if>
<if test="orderCol.containsKey('areaID')">
a.areaID
<if test='orderCol.areaID != null and "DESC".equalsIgnoreCase(orderCol.areaID)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('iid')">
a.iid
<if test='orderCol.iid != null and "DESC".equalsIgnoreCase(orderCol.iid)'>DESC</if>
<if test="orderCol.containsKey('areaCode')">
a.areaCode
<if test='orderCol.areaCode != null and "DESC".equalsIgnoreCase(orderCol.areaCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('siteCode')">
a.siteCode
<if test='orderCol.siteCode != null and "DESC".equalsIgnoreCase(orderCol.siteCode)'>DESC</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')">
......@@ -1599,16 +1350,16 @@
<if test='orderCol.proCode != null and "DESC".equalsIgnoreCase(orderCol.proCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('areaCode')">
a.areaCode
<if test='orderCol.areaCode != null and "DESC".equalsIgnoreCase(orderCol.areaCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('cityCode')">
a.cityCode
<if test='orderCol.cityCode != null and "DESC".equalsIgnoreCase(orderCol.cityCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('districtCode')">
a.districtCode
<if test='orderCol.districtCode != null and "DESC".equalsIgnoreCase(orderCol.districtCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('siteIp')">
a.siteIp
<if test='orderCol.siteIp != null and "DESC".equalsIgnoreCase(orderCol.siteIp)'>DESC</if>
......@@ -1629,11 +1380,6 @@
<if test='orderCol.latitude != null and "DESC".equalsIgnoreCase(orderCol.latitude)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('haveSonArea')">
a.haveSonArea
<if test='orderCol.haveSonArea != null and "DESC".equalsIgnoreCase(orderCol.haveSonArea)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('siteTel')">
a.siteTel
<if test='orderCol.siteTel != null and "DESC".equalsIgnoreCase(orderCol.siteTel)'>DESC</if>
......@@ -1669,16 +1415,6 @@
<if test='orderCol.pmWorkEndTime != null and "DESC".equalsIgnoreCase(orderCol.pmWorkEndTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('averageTime')">
a.averageTime
<if test='orderCol.averageTime != null and "DESC".equalsIgnoreCase(orderCol.averageTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('waitingNumber')">
a.waitingNumber
<if test='orderCol.waitingNumber != null and "DESC".equalsIgnoreCase(orderCol.waitingNumber)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('workday1')">
a.workday1
<if test='orderCol.workday1 != null and "DESC".equalsIgnoreCase(orderCol.workday1)'>DESC</if>
......@@ -1724,16 +1460,6 @@
<if test='orderCol.building != null and "DESC".equalsIgnoreCase(orderCol.building)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('isSite')">
a.isSite
<if test='orderCol.isSite != null and "DESC".equalsIgnoreCase(orderCol.isSite)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('status')">
a.status
<if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('logoPath')">
a.logoPath
<if test='orderCol.logoPath != null and "DESC".equalsIgnoreCase(orderCol.logoPath)'>DESC</if>
......@@ -1744,6 +1470,11 @@
<if test='orderCol.englishName != null and "DESC".equalsIgnoreCase(orderCol.englishName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('modelIds')">
a.modelIds
<if test='orderCol.modelIds != null and "DESC".equalsIgnoreCase(orderCol.modelIds)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createTime')">
a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
......@@ -1759,11 +1490,6 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('modelIds')">
a.modelIds
<if test='orderCol.modelIds != null and "DESC".equalsIgnoreCase(orderCol.modelIds)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment