Skip to content

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

添加站点负责人与电话

parent 5664fa5a
Hide whitespace changes
Inline Side-by-side
Showing with 420 additions and 1646 deletions
base-manager/db/base_modules.sql
View file @ e8099a04
...@@ -49,31 +49,25 @@ CREATE TABLE `mortals_sys_area` ( ...@@ -49,31 +49,25 @@ CREATE TABLE `mortals_sys_area` (
DROP TABLE IF EXISTS `mortals_sys_site`; DROP TABLE IF EXISTS `mortals_sys_site`;
CREATE TABLE mortals_sys_site( CREATE TABLE mortals_sys_site(
`id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长', `id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长',
`siteName` varchar(64) COMMENT '站点名称', `siteName` varchar(255) COMMENT '站点名称',
`parentId` bigint(20) COMMENT '父级id,默认0',
`ancestors` varchar(255) COMMENT '祖级列表，逗号分隔',
`regionCode` varchar(32) COMMENT '区域编号',
`iid` varchar(32) COMMENT '标识ID',
`siteCode` varchar(64) COMMENT '站点编号', `siteCode` varchar(64) COMMENT '站点编号',
`areaID` varchar(32) COMMENT '区域Id',
`areaCode` varchar(32) COMMENT '区域编号',
`areaName` varchar(32) COMMENT '区域名称',
`proCode` varchar(32) COMMENT '省编码', `proCode` varchar(32) COMMENT '省编码',
`areaID` varchar(32) COMMENT '区域ID',
`areaCode` varchar(32) COMMENT '区域编码',
`cityCode` varchar(32) COMMENT '市编码', `cityCode` varchar(32) COMMENT '市编码',
`districtCode` varchar(32) COMMENT '区编码', `districtCode` varchar(32) COMMENT '区编码',
`siteIp` varchar(32) COMMENT '站点服务器ip', `siteIp` varchar(32) COMMENT '站点服务器ip',
`sitePort` varchar(8) COMMENT '站点服务器端口', `sitePort` varchar(8) COMMENT '站点服务器端口',
`longitude` varchar(32) COMMENT '经度', `longitude` varchar(32) COMMENT '经度',
`latitude` varchar(32) COMMENT '纬度', `latitude` varchar(32) COMMENT '纬度',
`haveSonArea` char(5) COMMENT '是否有下级(0.否，1.是)',
`siteTel` varchar(32) COMMENT '中心联系电话', `siteTel` varchar(32) COMMENT '中心联系电话',
`detailAddress` varchar(255) COMMENT '中心详细地址', `detailAddress` varchar(255) COMMENT '中心详细地址',
`siteRemark` varchar(255) COMMENT '中心介绍', `siteRemark` text COMMENT '中心介绍',
`amWorkStartTime` varchar(32) COMMENT '上午上班开始时间', `amWorkStartTime` datetime COMMENT '上午上班开始时间',
`amWorkEndTime` varchar(32) COMMENT '上午上班结束时间', `amWorkEndTime` datetime COMMENT '上午上班结束时间',
`pmWorkStartTime` varchar(32) COMMENT '下午上班开始时间', `pmWorkStartTime` datetime COMMENT '下午上班开始时间',
`pmWorkEndTime` varchar(32) COMMENT '下午上班结束时间', `pmWorkEndTime` datetime COMMENT '下午上班结束时间',
`averageTime` int(5) COMMENT '平均等待时间,后期删除',
`waitingNumber` int(5) COMMENT '等待人数,后期删除',
`workday1` tinyint(2) COMMENT '周一 (1.上班，0.不上)', `workday1` tinyint(2) COMMENT '周一 (1.上班，0.不上)',
`workday2` tinyint(2) COMMENT '周二 (1.上班，0.不上)', `workday2` tinyint(2) COMMENT '周二 (1.上班，0.不上)',
`workday3` tinyint(2) COMMENT '周三 (1.上班，0.不上)', `workday3` tinyint(2) COMMENT '周三 (1.上班，0.不上)',
...@@ -81,25 +75,21 @@ CREATE TABLE mortals_sys_site( ...@@ -81,25 +75,21 @@ CREATE TABLE mortals_sys_site(
`workday5` tinyint(2) COMMENT '周五 (1.上班，0.不上)', `workday5` tinyint(2) COMMENT '周五 (1.上班，0.不上)',
`workday6` tinyint(2) COMMENT '周六 (1.上班，0.不上)', `workday6` tinyint(2) COMMENT '周六 (1.上班，0.不上)',
`workday7` tinyint(2) COMMENT '周日 (1.上班，0.不上)', `workday7` tinyint(2) COMMENT '周日 (1.上班，0.不上)',
`level` tinyint(2) COMMENT '楼层', `level` int(4) COMMENT '楼层',
`building` tinyint(4) COMMENT '楼栋', `building` int(4) COMMENT '楼栋',
`isSite` tinyint(2) COMMENT '是否是站点 (1.是,0.否)', `logoPath` varchar(255) COMMENT 'logo图片地址',
`status` tinyint(2) COMMENT '站点状态 (0.停用，1.正常)', `englishName` varchar(255) COMMENT '英文名称',
`logoPath` varchar(32) COMMENT '设备logo地址',
`englishName` varchar(32) COMMENT '站点英文名称',
`leadingOfficial` varchar(64) COMMENT '负责人', `leadingOfficial` varchar(64) COMMENT '负责人',
`leadingOfficialTelephone` varchar(64) COMMENT '联系电话', `leadingOfficialTelephone` varchar(64) COMMENT '联系电话',
`modelIds` varchar(256) COMMENT '部署模块，逗号分隔',
`createTime` datetime COMMENT '创建时间', `createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户', `createUserId` bigint(20) COMMENT '创建用户',
`updateTime` datetime COMMENT '修改时间', `updateTime` datetime COMMENT '修改时间',
`modelIds` varchar(256) COMMENT '部署模块，逗号分隔',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='站点'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='站点';
-- ---------------------------- -- ----------------------------
-- 业务表 -- 业务表
-- ---------------------------- -- ----------------------------
......
base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteEntity.java
View file @ e8099a04
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;
...@@ -21,37 +22,25 @@ public class SiteEntity extends SiteVo { ...@@ -21,37 +22,25 @@ public class SiteEntity extends SiteVo {
*/ */
private String siteName; private String siteName;
/** /**
* 父级id,默认0 * 站点编号
*/ */
private Long parentId; private String siteCode;
/** /**
* 祖级列表，逗号分隔 * 区域Id
*/ */
private String ancestors; private String areaID;
/** /**
* 区域编号 * 区域编号
*/ */
private String regionCode; private String areaCode;
/**
* 标识ID
*/
private String iid;
/** /**
* 站点编号 * 区域名称
*/ */
private String siteCode; private String areaName;
/** /**
* 省编码 * 省编码
*/ */
private String proCode; private String proCode;
/**
* 区域ID
*/
private String areaID;
/**
* 区域编码
*/
private String areaCode;
/** /**
* 市编码 * 市编码
*/ */
...@@ -76,10 +65,6 @@ public class SiteEntity extends SiteVo { ...@@ -76,10 +65,6 @@ public class SiteEntity extends SiteVo {
* 纬度 * 纬度
*/ */
private String latitude; private String latitude;
/**
* 是否有下级(0.否，1.是)
*/
private String haveSonArea;
/** /**
* 中心联系电话 * 中心联系电话
*/ */
...@@ -95,27 +80,19 @@ public class SiteEntity extends SiteVo { ...@@ -95,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 Date pmWorkEndTime;
/**
* 平均等待时间,后期删除
*/
private Integer averageTime;
/**
* 等待人数,后期删除
*/
private Integer waitingNumber;
/** /**
* 周一 (1.上班，0.不上) * 周一 (1.上班，0.不上)
*/ */
...@@ -153,19 +130,11 @@ public class SiteEntity extends SiteVo { ...@@ -153,19 +130,11 @@ public class SiteEntity extends SiteVo {
*/ */
private Integer building; private Integer building;
/** /**
* 是否是站点 (1.是,0.否) * logo图片地址
*/
private Integer isSite;
/**
* 站点状态 (0.停用，1.正常)
*/
private Integer status;
/**
* 设备logo地址
*/ */
private String logoPath; private String logoPath;
/** /**
* 站点英文名称 * 英文名称
*/ */
private String englishName; private String englishName;
/** /**
...@@ -199,74 +168,60 @@ public class SiteEntity extends SiteVo { ...@@ -199,74 +168,60 @@ public class SiteEntity extends SiteVo {
this.siteName = siteName; this.siteName = siteName;
} }
/** /**
* 获取 父级id,默认0 * 获取 站点编号
* @return Long * @return String
*/ */
public Long getParentId(){ public String getSiteCode(){
return parentId; return siteCode;
} }
/** /**
* 设置 父级id,默认0 * 设置 站点编号
* @param parentId * @param siteCode
*/ */
public void setParentId(Long parentId){ public void setSiteCode(String siteCode){
this.parentId = parentId; this.siteCode = siteCode;
} }
/** /**
* 获取 祖级列表，逗号分隔 * 获取 区域Id
* @return String * @return String
*/ */
public String getAncestors(){ public String getAreaID(){
return ancestors; return areaID;
} }
/** /**
* 设置 祖级列表，逗号分隔 * 设置 区域Id
* @param ancestors * @param areaID
*/ */
public void setAncestors(String ancestors){ public void setAreaID(String areaID){
this.ancestors = ancestors; this.areaID = areaID;
} }
/** /**
* 获取 区域编号 * 获取 区域编号
* @return String * @return String
*/ */
public String getRegionCode(){ public String getAreaCode(){
return regionCode; return areaCode;
} }
/** /**
* 设置 区域编号 * 设置 区域编号
* @param regionCode * @param areaCode
*/
public void setRegionCode(String regionCode){
this.regionCode = regionCode;
}
/**
* 获取 标识ID
* @return String
*/
public String getIid(){
return iid;
}
/**
* 设置 标识ID
* @param iid
*/ */
public void setIid(String iid){ public void setAreaCode(String areaCode){
this.iid = iid; this.areaCode = areaCode;
} }
/** /**
* 获取 站点编号 * 获取 区域名称
* @return String * @return String
*/ */
public String getSiteCode(){ public String getAreaName(){
return siteCode; return areaName;
} }
/** /**
* 设置 站点编号 * 设置 区域名称
* @param siteCode * @param areaName
*/ */
public void setSiteCode(String siteCode){ public void setAreaName(String areaName){
this.siteCode = siteCode; this.areaName = areaName;
} }
/** /**
* 获取 省编码 * 获取 省编码
...@@ -282,34 +237,6 @@ public class SiteEntity extends SiteVo { ...@@ -282,34 +237,6 @@ public class SiteEntity extends SiteVo {
public void setProCode(String proCode){ public void setProCode(String proCode){
this.proCode = proCode; this.proCode = proCode;
} }
/**
* 获取 区域ID
* @return String
*/
public String getAreaID(){
return areaID;
}
/**
* 设置 区域ID
* @param areaID
*/
public void setAreaID(String areaID){
this.areaID = areaID;
}
/**
* 获取 区域编码
* @return String
*/
public String getAreaCode(){
return areaCode;
}
/**
* 设置 区域编码
* @param areaCode
*/
public void setAreaCode(String areaCode){
this.areaCode = areaCode;
}
/** /**
* 获取 市编码 * 获取 市编码
* @return String * @return String
...@@ -394,20 +321,6 @@ public class SiteEntity extends SiteVo { ...@@ -394,20 +321,6 @@ public class SiteEntity extends SiteVo {
public void setLatitude(String latitude){ public void setLatitude(String latitude){
this.latitude = 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 * @return String
...@@ -452,88 +365,60 @@ public class SiteEntity extends SiteVo { ...@@ -452,88 +365,60 @@ public class SiteEntity extends SiteVo {
} }
/** /**
* 获取 上午上班开始时间 * 获取 上午上班开始时间
* @return String * @return Date
*/ */
public String getAmWorkStartTime(){ public Date getAmWorkStartTime(){
return amWorkStartTime; return amWorkStartTime;
} }
/** /**
* 设置 上午上班开始时间 * 设置 上午上班开始时间
* @param amWorkStartTime * @param amWorkStartTime
*/ */
public void setAmWorkStartTime(String amWorkStartTime){ public void setAmWorkStartTime(Date amWorkStartTime){
this.amWorkStartTime = amWorkStartTime; this.amWorkStartTime = amWorkStartTime;
} }
/** /**
* 获取 上午上班结束时间 * 获取 上午上班结束时间
* @return String * @return Date
*/ */
public String getAmWorkEndTime(){ public Date getAmWorkEndTime(){
return amWorkEndTime; return amWorkEndTime;
} }
/** /**
* 设置 上午上班结束时间 * 设置 上午上班结束时间
* @param amWorkEndTime * @param amWorkEndTime
*/ */
public void setAmWorkEndTime(String amWorkEndTime){ public void setAmWorkEndTime(Date amWorkEndTime){
this.amWorkEndTime = amWorkEndTime; this.amWorkEndTime = amWorkEndTime;
} }
/** /**
* 获取 下午上班开始时间 * 获取 下午上班开始时间
* @return String * @return Date
*/ */
public String getPmWorkStartTime(){ public Date getPmWorkStartTime(){
return pmWorkStartTime; return pmWorkStartTime;
} }
/** /**
* 设置 下午上班开始时间 * 设置 下午上班开始时间
* @param pmWorkStartTime * @param pmWorkStartTime
*/ */
public void setPmWorkStartTime(String pmWorkStartTime){ public void setPmWorkStartTime(Date pmWorkStartTime){
this.pmWorkStartTime = pmWorkStartTime; this.pmWorkStartTime = pmWorkStartTime;
} }
/** /**
* 获取 下午上班结束时间 * 获取 下午上班结束时间
* @return String * @return Date
*/ */
public String getPmWorkEndTime(){ public Date getPmWorkEndTime(){
return pmWorkEndTime; return pmWorkEndTime;
} }
/** /**
* 设置 下午上班结束时间 * 设置 下午上班结束时间
* @param pmWorkEndTime * @param pmWorkEndTime
*/ */
public void setPmWorkEndTime(String pmWorkEndTime){ public void setPmWorkEndTime(Date pmWorkEndTime){
this.pmWorkEndTime = 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.不上) * 获取 周一 (1.上班，0.不上)
* @return Integer * @return Integer
...@@ -661,56 +546,28 @@ public class SiteEntity extends SiteVo { ...@@ -661,56 +546,28 @@ public class SiteEntity extends SiteVo {
this.building = building; this.building = building;
} }
/** /**
* 获取 是否是站点 (1.是,0.否) * 获取 logo图片地址
* @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地址
* @return String * @return String
*/ */
public String getLogoPath(){ public String getLogoPath(){
return logoPath; return logoPath;
} }
/** /**
* 设置 设备logo地址 * 设置 logo图片地址
* @param logoPath * @param logoPath
*/ */
public void setLogoPath(String logoPath){ public void setLogoPath(String logoPath){
this.logoPath = logoPath; this.logoPath = logoPath;
} }
/** /**
* 获取 站点英文名称 * 获取 英文名称
* @return String * @return String
*/ */
public String getEnglishName(){ public String getEnglishName(){
return englishName; return englishName;
} }
/** /**
* 设置 站点英文名称 * 设置 英文名称
* @param englishName * @param englishName
*/ */
public void setEnglishName(String englishName){ public void setEnglishName(String englishName){
...@@ -781,21 +638,17 @@ public class SiteEntity extends SiteVo { ...@@ -781,21 +638,17 @@ public class SiteEntity extends SiteVo {
public String toString(){ public String toString(){
StringBuilder sb = new StringBuilder(""); StringBuilder sb = new StringBuilder("");
sb.append(",siteName:").append(getSiteName()); 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(",siteCode:").append(getSiteCode());
sb.append(",proCode:").append(getProCode());
sb.append(",areaID:").append(getAreaID()); sb.append(",areaID:").append(getAreaID());
sb.append(",areaCode:").append(getAreaCode()); sb.append(",areaCode:").append(getAreaCode());
sb.append(",areaName:").append(getAreaName());
sb.append(",proCode:").append(getProCode());
sb.append(",cityCode:").append(getCityCode()); sb.append(",cityCode:").append(getCityCode());
sb.append(",districtCode:").append(getDistrictCode()); sb.append(",districtCode:").append(getDistrictCode());
sb.append(",siteIp:").append(getSiteIp()); sb.append(",siteIp:").append(getSiteIp());
sb.append(",sitePort:").append(getSitePort()); sb.append(",sitePort:").append(getSitePort());
sb.append(",longitude:").append(getLongitude()); sb.append(",longitude:").append(getLongitude());
sb.append(",latitude:").append(getLatitude()); sb.append(",latitude:").append(getLatitude());
sb.append(",haveSonArea:").append(getHaveSonArea());
sb.append(",siteTel:").append(getSiteTel()); sb.append(",siteTel:").append(getSiteTel());
sb.append(",detailAddress:").append(getDetailAddress()); sb.append(",detailAddress:").append(getDetailAddress());
sb.append(",siteRemark:").append(getSiteRemark()); sb.append(",siteRemark:").append(getSiteRemark());
...@@ -803,8 +656,6 @@ public class SiteEntity extends SiteVo { ...@@ -803,8 +656,6 @@ public class SiteEntity extends SiteVo {
sb.append(",amWorkEndTime:").append(getAmWorkEndTime()); sb.append(",amWorkEndTime:").append(getAmWorkEndTime());
sb.append(",pmWorkStartTime:").append(getPmWorkStartTime()); sb.append(",pmWorkStartTime:").append(getPmWorkStartTime());
sb.append(",pmWorkEndTime:").append(getPmWorkEndTime()); sb.append(",pmWorkEndTime:").append(getPmWorkEndTime());
sb.append(",averageTime:").append(getAverageTime());
sb.append(",waitingNumber:").append(getWaitingNumber());
sb.append(",workday1:").append(getWorkday1()); sb.append(",workday1:").append(getWorkday1());
sb.append(",workday2:").append(getWorkday2()); sb.append(",workday2:").append(getWorkday2());
sb.append(",workday3:").append(getWorkday3()); sb.append(",workday3:").append(getWorkday3());
...@@ -814,8 +665,6 @@ public class SiteEntity extends SiteVo { ...@@ -814,8 +665,6 @@ public class SiteEntity extends SiteVo {
sb.append(",workday7:").append(getWorkday7()); sb.append(",workday7:").append(getWorkday7());
sb.append(",level:").append(getLevel()); sb.append(",level:").append(getLevel());
sb.append(",building:").append(getBuilding()); sb.append(",building:").append(getBuilding());
sb.append(",isSite:").append(getIsSite());
sb.append(",status:").append(getStatus());
sb.append(",logoPath:").append(getLogoPath()); sb.append(",logoPath:").append(getLogoPath());
sb.append(",englishName:").append(getEnglishName()); sb.append(",englishName:").append(getEnglishName());
sb.append(",leadingOfficial:").append(getLeadingOfficial()); sb.append(",leadingOfficial:").append(getLeadingOfficial());
...@@ -826,55 +675,43 @@ public class SiteEntity extends SiteVo { ...@@ -826,55 +675,43 @@ public class SiteEntity extends SiteVo {
public void initAttrValue(){ public void initAttrValue(){
this.siteName = ""; this.siteName = null;
this.parentId = null; this.siteCode = null;
this.ancestors = ""; this.areaID = null;
this.regionCode = ""; this.areaCode = null;
this.iid = ""; this.areaName = null;
this.siteCode = ""; this.proCode = null;
this.proCode = ""; this.cityCode = null;
this.areaID = ""; this.districtCode = null;
this.areaCode = ""; this.siteIp = null;
this.cityCode = ""; this.sitePort = null;
this.districtCode = ""; this.longitude = null;
this.siteIp = ""; this.latitude = null;
this.sitePort = ""; this.siteTel = null;
this.longitude = ""; this.detailAddress = null;
this.latitude = ""; this.siteRemark = null;
this.haveSonArea = "0"; this.amWorkStartTime = null;
this.siteTel = ""; this.amWorkEndTime = null;
this.detailAddress = ""; this.pmWorkStartTime = null;
this.siteRemark = ""; this.pmWorkEndTime = null;
this.amWorkStartTime = "";
this.amWorkEndTime = "";
this.pmWorkStartTime = "";
this.pmWorkEndTime = "";
this.averageTime = null;
this.waitingNumber = null;
this.workday1 = 1; this.workday1 = 1;
...@@ -890,13 +727,9 @@ public class SiteEntity extends SiteVo { ...@@ -890,13 +727,9 @@ public class SiteEntity extends SiteVo {
this.workday7 = 0; this.workday7 = 0;
this.level = null; this.level = 1;
this.building = null;
this.isSite = 0;
this.status = 1; this.building = 1;
this.logoPath = ""; this.logoPath = "";
......
base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteQuery.java
View file @ e8099a04
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;
/** /**
...@@ -24,39 +25,21 @@ public class SiteQuery extends SiteEntity { ...@@ -24,39 +25,21 @@ public class SiteQuery extends SiteEntity {
/** 站点名称 */ /** 站点名称 */
private List<String> siteNameList; private List<String> siteNameList;
/** 开始 父级id,默认0 */ /** 站点编号 */
private Long parentIdStart; private List<String> siteCodeList;
/** 结束 父级id,默认0 */
private Long parentIdEnd;
/** 增加 父级id,默认0 */
private Long parentIdIncrement;
/** 父级id,默认0列表 */
private List <Long> parentIdList;
/** 祖级列表，逗号分隔 */ /** 区域Id */
private List<String> ancestorsList; private List<String> areaIDList;
/** 区域编号 */ /** 区域编号 */
private List<String> regionCodeList; private List<String> areaCodeList;
/** 标识ID */
private List<String> iidList;
/** 站点编号 */ /** 区域名称 */
private List<String> siteCodeList; private List<String> areaNameList;
/** 省编码 */ /** 省编码 */
private List<String> proCodeList; private List<String> proCodeList;
/** 区域ID */
private List<String> areaIDList;
/** 区域编码 */
private List<String> areaCodeList;
/** 市编码 */ /** 市编码 */
private List<String> cityCodeList; private List<String> cityCodeList;
...@@ -75,9 +58,6 @@ public class SiteQuery extends SiteEntity { ...@@ -75,9 +58,6 @@ public class SiteQuery extends SiteEntity {
/** 纬度 */ /** 纬度 */
private List<String> latitudeList; private List<String> latitudeList;
/** 是否有下级(0.否，1.是) */
private List<String> haveSonAreaList;
/** 中心联系电话 */ /** 中心联系电话 */
private List<String> siteTelList; private List<String> siteTelList;
...@@ -87,41 +67,29 @@ public class SiteQuery extends SiteEntity { ...@@ -87,41 +67,29 @@ public class SiteQuery extends SiteEntity {
/** 中心介绍 */ /** 中心介绍 */
private List<String> siteRemarkList; private List<String> siteRemarkList;
/** 上午上班开始时间 */ /** 开始 上午上班开始时间 */
private List<String> amWorkStartTimeList; private String amWorkStartTimeStart;
/** 上午上班结束时间 */
private List<String> amWorkEndTimeList;
/** 下午上班开始时间 */ /** 结束 上午上班开始时间 */
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 String pmWorkEndTimeEnd;
/** 结束 等待人数,后期删除 */
private Integer waitingNumberEnd;
/** 增加 等待人数,后期删除 */
private Integer waitingNumberIncrement;
/** 等待人数,后期删除列表 */
private List <Integer> waitingNumberList;
/** 开始 周一 (1.上班，0.不上) */ /** 开始 周一 (1.上班，0.不上) */
private Integer workday1Start; private Integer workday1Start;
...@@ -231,34 +199,10 @@ public class SiteQuery extends SiteEntity { ...@@ -231,34 +199,10 @@ public class SiteQuery extends SiteEntity {
/** 楼栋列表 */ /** 楼栋列表 */
private List <Integer> buildingList; private List <Integer> buildingList;
/** 开始 是否是站点 (1.是,0.否) */ /** logo图片地址 */
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地址 */
private List<String> logoPathList; private List<String> logoPathList;
/** 站点英文名称 */ /** 英文名称 */
private List<String> englishNameList; private List<String> englishNameList;
/** 负责人 */ /** 负责人 */
...@@ -267,6 +211,9 @@ public class SiteQuery extends SiteEntity { ...@@ -267,6 +211,9 @@ public class SiteQuery extends SiteEntity {
/** 联系电话 */ /** 联系电话 */
private List<String> leadingOfficialTelephoneList; private List<String> leadingOfficialTelephoneList;
/** 部署模块，逗号分隔 */
private List<String> modelIdsList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -291,9 +238,6 @@ public class SiteQuery extends SiteEntity { ...@@ -291,9 +238,6 @@ public class SiteQuery extends SiteEntity {
/** 结束 修改时间 */ /** 结束 修改时间 */
private String updateTimeEnd; 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) */ /** 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;
...@@ -382,128 +326,64 @@ public class SiteQuery extends SiteEntity { ...@@ -382,128 +326,64 @@ public class SiteQuery extends SiteEntity {
this.siteNameList = siteNameList; this.siteNameList = siteNameList;
} }
/** /**
* 获取 开始 父级id,默认0 * 获取 站点编号
* @return parentIdStart * @return siteCodeList
*/
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
*/ */
public List<Long> getParentIdList(){ public List<String> getSiteCodeList(){
return this.parentIdList; return this.siteCodeList;
} }
/** /**
* 设置 父级id,默认0 * 设置 站点编号
* @param parentIdList * @param siteCodeList
*/ */
public void setParentIdList(List<Long> parentIdList){ public void setSiteCodeList(List<String> siteCodeList){
this.parentIdList = parentIdList; this.siteCodeList = siteCodeList;
} }
/** /**
* 获取 祖级列表，逗号分隔 * 获取 区域Id
* @return ancestorsList * @return areaIDList
*/ */
public List<String> getAncestorsList(){ public List<String> getAreaIDList(){
return this.ancestorsList; return this.areaIDList;
} }
/** /**
* 设置 祖级列表，逗号分隔 * 设置 区域Id
* @param ancestorsList * @param areaIDList
*/ */
public void setAncestorsList(List<String> ancestorsList){ public void setAreaIDList(List<String> areaIDList){
this.ancestorsList = ancestorsList; this.areaIDList = areaIDList;
} }
/** /**
* 获取 区域编号 * 获取 区域编号
* @return regionCodeList * @return areaCodeList
*/ */
public List<String> getRegionCodeList(){ public List<String> getAreaCodeList(){
return this.regionCodeList; return this.areaCodeList;
} }
/** /**
* 设置 区域编号 * 设置 区域编号
* @param regionCodeList * @param areaCodeList
*/
public void setRegionCodeList(List<String> regionCodeList){
this.regionCodeList = regionCodeList;
}
/**
* 获取 标识ID
* @return iidList
*/
public List<String> getIidList(){
return this.iidList;
}
/**
* 设置 标识ID
* @param iidList
*/ */
public void setIidList(List<String> iidList){ public void setAreaCodeList(List<String> areaCodeList){
this.iidList = iidList; this.areaCodeList = areaCodeList;
} }
/** /**
* 获取 站点编号 * 获取 区域名称
* @return siteCodeList * @return areaNameList
*/ */
public List<String> getSiteCodeList(){ public List<String> getAreaNameList(){
return this.siteCodeList; return this.areaNameList;
} }
/** /**
* 设置 站点编号 * 设置 区域名称
* @param siteCodeList * @param areaNameList
*/ */
public void setSiteCodeList(List<String> siteCodeList){ public void setAreaNameList(List<String> areaNameList){
this.siteCodeList = siteCodeList; this.areaNameList = areaNameList;
} }
/** /**
* 获取 省编码 * 获取 省编码
...@@ -520,36 +400,6 @@ public class SiteQuery extends SiteEntity { ...@@ -520,36 +400,6 @@ public class SiteQuery extends SiteEntity {
public void setProCodeList(List<String> proCodeList){ public void setProCodeList(List<String> proCodeList){
this.proCodeList = proCodeList; this.proCodeList = proCodeList;
} }
/**
* 获取 区域ID
* @return areaIDList
*/
public List<String> getAreaIDList(){
return this.areaIDList;
}
/**
* 设置 区域ID
* @param areaIDList
*/
public void setAreaIDList(List<String> areaIDList){
this.areaIDList = areaIDList;
}
/**
* 获取 区域编码
* @return areaCodeList
*/
public List<String> getAreaCodeList(){
return this.areaCodeList;
}
/**
* 设置 区域编码
* @param areaCodeList
*/
public void setAreaCodeList(List<String> areaCodeList){
this.areaCodeList = areaCodeList;
}
/** /**
* 获取 市编码 * 获取 市编码
* @return cityCodeList * @return cityCodeList
...@@ -640,21 +490,6 @@ public class SiteQuery extends SiteEntity { ...@@ -640,21 +490,6 @@ public class SiteQuery extends SiteEntity {
public void setLatitudeList(List<String> latitudeList){ public void setLatitudeList(List<String> latitudeList){
this.latitudeList = 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 * @return siteTelList
...@@ -701,191 +536,131 @@ public class SiteQuery extends SiteEntity { ...@@ -701,191 +536,131 @@ public class SiteQuery extends SiteEntity {
this.siteRemarkList = siteRemarkList; this.siteRemarkList = siteRemarkList;
} }
/** /**
* 获取 上午上班开始时间 * 获取 开始 上午上班开始时间
* @return amWorkStartTimeList * @return amWorkStartTimeStart
*/
public List<String> getAmWorkStartTimeList(){
return this.amWorkStartTimeList;
}
/**
* 设置 上午上班开始时间
* @param amWorkStartTimeList
*/
public void setAmWorkStartTimeList(List<String> amWorkStartTimeList){
this.amWorkStartTimeList = amWorkStartTimeList;
}
/**
* 获取 上午上班结束时间
* @return amWorkEndTimeList
*/
public List<String> getAmWorkEndTimeList(){
return this.amWorkEndTimeList;
}
/**
* 设置 上午上班结束时间
* @param amWorkEndTimeList
*/
public void setAmWorkEndTimeList(List<String> amWorkEndTimeList){
this.amWorkEndTimeList = amWorkEndTimeList;
}
/**
* 获取 下午上班开始时间
* @return pmWorkStartTimeList
*/
public List<String> getPmWorkStartTimeList(){
return this.pmWorkStartTimeList;
}
/**
* 设置 下午上班开始时间
* @param pmWorkStartTimeList
*/
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(){ public String getAmWorkStartTimeStart(){
return this.averageTimeStart; return this.amWorkStartTimeStart;
} }
/** /**
* 设置 开始 平均等待时间,后期删除 * 设置 开始 上午上班开始时间
* @param averageTimeStart * @param amWorkStartTimeStart
*/ */
public void setAverageTimeStart(Integer averageTimeStart){ public void setAmWorkStartTimeStart(String amWorkStartTimeStart){
this.averageTimeStart = averageTimeStart; this.amWorkStartTimeStart = amWorkStartTimeStart;
} }
/** /**
* 获取 结束 平均等待时间,后期删除 * 获取 结束 上午上班开始时间
* @return $averageTimeEnd * @return amWorkStartTimeEnd
*/ */
public Integer getAverageTimeEnd(){ public String getAmWorkStartTimeEnd(){
return this.averageTimeEnd; return this.amWorkStartTimeEnd;
} }
/** /**
* 设置 结束 平均等待时间,后期删除 * 设置 结束 上午上班开始时间
* @param averageTimeEnd * @param amWorkStartTimeEnd
*/ */
public void setAverageTimeEnd(Integer averageTimeEnd){ public void setAmWorkStartTimeEnd(String amWorkStartTimeEnd){
this.averageTimeEnd = averageTimeEnd; this.amWorkStartTimeEnd = amWorkStartTimeEnd;
} }
/** /**
* 获取 增加 平均等待时间,后期删除 * 获取 开始 上午上班结束时间
* @return averageTimeIncrement * @return amWorkEndTimeStart
*/ */
public Integer getAverageTimeIncrement(){ public String getAmWorkEndTimeStart(){
return this.averageTimeIncrement; return this.amWorkEndTimeStart;
} }
/** /**
* 设置 增加 平均等待时间,后期删除 * 设置 开始 上午上班结束时间
* @param averageTimeIncrement * @param amWorkEndTimeStart
*/ */
public void setAverageTimeIncrement(Integer averageTimeIncrement){ public void setAmWorkEndTimeStart(String amWorkEndTimeStart){
this.averageTimeIncrement = averageTimeIncrement; this.amWorkEndTimeStart = amWorkEndTimeStart;
} }
/** /**
* 获取 平均等待时间,后期删除 * 获取 结束 上午上班结束时间
* @return averageTimeList * @return amWorkEndTimeEnd
*/ */
public List<Integer> getAverageTimeList(){ public String getAmWorkEndTimeEnd(){
return this.averageTimeList; return this.amWorkEndTimeEnd;
} }
/** /**
* 设置 平均等待时间,后期删除 * 设置 结束 上午上班结束时间
* @param averageTimeList * @param amWorkEndTimeEnd
*/ */
public void setAverageTimeList(List<Integer> averageTimeList){ public void setAmWorkEndTimeEnd(String amWorkEndTimeEnd){
this.averageTimeList = averageTimeList; this.amWorkEndTimeEnd = amWorkEndTimeEnd;
} }
/** /**
* 获取 开始 等待人数,后期删除 * 获取 开始 下午上班开始时间
* @return waitingNumberStart * @return pmWorkStartTimeStart
*/ */
public Integer getWaitingNumberStart(){ public String getPmWorkStartTimeStart(){
return this.waitingNumberStart; return this.pmWorkStartTimeStart;
} }
/** /**
* 设置 开始 等待人数,后期删除 * 设置 开始 下午上班开始时间
* @param waitingNumberStart * @param pmWorkStartTimeStart
*/ */
public void setWaitingNumberStart(Integer waitingNumberStart){ public void setPmWorkStartTimeStart(String pmWorkStartTimeStart){
this.waitingNumberStart = waitingNumberStart; this.pmWorkStartTimeStart = pmWorkStartTimeStart;
} }
/** /**
* 获取 结束 等待人数,后期删除 * 获取 结束 下午上班开始时间
* @return $waitingNumberEnd * @return pmWorkStartTimeEnd
*/ */
public Integer getWaitingNumberEnd(){ public String getPmWorkStartTimeEnd(){
return this.waitingNumberEnd; return this.pmWorkStartTimeEnd;
} }
/** /**
* 设置 结束 等待人数,后期删除 * 设置 结束 下午上班开始时间
* @param waitingNumberEnd * @param pmWorkStartTimeEnd
*/ */
public void setWaitingNumberEnd(Integer waitingNumberEnd){ public void setPmWorkStartTimeEnd(String pmWorkStartTimeEnd){
this.waitingNumberEnd = waitingNumberEnd; this.pmWorkStartTimeEnd = pmWorkStartTimeEnd;
} }
/** /**
* 获取 增加 等待人数,后期删除 * 获取 开始 下午上班结束时间
* @return waitingNumberIncrement * @return pmWorkEndTimeStart
*/ */
public Integer getWaitingNumberIncrement(){ public String getPmWorkEndTimeStart(){
return this.waitingNumberIncrement; return this.pmWorkEndTimeStart;
} }
/** /**
* 设置 增加 等待人数,后期删除 * 设置 开始 下午上班结束时间
* @param waitingNumberIncrement * @param pmWorkEndTimeStart
*/ */
public void setWaitingNumberIncrement(Integer waitingNumberIncrement){ public void setPmWorkEndTimeStart(String pmWorkEndTimeStart){
this.waitingNumberIncrement = waitingNumberIncrement; this.pmWorkEndTimeStart = pmWorkEndTimeStart;
} }
/** /**
* 获取 等待人数,后期删除 * 获取 结束 下午上班结束时间
* @return waitingNumberList * @return pmWorkEndTimeEnd
*/ */
public List<Integer> getWaitingNumberList(){ public String getPmWorkEndTimeEnd(){
return this.waitingNumberList; return this.pmWorkEndTimeEnd;
} }
/** /**
* 设置 等待人数,后期删除 * 设置 结束 下午上班结束时间
* @param waitingNumberList * @param pmWorkEndTimeEnd
*/ */
public void setWaitingNumberList(List<Integer> waitingNumberList){ public void setPmWorkEndTimeEnd(String pmWorkEndTimeEnd){
this.waitingNumberList = waitingNumberList; this.pmWorkEndTimeEnd = pmWorkEndTimeEnd;
} }
/** /**
...@@ -1465,135 +1240,7 @@ public class SiteQuery extends SiteEntity { ...@@ -1465,135 +1240,7 @@ public class SiteQuery extends SiteEntity {
} }
/** /**
* 获取 开始 是否是站点 (1.是,0.否) * 获取 logo图片地址
* @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地址
* @return logoPathList * @return logoPathList
*/ */
public List<String> getLogoPathList(){ public List<String> getLogoPathList(){
...@@ -1601,14 +1248,14 @@ public class SiteQuery extends SiteEntity { ...@@ -1601,14 +1248,14 @@ public class SiteQuery extends SiteEntity {
} }
/** /**
* 设置 设备logo地址 * 设置 logo图片地址
* @param logoPathList * @param logoPathList
*/ */
public void setLogoPathList(List<String> logoPathList){ public void setLogoPathList(List<String> logoPathList){
this.logoPathList = logoPathList; this.logoPathList = logoPathList;
} }
/** /**
* 获取 站点英文名称 * 获取 英文名称
* @return englishNameList * @return englishNameList
*/ */
public List<String> getEnglishNameList(){ public List<String> getEnglishNameList(){
...@@ -1616,7 +1263,7 @@ public class SiteQuery extends SiteEntity { ...@@ -1616,7 +1263,7 @@ public class SiteQuery extends SiteEntity {
} }
/** /**
* 设置 站点英文名称 * 设置 英文名称
* @param englishNameList * @param englishNameList
*/ */
public void setEnglishNameList(List<String> englishNameList){ public void setEnglishNameList(List<String> englishNameList){
...@@ -1652,6 +1299,21 @@ public class SiteQuery extends SiteEntity { ...@@ -1652,6 +1299,21 @@ public class SiteQuery extends SiteEntity {
public void setLeadingOfficialTelephoneList(List<String> leadingOfficialTelephoneList){ public void setLeadingOfficialTelephoneList(List<String> leadingOfficialTelephoneList){
this.leadingOfficialTelephoneList = leadingOfficialTelephoneList; this.leadingOfficialTelephoneList = leadingOfficialTelephoneList;
} }
/**
* 获取 部署模块，逗号分隔
* @return modelIdsList
*/
public List<String> getModelIdsList(){
return this.modelIdsList;
}
/**
* 设置 部署模块，逗号分隔
* @param modelIdsList
*/
public void setModelIdsList(List<String> modelIdsList){
this.modelIdsList = modelIdsList;
}
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
...@@ -1780,21 +1442,6 @@ public class SiteQuery extends SiteEntity { ...@@ -1780,21 +1442,6 @@ public class SiteQuery extends SiteEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 部署模块，逗号分隔
* @return modelIdsList
*/
public List<String> getModelIdsList(){
return this.modelIdsList;
}
/**
* 设置 部署模块，逗号分隔
* @param modelIdsList
*/
public void setModelIdsList(List<String> modelIdsList){
this.modelIdsList = modelIdsList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -1859,124 +1506,79 @@ public class SiteQuery extends SiteEntity { ...@@ -1859,124 +1506,79 @@ public class SiteQuery extends SiteEntity {
return this; return this;
} }
/**
* 设置 父级id,默认0
* @param parentId
*/
public SiteQuery parentId(Long parentId){
setParentId(parentId);
return this;
}
/** /**
* 设置 开始 父级id,默认0 * 设置 站点编号
* @param parentIdStart * @param siteCode
*/ */
public SiteQuery parentIdStart(Long parentIdStart){ public SiteQuery siteCode(String siteCode){
this.parentIdStart = parentIdStart; setSiteCode(siteCode);
return this; return this;
} }
/** /**
* 设置 结束 父级id,默认0 * 设置 站点编号
* @param parentIdEnd * @param siteCodeList
*/
public SiteQuery parentIdEnd(Long parentIdEnd){
this.parentIdEnd = parentIdEnd;
return this;
}
/**
* 设置 增加 父级id,默认0
* @param parentIdIncrement
*/
public SiteQuery parentIdIncrement(Long parentIdIncrement){
this.parentIdIncrement = parentIdIncrement;
return this;
}
/**
* 设置 父级id,默认0
* @param parentIdList
*/ */
public SiteQuery parentIdList(List<Long> parentIdList){ public SiteQuery siteCodeList(List<String> siteCodeList){
this.parentIdList = parentIdList; this.siteCodeList = siteCodeList;
return this; return this;
} }
/** /**
* 设置 祖级列表，逗号分隔 * 设置 区域Id
* @param ancestors * @param areaID
*/ */
public SiteQuery ancestors(String ancestors){ public SiteQuery areaID(String areaID){
setAncestors(ancestors); setAreaID(areaID);
return this; return this;
} }
/** /**
* 设置 祖级列表，逗号分隔 * 设置 区域Id
* @param ancestorsList * @param areaIDList
*/ */
public SiteQuery ancestorsList(List<String> ancestorsList){ public SiteQuery areaIDList(List<String> areaIDList){
this.ancestorsList = ancestorsList; this.areaIDList = areaIDList;
return this; return this;
} }
/** /**
* 设置 区域编号 * 设置 区域编号
* @param regionCode * @param areaCode
*/ */
public SiteQuery regionCode(String regionCode){ public SiteQuery areaCode(String areaCode){
setRegionCode(regionCode); setAreaCode(areaCode);
return this; return this;
} }
/** /**
* 设置 区域编号 * 设置 区域编号
* @param regionCodeList * @param areaCodeList
*/
public SiteQuery regionCodeList(List<String> regionCodeList){
this.regionCodeList = regionCodeList;
return this;
}
/**
* 设置 标识ID
* @param iid
*/
public SiteQuery iid(String iid){
setIid(iid);
return this;
}
/**
* 设置 标识ID
* @param iidList
*/ */
public SiteQuery iidList(List<String> iidList){ public SiteQuery areaCodeList(List<String> areaCodeList){
this.iidList = iidList; this.areaCodeList = areaCodeList;
return this; return this;
} }
/** /**
* 设置 站点编号 * 设置 区域名称
* @param siteCode * @param areaName
*/ */
public SiteQuery siteCode(String siteCode){ public SiteQuery areaName(String areaName){
setSiteCode(siteCode); setAreaName(areaName);
return this; return this;
} }
/** /**
* 设置 站点编号 * 设置 区域名称
* @param siteCodeList * @param areaNameList
*/ */
public SiteQuery siteCodeList(List<String> siteCodeList){ public SiteQuery areaNameList(List<String> areaNameList){
this.siteCodeList = siteCodeList; this.areaNameList = areaNameList;
return this; return this;
} }
...@@ -2000,44 +1602,6 @@ public class SiteQuery extends SiteEntity { ...@@ -2000,44 +1602,6 @@ public class SiteQuery extends SiteEntity {
} }
/**
* 设置 区域ID
* @param areaID
*/
public SiteQuery areaID(String areaID){
setAreaID(areaID);
return this;
}
/**
* 设置 区域ID
* @param areaIDList
*/
public SiteQuery areaIDList(List<String> areaIDList){
this.areaIDList = areaIDList;
return this;
}
/**
* 设置 区域编码
* @param areaCode
*/
public SiteQuery areaCode(String areaCode){
setAreaCode(areaCode);
return this;
}
/**
* 设置 区域编码
* @param areaCodeList
*/
public SiteQuery areaCodeList(List<String> areaCodeList){
this.areaCodeList = areaCodeList;
return this;
}
/** /**
* 设置 市编码 * 设置 市编码
* @param cityCode * @param cityCode
...@@ -2152,25 +1716,6 @@ public class SiteQuery extends SiteEntity { ...@@ -2152,25 +1716,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 * @param siteTel
...@@ -2228,170 +1773,8 @@ public class SiteQuery extends SiteEntity { ...@@ -2228,170 +1773,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;
}
/**
* 设置 平均等待时间,后期删除
* @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.不上) * 设置 周一 (1.上班，0.不上)
...@@ -2798,99 +2181,9 @@ public class SiteQuery extends SiteEntity { ...@@ -2798,99 +2181,9 @@ public class SiteQuery extends SiteEntity {
return this; 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.正常) * 设置 logo图片地址
* @param statusList
*/
public SiteQuery statusList(List<Integer> statusList){
this.statusList = statusList;
return this;
}
/**
* 设置 设备logo地址
* @param logoPath * @param logoPath
*/ */
public SiteQuery logoPath(String logoPath){ public SiteQuery logoPath(String logoPath){
...@@ -2899,7 +2192,7 @@ public class SiteQuery extends SiteEntity { ...@@ -2899,7 +2192,7 @@ public class SiteQuery extends SiteEntity {
} }
/** /**
* 设置 设备logo地址 * 设置 logo图片地址
* @param logoPathList * @param logoPathList
*/ */
public SiteQuery logoPathList(List<String> logoPathList){ public SiteQuery logoPathList(List<String> logoPathList){
...@@ -2909,7 +2202,7 @@ public class SiteQuery extends SiteEntity { ...@@ -2909,7 +2202,7 @@ public class SiteQuery extends SiteEntity {
/** /**
* 设置 站点英文名称 * 设置 英文名称
* @param englishName * @param englishName
*/ */
public SiteQuery englishName(String englishName){ public SiteQuery englishName(String englishName){
...@@ -2918,7 +2211,7 @@ public class SiteQuery extends SiteEntity { ...@@ -2918,7 +2211,7 @@ public class SiteQuery extends SiteEntity {
} }
/** /**
* 设置 站点英文名称 * 设置 英文名称
* @param englishNameList * @param englishNameList
*/ */
public SiteQuery englishNameList(List<String> englishNameList){ public SiteQuery englishNameList(List<String> englishNameList){
...@@ -2965,6 +2258,25 @@ public class SiteQuery extends SiteEntity { ...@@ -2965,6 +2258,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 * @param createUserId
...@@ -3011,25 +2323,6 @@ public class SiteQuery extends SiteEntity { ...@@ -3011,25 +2323,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) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
base-manager/src/main/resources/sqlmap/module/site/SiteMapper.xml
View file @ e8099a04
...@@ -7,21 +7,17 @@ ...@@ -7,21 +7,17 @@
<resultMap type="SiteEntity" id="SiteEntity-Map"> <resultMap type="SiteEntity" id="SiteEntity-Map">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="siteName" column="siteName" /> <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="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" />
<result property="sitePort" column="sitePort" /> <result property="sitePort" column="sitePort" />
<result property="longitude" column="longitude" /> <result property="longitude" column="longitude" />
<result property="latitude" column="latitude" /> <result property="latitude" column="latitude" />
<result property="haveSonArea" column="haveSonArea" />
<result property="siteTel" column="siteTel" /> <result property="siteTel" column="siteTel" />
<result property="detailAddress" column="detailAddress" /> <result property="detailAddress" column="detailAddress" />
<result property="siteRemark" column="siteRemark" /> <result property="siteRemark" column="siteRemark" />
...@@ -29,8 +25,6 @@ ...@@ -29,8 +25,6 @@
<result property="amWorkEndTime" column="amWorkEndTime" /> <result property="amWorkEndTime" column="amWorkEndTime" />
<result property="pmWorkStartTime" column="pmWorkStartTime" /> <result property="pmWorkStartTime" column="pmWorkStartTime" />
<result property="pmWorkEndTime" column="pmWorkEndTime" /> <result property="pmWorkEndTime" column="pmWorkEndTime" />
<result property="averageTime" column="averageTime" />
<result property="waitingNumber" column="waitingNumber" />
<result property="workday1" column="workday1" /> <result property="workday1" column="workday1" />
<result property="workday2" column="workday2" /> <result property="workday2" column="workday2" />
<result property="workday3" column="workday3" /> <result property="workday3" column="workday3" />
...@@ -40,16 +34,14 @@ ...@@ -40,16 +34,14 @@
<result property="workday7" column="workday7" /> <result property="workday7" column="workday7" />
<result property="level" column="level" /> <result property="level" column="level" />
<result property="building" column="building" /> <result property="building" column="building" />
<result property="isSite" column="isSite" />
<result property="status" column="status" />
<result property="logoPath" column="logoPath" /> <result property="logoPath" column="logoPath" />
<result property="englishName" column="englishName" /> <result property="englishName" column="englishName" />
<result property="leadingOfficial" column="leadingOfficial" /> <result property="leadingOfficial" column="leadingOfficial" />
<result property="leadingOfficialTelephone" column="leadingOfficialTelephone" /> <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" />
</resultMap> </resultMap>
...@@ -63,30 +55,21 @@ ...@@ -63,30 +55,21 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
a.siteName, a.siteName,
</if> </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')))"> <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>
...@@ -105,9 +88,6 @@ ...@@ -105,9 +88,6 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('latitude') or colPickMode == 1 and data.containsKey('latitude')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('latitude') or colPickMode == 1 and data.containsKey('latitude')))">
a.latitude, a.latitude,
</if> </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')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteTel') or colPickMode == 1 and data.containsKey('siteTel')))">
a.siteTel, a.siteTel,
</if> </if>
...@@ -129,12 +109,6 @@ ...@@ -129,12 +109,6 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('pmWorkEndTime') or colPickMode == 1 and data.containsKey('pmWorkEndTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('pmWorkEndTime') or colPickMode == 1 and data.containsKey('pmWorkEndTime')))">
a.pmWorkEndTime, a.pmWorkEndTime,
</if> </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')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workday1') or colPickMode == 1 and data.containsKey('workday1')))">
a.workday1, a.workday1,
</if> </if>
...@@ -162,12 +136,6 @@ ...@@ -162,12 +136,6 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('building') or colPickMode == 1 and data.containsKey('building')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('building') or colPickMode == 1 and data.containsKey('building')))">
a.building, a.building,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('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')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('logoPath') or colPickMode == 1 and data.containsKey('logoPath')))">
a.logoPath, a.logoPath,
</if> </if>
...@@ -180,6 +148,9 @@ ...@@ -180,6 +148,9 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('leadingOfficialTelephone') or colPickMode == 1 and data.containsKey('leadingOfficialTelephone')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('leadingOfficialTelephone') or colPickMode == 1 and data.containsKey('leadingOfficialTelephone')))">
a.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')))">
a.modelIds,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime, a.createTime,
</if> </if>
...@@ -189,26 +160,23 @@ ...@@ -189,26 +160,23 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('modelIds') or colPickMode == 1 and data.containsKey('modelIds')))">
a.modelIds,
</if>
</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,parentId,ancestors,regionCode,iid,siteCode,proCode,areaID,areaCode,cityCode,districtCode,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,leadingOfficial,leadingOfficialTelephone,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,leadingOfficial,leadingOfficialTelephone,modelIds,createTime,createUserId,updateTime)
VALUES VALUES
(#{siteName},#{parentId},#{ancestors},#{regionCode},#{iid},#{siteCode},#{proCode},#{areaID},#{areaCode},#{cityCode},#{districtCode},#{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},#{leadingOfficial},#{leadingOfficialTelephone},#{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},#{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,parentId,ancestors,regionCode,iid,siteCode,proCode,areaID,areaCode,cityCode,districtCode,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,leadingOfficial,leadingOfficialTelephone,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,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.parentId},#{item.ancestors},#{item.regionCode},#{item.iid},#{item.siteCode},#{item.proCode},#{item.areaID},#{item.areaCode},#{item.cityCode},#{item.districtCode},#{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.leadingOfficial},#{item.leadingOfficialTelephone},#{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.leadingOfficial},#{item.leadingOfficialTelephone},#{item.modelIds},#{item.createTime},#{item.createUserId},#{item.updateTime})
</foreach> </foreach>
</insert> </insert>
...@@ -221,33 +189,21 @@ ...@@ -221,33 +189,21 @@
<if test="(colPickMode==0 and data.containsKey('siteName')) or (colPickMode==1 and !data.containsKey('siteName'))"> <if test="(colPickMode==0 and data.containsKey('siteName')) or (colPickMode==1 and !data.containsKey('siteName'))">
a.siteName=#{data.siteName}, a.siteName=#{data.siteName},
</if> </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'))"> <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>
...@@ -266,9 +222,6 @@ ...@@ -266,9 +222,6 @@
<if test="(colPickMode==0 and data.containsKey('latitude')) or (colPickMode==1 and !data.containsKey('latitude'))"> <if test="(colPickMode==0 and data.containsKey('latitude')) or (colPickMode==1 and !data.containsKey('latitude'))">
a.latitude=#{data.latitude}, a.latitude=#{data.latitude},
</if> </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'))"> <if test="(colPickMode==0 and data.containsKey('siteTel')) or (colPickMode==1 and !data.containsKey('siteTel'))">
a.siteTel=#{data.siteTel}, a.siteTel=#{data.siteTel},
</if> </if>
...@@ -290,18 +243,6 @@ ...@@ -290,18 +243,6 @@
<if test="(colPickMode==0 and data.containsKey('pmWorkEndTime')) or (colPickMode==1 and !data.containsKey('pmWorkEndTime'))"> <if test="(colPickMode==0 and data.containsKey('pmWorkEndTime')) or (colPickMode==1 and !data.containsKey('pmWorkEndTime'))">
a.pmWorkEndTime=#{data.pmWorkEndTime}, a.pmWorkEndTime=#{data.pmWorkEndTime},
</if> </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'))"> <if test="(colPickMode==0 and data.containsKey('workday1')) or (colPickMode==1 and !data.containsKey('workday1'))">
a.workday1=#{data.workday1}, a.workday1=#{data.workday1},
</if> </if>
...@@ -356,18 +297,6 @@ ...@@ -356,18 +297,6 @@
<if test="(colPickMode==0 and data.containsKey('buildingIncrement')) or (colPickMode==1 and !data.containsKey('buildingIncrement'))"> <if test="(colPickMode==0 and data.containsKey('buildingIncrement')) or (colPickMode==1 and !data.containsKey('buildingIncrement'))">
a.building=ifnull(a.building,0) + #{data.buildingIncrement}, a.building=ifnull(a.building,0) + #{data.buildingIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('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'))"> <if test="(colPickMode==0 and data.containsKey('logoPath')) or (colPickMode==1 and !data.containsKey('logoPath'))">
a.logoPath=#{data.logoPath}, a.logoPath=#{data.logoPath},
</if> </if>
...@@ -380,6 +309,9 @@ ...@@ -380,6 +309,9 @@
<if test="(colPickMode==0 and data.containsKey('leadingOfficialTelephone')) or (colPickMode==1 and !data.containsKey('leadingOfficialTelephone'))"> <if test="(colPickMode==0 and data.containsKey('leadingOfficialTelephone')) or (colPickMode==1 and !data.containsKey('leadingOfficialTelephone'))">
a.leadingOfficialTelephone=#{data.leadingOfficialTelephone}, a.leadingOfficialTelephone=#{data.leadingOfficialTelephone},
</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('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>
...@@ -392,9 +324,6 @@ ...@@ -392,9 +324,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>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -414,43 +343,31 @@ ...@@ -414,43 +343,31 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="parentId=(case" suffix="ELSE parentId end),"> <trim prefix="siteCode=(case" suffix="ELSE siteCode 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),">
<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('ancestors')) or (colPickMode==1 and !item.containsKey('ancestors'))"> <if test="(colPickMode==0 and item.containsKey('siteCode')) or (colPickMode==1 and !item.containsKey('siteCode'))">
when a.id=#{item.id} then #{item.ancestors} when a.id=#{item.id} then #{item.siteCode}
</if> </if>
</foreach> </foreach>
</trim> </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="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('regionCode')) or (colPickMode==1 and !item.containsKey('regionCode'))"> <if test="(colPickMode==0 and item.containsKey('areaID')) or (colPickMode==1 and !item.containsKey('areaID'))">
when a.id=#{item.id} then #{item.regionCode} when a.id=#{item.id} then #{item.areaID}
</if> </if>
</foreach> </foreach>
</trim> </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="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('iid')) or (colPickMode==1 and !item.containsKey('iid'))"> <if test="(colPickMode==0 and item.containsKey('areaCode')) or (colPickMode==1 and !item.containsKey('areaCode'))">
when a.id=#{item.id} then #{item.iid} when a.id=#{item.id} then #{item.areaCode}
</if> </if>
</foreach> </foreach>
</trim> </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="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('siteCode')) or (colPickMode==1 and !item.containsKey('siteCode'))"> <if test="(colPickMode==0 and item.containsKey('areaName')) or (colPickMode==1 and !item.containsKey('areaName'))">
when a.id=#{item.id} then #{item.siteCode} when a.id=#{item.id} then #{item.areaName}
</if> </if>
</foreach> </foreach>
</trim> </trim>
...@@ -461,20 +378,6 @@ ...@@ -461,20 +378,6 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="areaID=(case" suffix="ELSE areaID end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<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="areaCode=(case" suffix="ELSE areaCode 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>
</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'))">
...@@ -517,13 +420,6 @@ ...@@ -517,13 +420,6 @@
</if> </if>
</foreach> </foreach>
</trim> </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),"> <trim prefix="siteTel=(case" suffix="ELSE siteTel 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('siteTel')) or (colPickMode==1 and !item.containsKey('siteTel'))"> <if test="(colPickMode==0 and item.containsKey('siteTel')) or (colPickMode==1 and !item.containsKey('siteTel'))">
...@@ -573,30 +469,6 @@ ...@@ -573,30 +469,6 @@
</if> </if>
</foreach> </foreach>
</trim> </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),"> <trim prefix="workday1=(case" suffix="ELSE workday1 end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
...@@ -705,30 +577,6 @@ ...@@ -705,30 +577,6 @@
</choose> </choose>
</foreach> </foreach>
</trim> </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),"> <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('logoPath')) or (colPickMode==1 and !item.containsKey('logoPath'))"> <if test="(colPickMode==0 and item.containsKey('logoPath')) or (colPickMode==1 and !item.containsKey('logoPath'))">
...@@ -757,6 +605,13 @@ ...@@ -757,6 +605,13 @@
</if> </if>
</foreach> </foreach>
</trim> </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),"> <trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))"> <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
...@@ -783,13 +638,6 @@ ...@@ -783,13 +638,6 @@
</if> </if>
</foreach> </foreach>
</trim> </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> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -927,72 +775,6 @@ ...@@ -927,72 +775,6 @@
#{item} #{item}
</foreach> </foreach>
</if> </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>
<if test="conditionParamRef.ancestors == null">
${_conditionType_} a.ancestors is null
</if>
</if>
<if test="conditionParamRef.containsKey('ancestorsList')">
${_conditionType_} a.ancestors in
<foreach collection="conditionParamRef.ancestorsList" 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>
<if test="conditionParamRef.regionCode == null">
${_conditionType_} a.regionCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('regionCodeList')">
${_conditionType_} a.regionCode in
<foreach collection="conditionParamRef.regionCodeList" 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>
<if test="conditionParamRef.iid == null">
${_conditionType_} a.iid is null
</if>
</if>
<if test="conditionParamRef.containsKey('iidList')">
${_conditionType_} a.iid in
<foreach collection="conditionParamRef.iidList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteCode')"> <if test="conditionParamRef.containsKey('siteCode')">
<if test="conditionParamRef.siteCode != null and conditionParamRef.siteCode != ''"> <if test="conditionParamRef.siteCode != null and conditionParamRef.siteCode != ''">
...@@ -1009,21 +791,6 @@ ...@@ -1009,21 +791,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')">
${_conditionType_} a.proCode in
<foreach collection="conditionParamRef.proCodeList" 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}
...@@ -1054,6 +821,36 @@ ...@@ -1054,6 +821,36 @@
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('areaName')">
<if test="conditionParamRef.areaName != null and conditionParamRef.areaName != ''">
${_conditionType_} a.areaName like #{${_conditionParam_}.areaName}
</if>
<if test="conditionParamRef.areaName == null">
${_conditionType_} a.areaName is null
</if>
</if>
<if test="conditionParamRef.containsKey('areaNameList')">
${_conditionType_} a.areaName in
<foreach collection="conditionParamRef.areaNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('proCode')">
<if test="conditionParamRef.proCode != null and conditionParamRef.proCode != ''">
${_conditionType_} a.proCode like #{${_conditionParam_}.proCode}
</if>
<if test="conditionParamRef.proCode == null">
${_conditionType_} a.proCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('proCodeList')">
${_conditionType_} a.proCode in
<foreach collection="conditionParamRef.proCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('cityCode')"> <if test="conditionParamRef.containsKey('cityCode')">
<if test="conditionParamRef.cityCode != null and conditionParamRef.cityCode != ''"> <if test="conditionParamRef.cityCode != null and conditionParamRef.cityCode != ''">
${_conditionType_} a.cityCode like #{${_conditionParam_}.cityCode} ${_conditionType_} a.cityCode like #{${_conditionParam_}.cityCode}
...@@ -1144,21 +941,6 @@ ...@@ -1144,21 +941,6 @@
</foreach> </foreach>
</if> </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.containsKey('siteTel')">
<if test="conditionParamRef.siteTel != null and conditionParamRef.siteTel != ''"> <if test="conditionParamRef.siteTel != null and conditionParamRef.siteTel != ''">
${_conditionType_} a.siteTel like #{${_conditionParam_}.siteTel} ${_conditionType_} a.siteTel like #{${_conditionParam_}.siteTel}
...@@ -1205,106 +987,64 @@ ...@@ -1205,106 +987,64 @@
</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')"> <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=","> </if>
#{item} <if test="conditionParamRef.containsKey('amWorkStartTimeEnd') and conditionParamRef.amWorkStartTimeEnd != null and conditionParamRef.amWorkStartTimeEnd!=''">
</foreach> ${_conditionType_} a.amWorkStartTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.amWorkStartTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</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')"> <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=","> </if>
#{item} <if test="conditionParamRef.containsKey('amWorkEndTimeEnd') and conditionParamRef.amWorkEndTimeEnd != null and conditionParamRef.amWorkEndTimeEnd!=''">
</foreach> ${_conditionType_} a.amWorkEndTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.amWorkEndTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</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')"> <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=","> </if>
#{item} <if test="conditionParamRef.containsKey('pmWorkStartTimeEnd') and conditionParamRef.pmWorkStartTimeEnd != null and conditionParamRef.pmWorkStartTimeEnd!=''">
</foreach> ${_conditionType_} a.pmWorkStartTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.pmWorkStartTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</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')"> <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 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>
<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>
<if test="conditionParamRef.containsKey('waitingNumberEnd') and conditionParamRef.waitingNumberEnd != null"> <if test="conditionParamRef.containsKey('pmWorkEndTimeEnd') and conditionParamRef.pmWorkEndTimeEnd != null and conditionParamRef.pmWorkEndTimeEnd!=''">
${_conditionType_} a.waitingNumber <![CDATA[ <= ]]> #{${_conditionParam_}.waitingNumberEnd} ${_conditionType_} a.pmWorkEndTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.pmWorkEndTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('workday1')"> <if test="conditionParamRef.containsKey('workday1')">
<if test="conditionParamRef.workday1 != null "> <if test="conditionParamRef.workday1 != null ">
${_conditionType_} a.workday1 = #{${_conditionParam_}.workday1} ${_conditionType_} a.workday1 = #{${_conditionParam_}.workday1}
...@@ -1494,48 +1234,6 @@ ...@@ -1494,48 +1234,6 @@
${_conditionType_} a.building <![CDATA[ <= ]]> #{${_conditionParam_}.buildingEnd} ${_conditionType_} a.building <![CDATA[ <= ]]> #{${_conditionParam_}.buildingEnd}
</if> </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.containsKey('logoPath')">
<if test="conditionParamRef.logoPath != null and conditionParamRef.logoPath != ''"> <if test="conditionParamRef.logoPath != null and conditionParamRef.logoPath != ''">
...@@ -1597,6 +1295,21 @@ ...@@ -1597,6 +1295,21 @@
</foreach> </foreach>
</if> </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.containsKey('createTime')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime} ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
...@@ -1647,21 +1360,6 @@ ...@@ -1647,21 +1360,6 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('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>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -1685,36 +1383,11 @@ ...@@ -1685,36 +1383,11 @@
<if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if> <if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if>
, ,
</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>
<if test="orderCol.containsKey('regionCode')">
a.regionCode
<if test='orderCol.regionCode != null and "DESC".equalsIgnoreCase(orderCol.regionCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('iid')">
a.iid
<if test='orderCol.iid != null and "DESC".equalsIgnoreCase(orderCol.iid)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('siteCode')"> <if test="orderCol.containsKey('siteCode')">
a.siteCode a.siteCode
<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>
...@@ -1725,6 +1398,16 @@ ...@@ -1725,6 +1398,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>
...@@ -1755,11 +1438,6 @@ ...@@ -1755,11 +1438,6 @@
<if test='orderCol.latitude != null and "DESC".equalsIgnoreCase(orderCol.latitude)'>DESC</if> <if test='orderCol.latitude != null and "DESC".equalsIgnoreCase(orderCol.latitude)'>DESC</if>
, ,
</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')"> <if test="orderCol.containsKey('siteTel')">
a.siteTel a.siteTel
<if test='orderCol.siteTel != null and "DESC".equalsIgnoreCase(orderCol.siteTel)'>DESC</if> <if test='orderCol.siteTel != null and "DESC".equalsIgnoreCase(orderCol.siteTel)'>DESC</if>
...@@ -1795,16 +1473,6 @@ ...@@ -1795,16 +1473,6 @@
<if test='orderCol.pmWorkEndTime != null and "DESC".equalsIgnoreCase(orderCol.pmWorkEndTime)'>DESC</if> <if test='orderCol.pmWorkEndTime != null and "DESC".equalsIgnoreCase(orderCol.pmWorkEndTime)'>DESC</if>
, ,
</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')"> <if test="orderCol.containsKey('workday1')">
a.workday1 a.workday1
<if test='orderCol.workday1 != null and "DESC".equalsIgnoreCase(orderCol.workday1)'>DESC</if> <if test='orderCol.workday1 != null and "DESC".equalsIgnoreCase(orderCol.workday1)'>DESC</if>
...@@ -1850,16 +1518,6 @@ ...@@ -1850,16 +1518,6 @@
<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('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')"> <if test="orderCol.containsKey('logoPath')">
a.logoPath a.logoPath
<if test='orderCol.logoPath != null and "DESC".equalsIgnoreCase(orderCol.logoPath)'>DESC</if> <if test='orderCol.logoPath != null and "DESC".equalsIgnoreCase(orderCol.logoPath)'>DESC</if>
...@@ -1880,6 +1538,11 @@ ...@@ -1880,6 +1538,11 @@
<if test='orderCol.leadingOfficialTelephone != null and "DESC".equalsIgnoreCase(orderCol.leadingOfficialTelephone)'>DESC</if> <if test='orderCol.leadingOfficialTelephone != null and "DESC".equalsIgnoreCase(orderCol.leadingOfficialTelephone)'>DESC</if>
, ,
</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')"> <if test="orderCol.containsKey('createTime')">
a.createTime a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if> <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
...@@ -1895,11 +1558,6 @@ ...@@ -1895,11 +1558,6 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('modelIds')">
a.modelIds
<if test='orderCol.modelIds != null and "DESC".equalsIgnoreCase(orderCol.modelIds)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment