Skip to content

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

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

parent 11c0fe04
Hide whitespace changes
Inline Side-by-side
Showing with 1753 additions and 521 deletions
base-manager/db/base_modules.sql
View file @ cdcf911f
...@@ -43,48 +43,55 @@ CREATE TABLE `mortals_sys_area` ( ...@@ -43,48 +43,55 @@ CREATE TABLE `mortals_sys_area` (
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '区域表' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '区域表' ROW_FORMAT = Dynamic;
-- ---------------------------- -- ----------------------------
-- 站点表 -- 站点表
-- ---------------------------- -- ----------------------------
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) NOT NULL AUTO_INCREMENT COMMENT '序号，主键，自增长', `id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长',
`siteName` varchar(255) DEFAULT NULL COMMENT '站点名称', `siteName` varchar(64) COMMENT '站点名称',
`siteCode` varchar(64) DEFAULT NULL COMMENT '站点编号', `parentId` bigint(20) COMMENT '父级id,默认0',
`areaID` varchar(32) DEFAULT NULL COMMENT '区域Id', `ancestors` varchar(255) COMMENT '祖级列表，逗号分隔',
`areaCode` varchar(32) DEFAULT NULL COMMENT '区域编号', `regionCode` varchar(32) COMMENT '区域编号',
`areaName` varchar(32) DEFAULT NULL COMMENT '区域名称', `iid` varchar(32) COMMENT '标识ID',
`proCode` varchar(32) DEFAULT NULL COMMENT '省编码', `siteCode` varchar(64) COMMENT '站点编号',
`cityCode` varchar(32) DEFAULT NULL COMMENT '市编码', `proCode` varchar(32) COMMENT '省编码',
`districtCode` varchar(32) DEFAULT NULL COMMENT '区编码', `areaCode` varchar(32) COMMENT '区编码',
`siteIp` varchar(32) DEFAULT NULL COMMENT '站点服务器ip', `cityCode` varchar(32) COMMENT '市编码',
`sitePort` varchar(8) DEFAULT NULL COMMENT '站点服务器端口', `siteIp` varchar(32) COMMENT '站点服务器ip',
`longitude` varchar(32) DEFAULT NULL COMMENT '经度', `sitePort` varchar(8) COMMENT '站点服务器端口',
`latitude` varchar(32) DEFAULT NULL COMMENT '纬度', `longitude` varchar(32) COMMENT '经度',
`siteTel` varchar(32) DEFAULT NULL COMMENT '中心联系电话', `latitude` varchar(32) COMMENT '纬度',
`detailAddress` varchar(255) DEFAULT NULL COMMENT '中心详细地址', `haveSonArea` char(5) COMMENT '是否有下级(0.否，1.是)',
`siteRemark` text COMMENT '中心介绍', `siteTel` varchar(32) COMMENT '中心联系电话',
`amWorkStartTime` datetime DEFAULT NULL COMMENT '上午上班开始时间', `detailAddress` varchar(255) COMMENT '中心详细地址',
`amWorkEndTime` datetime DEFAULT NULL COMMENT '上午上班结束时间', `siteRemark` varchar(255) COMMENT '中心介绍',
`pmWorkStartTime` datetime DEFAULT NULL COMMENT '下午上班开始时间', `amWorkStartTime` varchar(32) COMMENT '上午上班开始时间',
`pmWorkEndTime` datetime DEFAULT NULL COMMENT '下午上班结束时间', `amWorkEndTime` varchar(32) COMMENT '上午上班结束时间',
`workday1` tinyint(2) DEFAULT '1' COMMENT '周一 (1.上班，0.不上)', `pmWorkStartTime` varchar(32) COMMENT '下午上班开始时间',
`workday2` tinyint(2) DEFAULT '1' COMMENT '周二 (1.上班，0.不上)', `pmWorkEndTime` varchar(32) COMMENT '下午上班结束时间',
`workday3` tinyint(2) DEFAULT '1' COMMENT '周三 (1.上班，0.不上)', `averageTime` int(5) COMMENT '平均等待时间,后期删除',
`workday4` tinyint(2) DEFAULT '1' COMMENT '周四 (1.上班，0.不上)', `waitingNumber` int(5) COMMENT '等待人数,后期删除',
`workday5` tinyint(2) DEFAULT '1' COMMENT '周五 (1.上班，0.不上)', `workday1` tinyint(2) COMMENT '周一 (1.上班，0.不上)',
`workday6` tinyint(2) DEFAULT '0' COMMENT '周六 (1.上班，0.不上)', `workday2` tinyint(2) COMMENT '周二 (1.上班，0.不上)',
`workday7` tinyint(2) DEFAULT '0' COMMENT '周日 (1.上班，0.不上)', `workday3` tinyint(2) COMMENT '周三 (1.上班，0.不上)',
`level` int(4) DEFAULT 1 COMMENT '楼层', `workday4` tinyint(2) COMMENT '周四 (1.上班，0.不上)',
`building` int(4) DEFAULT 1 COMMENT '楼栋', `workday5` tinyint(2) COMMENT '周五 (1.上班，0.不上)',
`modelIds` varchar(256) DEFAULT '' COMMENT '部署模块，逗号分隔', `workday6` tinyint(2) COMMENT '周六 (1.上班，0.不上)',
`createTime` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间', `workday7` tinyint(2) COMMENT '周日 (1.上班，0.不上)',
`createUserId` bigint(20) DEFAULT NULL COMMENT '创建用户', `level` tinyint(2) COMMENT '楼层',
`updateTime` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', `building` tinyint(4) COMMENT '楼栋',
PRIMARY KEY (`id`) `isSite` tinyint(2) COMMENT '是否是站点 (1.是,0.否)',
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '站点表' ROW_FORMAT = Dynamic; `status` tinyint(2) COMMENT '站点状态 (0.停用，1.正常)',
`logoPath` varchar(32) COMMENT '设备logo地址',
`englishName` varchar(32) COMMENT '站点英文名称',
`createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户',
`updateTime` datetime COMMENT '修改时间',
`modelIds` varchar(256) COMMENT '部署模块，逗号分隔',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='站点';
-- ---------------------------- -- ----------------------------
......
base-manager/doc/api.md
View file @ cdcf911f
...@@ -905,6 +905,8 @@ data|object|数据对象|- ...@@ -905,6 +905,8 @@ data|object|数据对象|-
  level|Integer|楼层|-   level|Integer|楼层|-
  building|Integer|楼栋|-   building|Integer|楼栋|-
  modelIds|String|部署模块，逗号分隔|-   modelIds|String|部署模块，逗号分隔|-
  logoPath|String|设备logo地址
  englishName|String|站点英文名称
  createTime|Date|创建时间|-   createTime|Date|创建时间|-
  createUserId|Long|创建用户|-   createUserId|Long|创建用户|-
  updateTime|Date|修改时间|-   updateTime|Date|修改时间|-
...@@ -1072,6 +1074,8 @@ data|object|数据对象|- ...@@ -1072,6 +1074,8 @@ data|object|数据对象|-
 workday7|Integer|周日 (1.上班，0.不上)|-  workday7|Integer|周日 (1.上班，0.不上)|-
 level|Integer|楼层|-  level|Integer|楼层|-
 building|Integer|楼栋|-  building|Integer|楼栋|-
 logoPath|String|设备logo地址
 englishName|String|站点英文名称
 modelIds|String|部署模块，逗号分隔|-  modelIds|String|部署模块，逗号分隔|-
 createTime|Date|创建时间|-  createTime|Date|创建时间|-
 createUserId|Long|创建用户|-  createUserId|Long|创建用户|-
...@@ -1134,6 +1138,8 @@ workday6|Integer|周六 (1.上班，0.不上)|是|- ...@@ -1134,6 +1138,8 @@ workday6|Integer|周六 (1.上班，0.不上)|是|-
workday7|Integer|周日 (1.上班，0.不上)|是|- workday7|Integer|周日 (1.上班，0.不上)|是|-
level|Integer|楼层|是|- level|Integer|楼层|是|-
building|Integer|楼栋|是|- building|Integer|楼栋|是|-
logoPath|String|是|设备logo地址
englishName|String|是|站点英文名称
modelIds|String|部署模块，逗号分隔|是|- modelIds|String|部署模块，逗号分隔|是|-
**请求样例:** **请求样例:**
......
base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteEntity.java
View file @ cdcf911f
package com.mortals.xhx.module.site.model; package com.mortals.xhx.module.site.model;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.site.model.vo.SiteVo; import com.mortals.xhx.module.site.model.vo.SiteVo;
import java.util.Date;
/** /**
* 站点实体对象 * 站点实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-01-21 * @date 2022-06-29
*/ */
public class SiteEntity extends SiteVo { public class SiteEntity extends SiteVo {
...@@ -19,33 +21,37 @@ public class SiteEntity extends SiteVo { ...@@ -19,33 +21,37 @@ public class SiteEntity extends SiteVo {
*/ */
private String siteName; private String siteName;
/** /**
* 站点编号 * 父级id,默认0
*/ */
private String siteCode; private Long parentId;
/** /**
* 区域Id * 祖级列表，逗号分隔
*/ */
private String areaID; private String ancestors;
/** /**
* 区域编号 * 区域编号
*/ */
private String areaCode; private String regionCode;
/** /**
* 区域名称 * 标识ID
*/ */
private String areaName; private String iid;
/**
* 站点编号
*/
private String siteCode;
/** /**
* 省编码 * 省编码
*/ */
private String proCode; private String proCode;
/** /**
* 市编码 * 区编码
*/ */
private String cityCode; private String areaCode;
/** /**
* 区编码 * 市编码
*/ */
private String districtCode; private String cityCode;
/** /**
* 站点服务器ip * 站点服务器ip
*/ */
...@@ -62,6 +68,10 @@ public class SiteEntity extends SiteVo { ...@@ -62,6 +68,10 @@ public class SiteEntity extends SiteVo {
* 纬度 * 纬度
*/ */
private String latitude; private String latitude;
/**
* 是否有下级(0.否，1.是)
*/
private String haveSonArea;
/** /**
* 中心联系电话 * 中心联系电话
*/ */
...@@ -77,19 +87,27 @@ public class SiteEntity extends SiteVo { ...@@ -77,19 +87,27 @@ public class SiteEntity extends SiteVo {
/** /**
* 上午上班开始时间 * 上午上班开始时间
*/ */
private Date amWorkStartTime; private String amWorkStartTime;
/** /**
* 上午上班结束时间 * 上午上班结束时间
*/ */
private Date amWorkEndTime; private String amWorkEndTime;
/** /**
* 下午上班开始时间 * 下午上班开始时间
*/ */
private Date pmWorkStartTime; private String pmWorkStartTime;
/** /**
* 下午上班结束时间 * 下午上班结束时间
*/ */
private Date pmWorkEndTime; private String pmWorkEndTime;
/**
* 平均等待时间,后期删除
*/
private Integer averageTime;
/**
* 等待人数,后期删除
*/
private Integer waitingNumber;
/** /**
* 周一 (1.上班，0.不上) * 周一 (1.上班，0.不上)
*/ */
...@@ -126,6 +144,22 @@ public class SiteEntity extends SiteVo { ...@@ -126,6 +144,22 @@ public class SiteEntity extends SiteVo {
* 楼栋 * 楼栋
*/ */
private Integer building; private Integer building;
/**
* 是否是站点 (1.是,0.否)
*/
private Integer isSite;
/**
* 站点状态 (0.停用，1.正常)
*/
private Integer status;
/**
* 设备logo地址
*/
private String logoPath;
/**
* 站点英文名称
*/
private String englishName;
/** /**
* 部署模块，逗号分隔 * 部署模块，逗号分隔
*/ */
...@@ -149,60 +183,74 @@ public class SiteEntity extends SiteVo { ...@@ -149,60 +183,74 @@ public class SiteEntity extends SiteVo {
this.siteName = siteName; this.siteName = siteName;
} }
/** /**
* 获取 站点编号 * 获取 父级id,默认0
* @return String * @return Long
*/ */
public String getSiteCode(){ public Long getParentId(){
return siteCode; return parentId;
} }
/** /**
* 设置 站点编号 * 设置 父级id,默认0
* @param siteCode * @param parentId
*/ */
public void setSiteCode(String siteCode){ public void setParentId(Long parentId){
this.siteCode = siteCode; this.parentId = parentId;
} }
/** /**
* 获取 区域Id * 获取 祖级列表，逗号分隔
* @return String * @return String
*/ */
public String getAreaID(){ public String getAncestors(){
return areaID; return ancestors;
} }
/** /**
* 设置 区域Id * 设置 祖级列表，逗号分隔
* @param areaID * @param ancestors
*/ */
public void setAreaID(String areaID){ public void setAncestors(String ancestors){
this.areaID = areaID; this.ancestors = ancestors;
} }
/** /**
* 获取 区域编号 * 获取 区域编号
* @return String * @return String
*/ */
public String getAreaCode(){ public String getRegionCode(){
return areaCode; return regionCode;
} }
/** /**
* 设置 区域编号 * 设置 区域编号
* @param areaCode * @param regionCode
*/ */
public void setAreaCode(String areaCode){ public void setRegionCode(String regionCode){
this.areaCode = areaCode; this.regionCode = regionCode;
}
/**
* 获取 标识ID
* @return String
*/
public String getIid(){
return iid;
}
/**
* 设置 标识ID
* @param iid
*/
public void setIid(String iid){
this.iid = iid;
} }
/** /**
* 获取 区域名称 * 获取 站点编号
* @return String * @return String
*/ */
public String getAreaName(){ public String getSiteCode(){
return areaName; return siteCode;
} }
/** /**
* 设置 区域名称 * 设置 站点编号
* @param areaName * @param siteCode
*/ */
public void setAreaName(String areaName){ public void setSiteCode(String siteCode){
this.areaName = areaName; this.siteCode = siteCode;
} }
/** /**
* 获取 省编码 * 获取 省编码
...@@ -219,32 +267,32 @@ public class SiteEntity extends SiteVo { ...@@ -219,32 +267,32 @@ public class SiteEntity extends SiteVo {
this.proCode = proCode; this.proCode = proCode;
} }
/** /**
* 获取 市编码 * 获取 区编码
* @return String * @return String
*/ */
public String getCityCode(){ public String getAreaCode(){
return cityCode; return areaCode;
} }
/** /**
* 设置 市编码 * 设置 区编码
* @param cityCode * @param areaCode
*/ */
public void setCityCode(String cityCode){ public void setAreaCode(String areaCode){
this.cityCode = cityCode; this.areaCode = areaCode;
} }
/** /**
* 获取 区编码 * 获取 市编码
* @return String * @return String
*/ */
public String getDistrictCode(){ public String getCityCode(){
return districtCode; return cityCode;
} }
/** /**
* 设置 区编码 * 设置 市编码
* @param districtCode * @param cityCode
*/ */
public void setDistrictCode(String districtCode){ public void setCityCode(String cityCode){
this.districtCode = districtCode; this.cityCode = cityCode;
} }
/** /**
* 获取 站点服务器ip * 获取 站点服务器ip
...@@ -302,6 +350,20 @@ public class SiteEntity extends SiteVo { ...@@ -302,6 +350,20 @@ 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
...@@ -346,60 +408,88 @@ public class SiteEntity extends SiteVo { ...@@ -346,60 +408,88 @@ public class SiteEntity extends SiteVo {
} }
/** /**
* 获取 上午上班开始时间 * 获取 上午上班开始时间
* @return Date * @return String
*/ */
public Date getAmWorkStartTime(){ public String getAmWorkStartTime(){
return amWorkStartTime; return amWorkStartTime;
} }
/** /**
* 设置 上午上班开始时间 * 设置 上午上班开始时间
* @param amWorkStartTime * @param amWorkStartTime
*/ */
public void setAmWorkStartTime(Date amWorkStartTime){ public void setAmWorkStartTime(String amWorkStartTime){
this.amWorkStartTime = amWorkStartTime; this.amWorkStartTime = amWorkStartTime;
} }
/** /**
* 获取 上午上班结束时间 * 获取 上午上班结束时间
* @return Date * @return String
*/ */
public Date getAmWorkEndTime(){ public String getAmWorkEndTime(){
return amWorkEndTime; return amWorkEndTime;
} }
/** /**
* 设置 上午上班结束时间 * 设置 上午上班结束时间
* @param amWorkEndTime * @param amWorkEndTime
*/ */
public void setAmWorkEndTime(Date amWorkEndTime){ public void setAmWorkEndTime(String amWorkEndTime){
this.amWorkEndTime = amWorkEndTime; this.amWorkEndTime = amWorkEndTime;
} }
/** /**
* 获取 下午上班开始时间 * 获取 下午上班开始时间
* @return Date * @return String
*/ */
public Date getPmWorkStartTime(){ public String getPmWorkStartTime(){
return pmWorkStartTime; return pmWorkStartTime;
} }
/** /**
* 设置 下午上班开始时间 * 设置 下午上班开始时间
* @param pmWorkStartTime * @param pmWorkStartTime
*/ */
public void setPmWorkStartTime(Date pmWorkStartTime){ public void setPmWorkStartTime(String pmWorkStartTime){
this.pmWorkStartTime = pmWorkStartTime; this.pmWorkStartTime = pmWorkStartTime;
} }
/** /**
* 获取 下午上班结束时间 * 获取 下午上班结束时间
* @return Date * @return String
*/ */
public Date getPmWorkEndTime(){ public String getPmWorkEndTime(){
return pmWorkEndTime; return pmWorkEndTime;
} }
/** /**
* 设置 下午上班结束时间 * 设置 下午上班结束时间
* @param pmWorkEndTime * @param pmWorkEndTime
*/ */
public void setPmWorkEndTime(Date pmWorkEndTime){ public void setPmWorkEndTime(String 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
...@@ -526,6 +616,62 @@ public class SiteEntity extends SiteVo { ...@@ -526,6 +616,62 @@ public class SiteEntity extends SiteVo {
public void setBuilding(Integer building){ public void setBuilding(Integer building){
this.building = building; this.building = building;
} }
/**
* 获取 是否是站点 (1.是,0.否)
* @return Integer
*/
public Integer getIsSite(){
return isSite;
}
/**
* 设置 是否是站点 (1.是,0.否)
* @param isSite
*/
public void setIsSite(Integer isSite){
this.isSite = isSite;
}
/**
* 获取 站点状态 (0.停用，1.正常)
* @return Integer
*/
public Integer getStatus(){
return status;
}
/**
* 设置 站点状态 (0.停用，1.正常)
* @param status
*/
public void setStatus(Integer status){
this.status = status;
}
/**
* 获取 设备logo地址
* @return String
*/
public String getLogoPath(){
return logoPath;
}
/**
* 设置 设备logo地址
* @param logoPath
*/
public void setLogoPath(String logoPath){
this.logoPath = logoPath;
}
/**
* 获取 站点英文名称
* @return String
*/
public String getEnglishName(){
return englishName;
}
/**
* 设置 站点英文名称
* @param englishName
*/
public void setEnglishName(String englishName){
this.englishName = englishName;
}
/** /**
* 获取 部署模块，逗号分隔 * 获取 部署模块，逗号分隔
* @return String * @return String
...@@ -563,17 +709,19 @@ public class SiteEntity extends SiteVo { ...@@ -563,17 +709,19 @@ 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(",areaID:").append(getAreaID());
sb.append(",areaCode:").append(getAreaCode());
sb.append(",areaName:").append(getAreaName());
sb.append(",proCode:").append(getProCode()); sb.append(",proCode:").append(getProCode());
sb.append(",areaCode:").append(getAreaCode());
sb.append(",cityCode:").append(getCityCode()); sb.append(",cityCode:").append(getCityCode());
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());
...@@ -581,6 +729,8 @@ public class SiteEntity extends SiteVo { ...@@ -581,6 +729,8 @@ 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());
...@@ -590,49 +740,61 @@ public class SiteEntity extends SiteVo { ...@@ -590,49 +740,61 @@ 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(",englishName:").append(getEnglishName());
sb.append(",modelIds:").append(getModelIds()); sb.append(",modelIds:").append(getModelIds());
return sb.toString(); return sb.toString();
} }
public void initAttrValue(){ public void initAttrValue(){
this.siteName = null; this.siteName = "";
this.siteCode = null; this.parentId = null;
this.areaID = null; this.ancestors = "";
this.areaCode = null; this.regionCode = "";
this.areaName = null; this.iid = "";
this.proCode = null; this.siteCode = "";
this.cityCode = null; this.proCode = "";
this.districtCode = null; this.areaCode = "";
this.siteIp = null; this.cityCode = "";
this.sitePort = null; this.siteIp = "";
this.longitude = null; this.sitePort = "";
this.latitude = null; this.longitude = "";
this.siteTel = null; this.latitude = "";
this.detailAddress = null; this.haveSonArea = "0";
this.siteRemark = null; this.siteTel = "";
this.amWorkStartTime = null; this.detailAddress = "";
this.amWorkEndTime = null; this.siteRemark = "";
this.pmWorkStartTime = null; this.amWorkStartTime = "";
this.pmWorkEndTime = null; this.amWorkEndTime = "";
this.pmWorkStartTime = "";
this.pmWorkEndTime = "";
this.averageTime = null;
this.waitingNumber = null;
this.workday1 = 1; this.workday1 = 1;
...@@ -648,9 +810,17 @@ public class SiteEntity extends SiteVo { ...@@ -648,9 +810,17 @@ public class SiteEntity extends SiteVo {
this.workday7 = 0; this.workday7 = 0;
this.level = 1; this.level = null;
this.building = null;
this.isSite = 0;
this.status = 1;
this.logoPath = "";
this.building = 1; this.englishName = "";
this.modelIds = ""; this.modelIds = "";
} }
......
base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteQuery.java
View file @ cdcf911f
package com.mortals.xhx.module.site.model; package com.mortals.xhx.module.site.model;
import java.util.Date;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.site.model.SiteEntity; import com.mortals.xhx.module.site.model.SiteEntity;
/** /**
* 站点查询对象 * 站点查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-01-21 * @date 2022-06-29
*/ */
public class SiteQuery extends SiteEntity { public class SiteQuery extends SiteEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -25,27 +24,39 @@ public class SiteQuery extends SiteEntity { ...@@ -25,27 +24,39 @@ public class SiteQuery extends SiteEntity {
/** 站点名称 */ /** 站点名称 */
private List<String> siteNameList; private List<String> siteNameList;
/** 站点编号 */ /** 开始 父级id,默认0 */
private List<String> siteCodeList; private Long parentIdStart;
/** 结束 父级id,默认0 */
private Long parentIdEnd;
/** 增加 父级id,默认0 */
private Long parentIdIncrement;
/** 区域Id */ /** 父级id,默认0列表 */
private List<String> areaIDList; private List <Long> parentIdList;
/** 祖级列表，逗号分隔 */
private List<String> ancestorsList;
/** 区域编号 */ /** 区域编号 */
private List<String> areaCodeList; private List<String> regionCodeList;
/** 区域名称 */ /** 标识ID */
private List<String> areaNameList; private List<String> iidList;
/** 站点编号 */
private List<String> siteCodeList;
/** 省编码 */ /** 省编码 */
private List<String> proCodeList; private List<String> proCodeList;
/** 区编码 */
private List<String> areaCodeList;
/** 市编码 */ /** 市编码 */
private List<String> cityCodeList; private List<String> cityCodeList;
/** 区编码 */
private List<String> districtCodeList;
/** 站点服务器ip */ /** 站点服务器ip */
private List<String> siteIpList; private List<String> siteIpList;
...@@ -58,6 +69,9 @@ public class SiteQuery extends SiteEntity { ...@@ -58,6 +69,9 @@ 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;
...@@ -67,29 +81,41 @@ public class SiteQuery extends SiteEntity { ...@@ -67,29 +81,41 @@ public class SiteQuery extends SiteEntity {
/** 中心介绍 */ /** 中心介绍 */
private List<String> siteRemarkList; private List<String> siteRemarkList;
/** 开始 上午上班开始时间 */ /** 上午上班开始时间 */
private String amWorkStartTimeStart; private List<String> amWorkStartTimeList;
/** 上午上班结束时间 */
private List<String> amWorkEndTimeList;
/** 结束 上午上班开始时间 */ /** 下午上班开始时间 */
private String amWorkStartTimeEnd; private List<String> pmWorkStartTimeList;
/** 开始 上午上班结束时间 */ /** 下午上班结束时间 */
private String amWorkEndTimeStart; private List<String> pmWorkEndTimeList;
/** 结束 上午上班结束时间 */ /** 开始 平均等待时间,后期删除 */
private String amWorkEndTimeEnd; private Integer averageTimeStart;
/** 开始 下午上班开始时间 */ /** 结束 平均等待时间,后期删除 */
private String pmWorkStartTimeStart; private Integer averageTimeEnd;
/** 结束 下午上班开始时间 */ /** 增加 平均等待时间,后期删除 */
private String pmWorkStartTimeEnd; private Integer averageTimeIncrement;
/** 开始 下午上班结束时间 */ /** 平均等待时间,后期删除列表 */
private String pmWorkEndTimeStart; private List <Integer> averageTimeList;
/** 结束 下午上班结束时间 */ /** 开始 等待人数,后期删除 */
private String pmWorkEndTimeEnd; private Integer waitingNumberStart;
/** 结束 等待人数,后期删除 */
private Integer waitingNumberEnd;
/** 增加 等待人数,后期删除 */
private Integer waitingNumberIncrement;
/** 等待人数,后期删除列表 */
private List <Integer> waitingNumberList;
/** 开始 周一 (1.上班，0.不上) */ /** 开始 周一 (1.上班，0.不上) */
private Integer workday1Start; private Integer workday1Start;
...@@ -199,8 +225,35 @@ public class SiteQuery extends SiteEntity { ...@@ -199,8 +225,35 @@ public class SiteQuery extends SiteEntity {
/** 楼栋列表 */ /** 楼栋列表 */
private List <Integer> buildingList; private List <Integer> buildingList;
/** 部署模块，逗号分隔 */ /** 开始 是否是站点 (1.是,0.否) */
private List<String> modelIdsList; 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> englishNameList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -226,6 +279,9 @@ public class SiteQuery extends SiteEntity { ...@@ -226,6 +279,9 @@ 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;
...@@ -314,64 +370,128 @@ public class SiteQuery extends SiteEntity { ...@@ -314,64 +370,128 @@ public class SiteQuery extends SiteEntity {
this.siteNameList = siteNameList; this.siteNameList = siteNameList;
} }
/** /**
* 获取 站点编号 * 获取 开始 父级id,默认0
* @return siteCodeList * @return parentIdStart
*/ */
public List<String> getSiteCodeList(){ public Long getParentIdStart(){
return this.siteCodeList; return this.parentIdStart;
} }
/** /**
* 设置 站点编号 * 设置 开始 父级id,默认0
* @param siteCodeList * @param parentIdStart
*/ */
public void setSiteCodeList(List<String> siteCodeList){ public void setParentIdStart(Long parentIdStart){
this.siteCodeList = siteCodeList; 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(){
return this.parentIdList;
}
/**
* 设置 父级id,默认0
* @param parentIdList
*/
public void setParentIdList(List<Long> parentIdList){
this.parentIdList = parentIdList;
} }
/** /**
* 获取 区域Id * 获取 祖级列表，逗号分隔
* @return areaIDList * @return ancestorsList
*/ */
public List<String> getAreaIDList(){ public List<String> getAncestorsList(){
return this.areaIDList; return this.ancestorsList;
} }
/** /**
* 设置 区域Id * 设置 祖级列表，逗号分隔
* @param areaIDList * @param ancestorsList
*/ */
public void setAreaIDList(List<String> areaIDList){ public void setAncestorsList(List<String> ancestorsList){
this.areaIDList = areaIDList; this.ancestorsList = ancestorsList;
} }
/** /**
* 获取 区域编号 * 获取 区域编号
* @return areaCodeList * @return regionCodeList
*/ */
public List<String> getAreaCodeList(){ public List<String> getRegionCodeList(){
return this.areaCodeList; return this.regionCodeList;
} }
/** /**
* 设置 区域编号 * 设置 区域编号
* @param areaCodeList * @param regionCodeList
*/ */
public void setAreaCodeList(List<String> areaCodeList){ public void setRegionCodeList(List<String> regionCodeList){
this.areaCodeList = areaCodeList; this.regionCodeList = regionCodeList;
}
/**
* 获取 标识ID
* @return iidList
*/
public List<String> getIidList(){
return this.iidList;
}
/**
* 设置 标识ID
* @param iidList
*/
public void setIidList(List<String> iidList){
this.iidList = iidList;
} }
/** /**
* 获取 区域名称 * 获取 站点编号
* @return areaNameList * @return siteCodeList
*/ */
public List<String> getAreaNameList(){ public List<String> getSiteCodeList(){
return this.areaNameList; return this.siteCodeList;
} }
/** /**
* 设置 区域名称 * 设置 站点编号
* @param areaNameList * @param siteCodeList
*/ */
public void setAreaNameList(List<String> areaNameList){ public void setSiteCodeList(List<String> siteCodeList){
this.areaNameList = areaNameList; this.siteCodeList = siteCodeList;
} }
/** /**
* 获取 省编码 * 获取 省编码
...@@ -388,6 +508,21 @@ public class SiteQuery extends SiteEntity { ...@@ -388,6 +508,21 @@ public class SiteQuery extends SiteEntity {
public void setProCodeList(List<String> proCodeList){ public void setProCodeList(List<String> proCodeList){
this.proCodeList = proCodeList; this.proCodeList = proCodeList;
} }
/**
* 获取 区编码
* @return areaCodeList
*/
public List<String> getAreaCodeList(){
return this.areaCodeList;
}
/**
* 设置 区编码
* @param areaCodeList
*/
public void setAreaCodeList(List<String> areaCodeList){
this.areaCodeList = areaCodeList;
}
/** /**
* 获取 市编码 * 获取 市编码
* @return cityCodeList * @return cityCodeList
...@@ -403,21 +538,6 @@ public class SiteQuery extends SiteEntity { ...@@ -403,21 +538,6 @@ public class SiteQuery extends SiteEntity {
public void setCityCodeList(List<String> cityCodeList){ public void setCityCodeList(List<String> cityCodeList){
this.cityCodeList = cityCodeList; this.cityCodeList = cityCodeList;
} }
/**
* 获取 区编码
* @return districtCodeList
*/
public List<String> getDistrictCodeList(){
return this.districtCodeList;
}
/**
* 设置 区编码
* @param districtCodeList
*/
public void setDistrictCodeList(List<String> districtCodeList){
this.districtCodeList = districtCodeList;
}
/** /**
* 获取 站点服务器ip * 获取 站点服务器ip
* @return siteIpList * @return siteIpList
...@@ -478,6 +598,21 @@ public class SiteQuery extends SiteEntity { ...@@ -478,6 +598,21 @@ 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
...@@ -524,131 +659,191 @@ public class SiteQuery extends SiteEntity { ...@@ -524,131 +659,191 @@ public class SiteQuery extends SiteEntity {
this.siteRemarkList = siteRemarkList; this.siteRemarkList = siteRemarkList;
} }
/** /**
* 获取 开始 上午上班开始时间 * 获取 上午上班开始时间
* @return amWorkStartTimeStart * @return amWorkStartTimeList
*/ */
public String getAmWorkStartTimeStart(){ public List<String> getAmWorkStartTimeList(){
return this.amWorkStartTimeStart; return this.amWorkStartTimeList;
} }
/** /**
* 设置 开始 上午上班开始时间 * 设置 上午上班开始时间
* @param amWorkStartTimeStart * @param amWorkStartTimeList
*/ */
public void setAmWorkStartTimeStart(String amWorkStartTimeStart){ public void setAmWorkStartTimeList(List<String> amWorkStartTimeList){
this.amWorkStartTimeStart = amWorkStartTimeStart; this.amWorkStartTimeList = amWorkStartTimeList;
}
/**
* 获取 上午上班结束时间
* @return amWorkEndTimeList
*/
public List<String> getAmWorkEndTimeList(){
return this.amWorkEndTimeList;
} }
/** /**
* 获取 结束 上午上班开始时间 * 设置 上午上班结束时间
* @return amWorkStartTimeEnd * @param amWorkEndTimeList
*/ */
public String getAmWorkStartTimeEnd(){ public void setAmWorkEndTimeList(List<String> amWorkEndTimeList){
return this.amWorkStartTimeEnd; this.amWorkEndTimeList = amWorkEndTimeList;
}
/**
* 获取 下午上班开始时间
* @return pmWorkStartTimeList
*/
public List<String> getPmWorkStartTimeList(){
return this.pmWorkStartTimeList;
} }
/** /**
* 设置 结束 上午上班开始时间 * 设置 下午上班开始时间
* @param amWorkStartTimeEnd * @param pmWorkStartTimeList
*/ */
public void setAmWorkStartTimeEnd(String amWorkStartTimeEnd){ public void setPmWorkStartTimeList(List<String> pmWorkStartTimeList){
this.amWorkStartTimeEnd = amWorkStartTimeEnd; this.pmWorkStartTimeList = pmWorkStartTimeList;
}
/**
* 获取 下午上班结束时间
* @return pmWorkEndTimeList
*/
public List<String> getPmWorkEndTimeList(){
return this.pmWorkEndTimeList;
}
/**
* 设置 下午上班结束时间
* @param pmWorkEndTimeList
*/
public void setPmWorkEndTimeList(List<String> pmWorkEndTimeList){
this.pmWorkEndTimeList = pmWorkEndTimeList;
}
/**
* 获取 开始 平均等待时间,后期删除
* @return averageTimeStart
*/
public Integer getAverageTimeStart(){
return this.averageTimeStart;
}
/**
* 设置 开始 平均等待时间,后期删除
* @param averageTimeStart
*/
public void setAverageTimeStart(Integer averageTimeStart){
this.averageTimeStart = averageTimeStart;
}
/**
* 获取 结束 平均等待时间,后期删除
* @return $averageTimeEnd
*/
public Integer getAverageTimeEnd(){
return this.averageTimeEnd;
} }
/** /**
* 获取 开始 上午上班结束时间 * 设置 结束 平均等待时间,后期删除
* @return amWorkEndTimeStart * @param averageTimeEnd
*/ */
public String getAmWorkEndTimeStart(){ public void setAverageTimeEnd(Integer averageTimeEnd){
return this.amWorkEndTimeStart; this.averageTimeEnd = averageTimeEnd;
} }
/** /**
* 设置 开始 上午上班结束时间 * 获取 增加 平均等待时间,后期删除
* @param amWorkEndTimeStart * @return averageTimeIncrement
*/ */
public void setAmWorkEndTimeStart(String amWorkEndTimeStart){ public Integer getAverageTimeIncrement(){
this.amWorkEndTimeStart = amWorkEndTimeStart; return this.averageTimeIncrement;
} }
/** /**
* 获取 结束 上午上班结束时间 * 设置 增加 平均等待时间,后期删除
* @return amWorkEndTimeEnd * @param averageTimeIncrement
*/ */
public String getAmWorkEndTimeEnd(){ public void setAverageTimeIncrement(Integer averageTimeIncrement){
return this.amWorkEndTimeEnd; this.averageTimeIncrement = averageTimeIncrement;
} }
/** /**
* 设置 结束 上午上班结束时间 * 获取 平均等待时间,后期删除
* @param amWorkEndTimeEnd * @return averageTimeList
*/ */
public void setAmWorkEndTimeEnd(String amWorkEndTimeEnd){ public List<Integer> getAverageTimeList(){
this.amWorkEndTimeEnd = amWorkEndTimeEnd; return this.averageTimeList;
} }
/** /**
* 获取 开始 下午上班开始时间 * 设置 平均等待时间,后期删除
* @return pmWorkStartTimeStart * @param averageTimeList
*/ */
public String getPmWorkStartTimeStart(){ public void setAverageTimeList(List<Integer> averageTimeList){
return this.pmWorkStartTimeStart; this.averageTimeList = averageTimeList;
} }
/** /**
* 设置 开始 下午上班开始时间 * 获取 开始 等待人数,后期删除
* @param pmWorkStartTimeStart * @return waitingNumberStart
*/ */
public void setPmWorkStartTimeStart(String pmWorkStartTimeStart){ public Integer getWaitingNumberStart(){
this.pmWorkStartTimeStart = pmWorkStartTimeStart; return this.waitingNumberStart;
} }
/** /**
* 获取 结束 下午上班开始时间 * 设置 开始 等待人数,后期删除
* @return pmWorkStartTimeEnd * @param waitingNumberStart
*/ */
public String getPmWorkStartTimeEnd(){ public void setWaitingNumberStart(Integer waitingNumberStart){
return this.pmWorkStartTimeEnd; this.waitingNumberStart = waitingNumberStart;
} }
/** /**
* 设置 结束 下午上班开始时间 * 获取 结束 等待人数,后期删除
* @param pmWorkStartTimeEnd * @return $waitingNumberEnd
*/ */
public void setPmWorkStartTimeEnd(String pmWorkStartTimeEnd){ public Integer getWaitingNumberEnd(){
this.pmWorkStartTimeEnd = pmWorkStartTimeEnd; return this.waitingNumberEnd;
} }
/** /**
* 获取 开始 下午上班结束时间 * 设置 结束 等待人数,后期删除
* @return pmWorkEndTimeStart * @param waitingNumberEnd
*/ */
public String getPmWorkEndTimeStart(){ public void setWaitingNumberEnd(Integer waitingNumberEnd){
return this.pmWorkEndTimeStart; this.waitingNumberEnd = waitingNumberEnd;
} }
/** /**
* 设置 开始 下午上班结束时间 * 获取 增加 等待人数,后期删除
* @param pmWorkEndTimeStart * @return waitingNumberIncrement
*/ */
public void setPmWorkEndTimeStart(String pmWorkEndTimeStart){ public Integer getWaitingNumberIncrement(){
this.pmWorkEndTimeStart = pmWorkEndTimeStart; return this.waitingNumberIncrement;
} }
/** /**
* 获取 结束 下午上班结束时间 * 设置 增加 等待人数,后期删除
* @return pmWorkEndTimeEnd * @param waitingNumberIncrement
*/ */
public String getPmWorkEndTimeEnd(){ public void setWaitingNumberIncrement(Integer waitingNumberIncrement){
return this.pmWorkEndTimeEnd; this.waitingNumberIncrement = waitingNumberIncrement;
} }
/** /**
* 设置 结束 下午上班结束时间 * 获取 等待人数,后期删除
* @param pmWorkEndTimeEnd * @return waitingNumberList
*/ */
public void setPmWorkEndTimeEnd(String pmWorkEndTimeEnd){ public List<Integer> getWaitingNumberList(){
this.pmWorkEndTimeEnd = pmWorkEndTimeEnd; return this.waitingNumberList;
}
/**
* 设置 等待人数,后期删除
* @param waitingNumberList
*/
public void setWaitingNumberList(List<Integer> waitingNumberList){
this.waitingNumberList = waitingNumberList;
} }
/** /**
...@@ -1228,19 +1423,162 @@ public class SiteQuery extends SiteEntity { ...@@ -1228,19 +1423,162 @@ public class SiteQuery extends SiteEntity {
} }
/** /**
* 获取 部署模块，逗号分隔 * 获取 开始 是否是站点 (1.是,0.否)
* @return modelIdsList * @return isSiteStart
*/ */
public List<String> getModelIdsList(){ public Integer getIsSiteStart(){
return this.modelIdsList; return this.isSiteStart;
} }
/** /**
* 设置 部署模块，逗号分隔 * 设置 开始 是否是站点 (1.是,0.否)
* @param modelIdsList * @param isSiteStart
*/ */
public void setModelIdsList(List<String> modelIdsList){ public void setIsSiteStart(Integer isSiteStart){
this.modelIdsList = modelIdsList; 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
*/
public List<String> getLogoPathList(){
return this.logoPathList;
}
/**
* 设置 设备logo地址
* @param logoPathList
*/
public void setLogoPathList(List<String> logoPathList){
this.logoPathList = logoPathList;
}
/**
* 获取 站点英文名称
* @return englishNameList
*/
public List<String> getEnglishNameList(){
return this.englishNameList;
}
/**
* 设置 站点英文名称
* @param englishNameList
*/
public void setEnglishNameList(List<String> englishNameList){
this.englishNameList = englishNameList;
} }
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
...@@ -1370,6 +1708,21 @@ public class SiteQuery extends SiteEntity { ...@@ -1370,6 +1708,21 @@ 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
...@@ -1434,79 +1787,124 @@ public class SiteQuery extends SiteEntity { ...@@ -1434,79 +1787,124 @@ 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 siteCode * @param parentIdStart
*/ */
public SiteQuery siteCode(String siteCode){ public SiteQuery parentIdStart(Long parentIdStart){
setSiteCode(siteCode); this.parentIdStart = parentIdStart;
return this; return this;
} }
/** /**
* 设置 站点编号 * 设置 结束 父级id,默认0
* @param siteCodeList * @param parentIdEnd
*/ */
public SiteQuery siteCodeList(List<String> siteCodeList){ public SiteQuery parentIdEnd(Long parentIdEnd){
this.siteCodeList = siteCodeList; 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){
this.parentIdList = parentIdList;
return this; return this;
} }
/** /**
* 设置 区域Id * 设置 祖级列表，逗号分隔
* @param areaID * @param ancestors
*/ */
public SiteQuery areaID(String areaID){ public SiteQuery ancestors(String ancestors){
setAreaID(areaID); setAncestors(ancestors);
return this; return this;
} }
/** /**
* 设置 区域Id * 设置 祖级列表，逗号分隔
* @param areaIDList * @param ancestorsList
*/ */
public SiteQuery areaIDList(List<String> areaIDList){ public SiteQuery ancestorsList(List<String> ancestorsList){
this.areaIDList = areaIDList; this.ancestorsList = ancestorsList;
return this; return this;
} }
/** /**
* 设置 区域编号 * 设置 区域编号
* @param areaCode * @param regionCode
*/ */
public SiteQuery areaCode(String areaCode){ public SiteQuery regionCode(String regionCode){
setAreaCode(areaCode); setRegionCode(regionCode);
return this; return this;
} }
/** /**
* 设置 区域编号 * 设置 区域编号
* @param areaCodeList * @param regionCodeList
*/ */
public SiteQuery areaCodeList(List<String> areaCodeList){ public SiteQuery regionCodeList(List<String> regionCodeList){
this.areaCodeList = areaCodeList; this.regionCodeList = regionCodeList;
return this; return this;
} }
/** /**
* 设置 区域名称 * 设置 标识ID
* @param areaName * @param iid
*/ */
public SiteQuery areaName(String areaName){ public SiteQuery iid(String iid){
setAreaName(areaName); setIid(iid);
return this; return this;
} }
/** /**
* 设置 区域名称 * 设置 标识ID
* @param areaNameList * @param iidList
*/ */
public SiteQuery areaNameList(List<String> areaNameList){ public SiteQuery iidList(List<String> iidList){
this.areaNameList = areaNameList; this.iidList = iidList;
return this;
}
/**
* 设置 站点编号
* @param siteCode
*/
public SiteQuery siteCode(String siteCode){
setSiteCode(siteCode);
return this;
}
/**
* 设置 站点编号
* @param siteCodeList
*/
public SiteQuery siteCodeList(List<String> siteCodeList){
this.siteCodeList = siteCodeList;
return this; return this;
} }
...@@ -1531,39 +1929,39 @@ public class SiteQuery extends SiteEntity { ...@@ -1531,39 +1929,39 @@ public class SiteQuery extends SiteEntity {
/** /**
* 设置 市编码 * 设置 区编码
* @param cityCode * @param areaCode
*/ */
public SiteQuery cityCode(String cityCode){ public SiteQuery areaCode(String areaCode){
setCityCode(cityCode); setAreaCode(areaCode);
return this; return this;
} }
/** /**
* 设置 市编码 * 设置 区编码
* @param cityCodeList * @param areaCodeList
*/ */
public SiteQuery cityCodeList(List<String> cityCodeList){ public SiteQuery areaCodeList(List<String> areaCodeList){
this.cityCodeList = cityCodeList; this.areaCodeList = areaCodeList;
return this; return this;
} }
/** /**
* 设置 区编码 * 设置 市编码
* @param districtCode * @param cityCode
*/ */
public SiteQuery districtCode(String districtCode){ public SiteQuery cityCode(String cityCode){
setDistrictCode(districtCode); setCityCode(cityCode);
return this; return this;
} }
/** /**
* 设置 区编码 * 设置 市编码
* @param districtCodeList * @param cityCodeList
*/ */
public SiteQuery districtCodeList(List<String> districtCodeList){ public SiteQuery cityCodeList(List<String> cityCodeList){
this.districtCodeList = districtCodeList; this.cityCodeList = cityCodeList;
return this; return this;
} }
...@@ -1644,6 +2042,25 @@ public class SiteQuery extends SiteEntity { ...@@ -1644,6 +2042,25 @@ 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
...@@ -1701,9 +2118,171 @@ public class SiteQuery extends SiteEntity { ...@@ -1701,9 +2118,171 @@ 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.不上)
* @param workday1 * @param workday1
...@@ -2109,22 +2688,131 @@ public class SiteQuery extends SiteEntity { ...@@ -2109,22 +2688,131 @@ 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 modelIds * @param isSiteStart
*/ */
public SiteQuery modelIds(String modelIds){ public SiteQuery isSiteStart(Integer isSiteStart){
setModelIds(modelIds); this.isSiteStart = isSiteStart;
return this; return this;
} }
/** /**
* 设置 部署模块，逗号分隔 * 设置 结束 是否是站点 (1.是,0.否)
* @param modelIdsList * @param isSiteEnd
*/ */
public SiteQuery modelIdsList(List<String> modelIdsList){ public SiteQuery isSiteEnd(Integer isSiteEnd){
this.modelIdsList = modelIdsList; this.isSiteEnd = isSiteEnd;
return this;
}
/**
* 设置 增加 是否是站点 (1.是,0.否)
* @param isSiteIncrement
*/
public SiteQuery isSiteIncrement(Integer isSiteIncrement){
this.isSiteIncrement = isSiteIncrement;
return this;
}
/**
* 设置 是否是站点 (1.是,0.否)
* @param isSiteList
*/
public SiteQuery isSiteList(List<Integer> isSiteList){
this.isSiteList = isSiteList;
return this;
}
/**
* 设置 站点状态 (0.停用，1.正常)
* @param status
*/
public SiteQuery status(Integer status){
setStatus(status);
return this;
}
/**
* 设置 开始 站点状态 (0.停用，1.正常)
* @param statusStart
*/
public SiteQuery statusStart(Integer statusStart){
this.statusStart = statusStart;
return this;
}
/**
* 设置 结束 站点状态 (0.停用，1.正常)
* @param statusEnd
*/
public SiteQuery statusEnd(Integer statusEnd){
this.statusEnd = statusEnd;
return this;
}
/**
* 设置 增加 站点状态 (0.停用，1.正常)
* @param statusIncrement
*/
public SiteQuery statusIncrement(Integer statusIncrement){
this.statusIncrement = statusIncrement;
return this;
}
/**
* 设置 站点状态 (0.停用，1.正常)
* @param statusList
*/
public SiteQuery statusList(List<Integer> statusList){
this.statusList = statusList;
return this;
}
/**
* 设置 设备logo地址
* @param logoPath
*/
public SiteQuery logoPath(String logoPath){
setLogoPath(logoPath);
return this;
}
/**
* 设置 设备logo地址
* @param logoPathList
*/
public SiteQuery logoPathList(List<String> logoPathList){
this.logoPathList = logoPathList;
return this;
}
/**
* 设置 站点英文名称
* @param englishName
*/
public SiteQuery englishName(String englishName){
setEnglishName(englishName);
return this;
}
/**
* 设置 站点英文名称
* @param englishNameList
*/
public SiteQuery englishNameList(List<String> englishNameList){
this.englishNameList = englishNameList;
return this; return this;
} }
...@@ -2175,6 +2863,25 @@ public class SiteQuery extends SiteEntity { ...@@ -2175,6 +2863,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;
}
/** /**
* 获取 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 @ cdcf911f
...@@ -7,17 +7,19 @@ ...@@ -7,17 +7,19 @@
<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="areaID" column="areaID" />
<result property="areaCode" column="areaCode" />
<result property="areaName" column="areaName" />
<result property="proCode" column="proCode" /> <result property="proCode" column="proCode" />
<result property="areaCode" column="areaCode" />
<result property="cityCode" column="cityCode" /> <result property="cityCode" column="cityCode" />
<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" />
...@@ -25,6 +27,8 @@ ...@@ -25,6 +27,8 @@
<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" />
...@@ -34,10 +38,14 @@ ...@@ -34,10 +38,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="modelIds" column="modelIds" /> <result property="isSite" column="isSite" />
<result property="status" column="status" />
<result property="logoPath" column="logoPath" />
<result property="englishName" column="englishName" />
<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>
...@@ -46,121 +54,145 @@ ...@@ -46,121 +54,145 @@
<sql id="_columns"> <sql id="_columns">
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id as id, a.id,
</if> </if>
<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 as siteName, a.siteName,
</if> </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('parentId') or colPickMode == 1 and data.containsKey('parentId')))">
a.siteCode as siteCode, a.parentId,
</if> </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('ancestors') or colPickMode == 1 and data.containsKey('ancestors')))">
a.areaID as areaID, a.ancestors,
</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('regionCode') or colPickMode == 1 and data.containsKey('regionCode')))">
a.areaCode as areaCode, 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>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('areaName') or colPickMode == 1 and data.containsKey('areaName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteCode') or colPickMode == 1 and data.containsKey('siteCode')))">
a.areaName as areaName, 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')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('proCode') or colPickMode == 1 and data.containsKey('proCode')))">
a.proCode as proCode, a.proCode,
</if> </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('areaCode') or colPickMode == 1 and data.containsKey('areaCode')))">
a.cityCode as cityCode, a.areaCode,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('districtCode') or colPickMode == 1 and data.containsKey('districtCode')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('cityCode') or colPickMode == 1 and data.containsKey('cityCode')))">
a.districtCode as districtCode, a.cityCode,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteIp') or colPickMode == 1 and data.containsKey('siteIp')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteIp') or colPickMode == 1 and data.containsKey('siteIp')))">
a.siteIp as siteIp, a.siteIp,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sitePort') or colPickMode == 1 and data.containsKey('sitePort')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sitePort') or colPickMode == 1 and data.containsKey('sitePort')))">
a.sitePort as sitePort, a.sitePort,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('longitude') or colPickMode == 1 and data.containsKey('longitude')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('longitude') or colPickMode == 1 and data.containsKey('longitude')))">
a.longitude as longitude, a.longitude,
</if> </if>
<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 as latitude, a.latitude,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('haveSonArea') or colPickMode == 1 and data.containsKey('haveSonArea')))">
a.haveSonArea,
</if> </if>
<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 as siteTel, a.siteTel,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('detailAddress') or colPickMode == 1 and data.containsKey('detailAddress')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('detailAddress') or colPickMode == 1 and data.containsKey('detailAddress')))">
a.detailAddress as detailAddress, a.detailAddress,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteRemark') or colPickMode == 1 and data.containsKey('siteRemark')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteRemark') or colPickMode == 1 and data.containsKey('siteRemark')))">
a.siteRemark as siteRemark, a.siteRemark,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('amWorkStartTime') or colPickMode == 1 and data.containsKey('amWorkStartTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('amWorkStartTime') or colPickMode == 1 and data.containsKey('amWorkStartTime')))">
a.amWorkStartTime as amWorkStartTime, a.amWorkStartTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('amWorkEndTime') or colPickMode == 1 and data.containsKey('amWorkEndTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('amWorkEndTime') or colPickMode == 1 and data.containsKey('amWorkEndTime')))">
a.amWorkEndTime as amWorkEndTime, a.amWorkEndTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('pmWorkStartTime') or colPickMode == 1 and data.containsKey('pmWorkStartTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('pmWorkStartTime') or colPickMode == 1 and data.containsKey('pmWorkStartTime')))">
a.pmWorkStartTime as pmWorkStartTime, a.pmWorkStartTime,
</if> </if>
<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 as pmWorkEndTime, a.pmWorkEndTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('averageTime') or colPickMode == 1 and data.containsKey('averageTime')))">
a.averageTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('waitingNumber') or colPickMode == 1 and data.containsKey('waitingNumber')))">
a.waitingNumber,
</if> </if>
<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 as workday1, a.workday1,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workday2') or colPickMode == 1 and data.containsKey('workday2')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workday2') or colPickMode == 1 and data.containsKey('workday2')))">
a.workday2 as workday2, a.workday2,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workday3') or colPickMode == 1 and data.containsKey('workday3')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workday3') or colPickMode == 1 and data.containsKey('workday3')))">
a.workday3 as workday3, a.workday3,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workday4') or colPickMode == 1 and data.containsKey('workday4')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workday4') or colPickMode == 1 and data.containsKey('workday4')))">
a.workday4 as workday4, a.workday4,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workday5') or colPickMode == 1 and data.containsKey('workday5')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workday5') or colPickMode == 1 and data.containsKey('workday5')))">
a.workday5 as workday5, a.workday5,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workday6') or colPickMode == 1 and data.containsKey('workday6')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workday6') or colPickMode == 1 and data.containsKey('workday6')))">
a.workday6 as workday6, a.workday6,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workday7') or colPickMode == 1 and data.containsKey('workday7')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workday7') or colPickMode == 1 and data.containsKey('workday7')))">
a.workday7 as workday7, a.workday7,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('level') or colPickMode == 1 and data.containsKey('level')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('level') or colPickMode == 1 and data.containsKey('level')))">
a.level as level, a.level,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('building') or colPickMode == 1 and data.containsKey('building')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('building') or colPickMode == 1 and data.containsKey('building')))">
a.building as building, a.building,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('modelIds') or colPickMode == 1 and data.containsKey('modelIds')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isSite') or colPickMode == 1 and data.containsKey('isSite')))">
a.modelIds as modelIds, a.isSite,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))">
a.status,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('logoPath') or colPickMode == 1 and data.containsKey('logoPath')))">
a.logoPath,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('englishName') or colPickMode == 1 and data.containsKey('englishName')))">
a.englishName,
</if> </if>
<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 as createTime, a.createTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId as createUserId, a.createUserId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime as updateTime, a.updateTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('modelIds') or colPickMode == 1 and data.containsKey('modelIds')))">
a.modelIds,
</if> </if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="SiteEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="SiteEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_site insert into mortals_sys_site
(siteName,siteCode,areaID,areaCode,areaName,proCode,cityCode,districtCode,siteIp,sitePort,longitude,latitude,siteTel,detailAddress,siteRemark,amWorkStartTime,amWorkEndTime,pmWorkStartTime,pmWorkEndTime,workday1,workday2,workday3,workday4,workday5,workday6,workday7,level,building,modelIds,createTime,createUserId,updateTime) (siteName,parentId,ancestors,regionCode,iid,siteCode,proCode,areaCode,cityCode,siteIp,sitePort,longitude,latitude,haveSonArea,siteTel,detailAddress,siteRemark,amWorkStartTime,amWorkEndTime,pmWorkStartTime,pmWorkEndTime,averageTime,waitingNumber,workday1,workday2,workday3,workday4,workday5,workday6,workday7,level,building,isSite,status,logoPath,englishName,createTime,createUserId,updateTime,modelIds)
VALUES VALUES
(#{siteName},#{siteCode},#{areaID},#{areaCode},#{areaName},#{proCode},#{cityCode},#{districtCode},#{siteIp},#{sitePort},#{longitude},#{latitude},#{siteTel},#{detailAddress},#{siteRemark},#{amWorkStartTime},#{amWorkEndTime},#{pmWorkStartTime},#{pmWorkEndTime},#{workday1},#{workday2},#{workday3},#{workday4},#{workday5},#{workday6},#{workday7},#{level},#{building},#{modelIds},#{createTime},#{createUserId},#{updateTime}) (#{siteName},#{parentId},#{ancestors},#{regionCode},#{iid},#{siteCode},#{proCode},#{areaCode},#{cityCode},#{siteIp},#{sitePort},#{longitude},#{latitude},#{haveSonArea},#{siteTel},#{detailAddress},#{siteRemark},#{amWorkStartTime},#{amWorkEndTime},#{pmWorkStartTime},#{pmWorkEndTime},#{averageTime},#{waitingNumber},#{workday1},#{workday2},#{workday3},#{workday4},#{workday5},#{workday6},#{workday7},#{level},#{building},#{isSite},#{status},#{logoPath},#{englishName},#{createTime},#{createUserId},#{updateTime},#{modelIds})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_site insert into mortals_sys_site
(siteName,siteCode,areaID,areaCode,areaName,proCode,cityCode,districtCode,siteIp,sitePort,longitude,latitude,siteTel,detailAddress,siteRemark,amWorkStartTime,amWorkEndTime,pmWorkStartTime,pmWorkEndTime,workday1,workday2,workday3,workday4,workday5,workday6,workday7,level,building,modelIds,createTime,createUserId,updateTime) (siteName,parentId,ancestors,regionCode,iid,siteCode,proCode,areaCode,cityCode,siteIp,sitePort,longitude,latitude,haveSonArea,siteTel,detailAddress,siteRemark,amWorkStartTime,amWorkEndTime,pmWorkStartTime,pmWorkEndTime,averageTime,waitingNumber,workday1,workday2,workday3,workday4,workday5,workday6,workday7,level,building,isSite,status,logoPath,englishName,createTime,createUserId,updateTime,modelIds)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteName},#{item.siteCode},#{item.areaID},#{item.areaCode},#{item.areaName},#{item.proCode},#{item.cityCode},#{item.districtCode},#{item.siteIp},#{item.sitePort},#{item.longitude},#{item.latitude},#{item.siteTel},#{item.detailAddress},#{item.siteRemark},#{item.amWorkStartTime},#{item.amWorkEndTime},#{item.pmWorkStartTime},#{item.pmWorkEndTime},#{item.workday1},#{item.workday2},#{item.workday3},#{item.workday4},#{item.workday5},#{item.workday6},#{item.workday7},#{item.level},#{item.building},#{item.modelIds},#{item.createTime},#{item.createUserId},#{item.updateTime}) (#{item.siteName},#{item.parentId},#{item.ancestors},#{item.regionCode},#{item.iid},#{item.siteCode},#{item.proCode},#{item.areaCode},#{item.cityCode},#{item.siteIp},#{item.sitePort},#{item.longitude},#{item.latitude},#{item.haveSonArea},#{item.siteTel},#{item.detailAddress},#{item.siteRemark},#{item.amWorkStartTime},#{item.amWorkEndTime},#{item.pmWorkStartTime},#{item.pmWorkEndTime},#{item.averageTime},#{item.waitingNumber},#{item.workday1},#{item.workday2},#{item.workday3},#{item.workday4},#{item.workday5},#{item.workday6},#{item.workday7},#{item.level},#{item.building},#{item.isSite},#{item.status},#{item.logoPath},#{item.englishName},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.modelIds})
</foreach> </foreach>
</insert> </insert>
...@@ -173,27 +205,33 @@ ...@@ -173,27 +205,33 @@
<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('siteCode')) or (colPickMode==1 and !data.containsKey('siteCode'))"> <if test="(colPickMode==0 and data.containsKey('parentId')) or (colPickMode==1 and !data.containsKey('parentId'))">
a.siteCode=#{data.siteCode}, a.parentId=#{data.parentId},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('areaID')) or (colPickMode==1 and !data.containsKey('areaID'))"> <if test="(colPickMode==0 and data.containsKey('parentIdIncrement')) or (colPickMode==1 and !data.containsKey('parentIdIncrement'))">
a.areaID=#{data.areaID}, a.parentId=ifnull(a.parentId,0) + #{data.parentIdIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('areaCode')) or (colPickMode==1 and !data.containsKey('areaCode'))"> <if test="(colPickMode==0 and data.containsKey('ancestors')) or (colPickMode==1 and !data.containsKey('ancestors'))">
a.areaCode=#{data.areaCode}, a.ancestors=#{data.ancestors},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('areaName')) or (colPickMode==1 and !data.containsKey('areaName'))"> <if test="(colPickMode==0 and data.containsKey('regionCode')) or (colPickMode==1 and !data.containsKey('regionCode'))">
a.areaName=#{data.areaName}, a.regionCode=#{data.regionCode},
</if>
<if test="(colPickMode==0 and data.containsKey('iid')) or (colPickMode==1 and !data.containsKey('iid'))">
a.iid=#{data.iid},
</if>
<if test="(colPickMode==0 and data.containsKey('siteCode')) or (colPickMode==1 and !data.containsKey('siteCode'))">
a.siteCode=#{data.siteCode},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('proCode')) or (colPickMode==1 and !data.containsKey('proCode'))"> <if test="(colPickMode==0 and data.containsKey('proCode')) or (colPickMode==1 and !data.containsKey('proCode'))">
a.proCode=#{data.proCode}, a.proCode=#{data.proCode},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('areaCode')) or (colPickMode==1 and !data.containsKey('areaCode'))">
a.areaCode=#{data.areaCode},
</if>
<if test="(colPickMode==0 and data.containsKey('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>
<if test="(colPickMode==0 and data.containsKey('districtCode')) or (colPickMode==1 and !data.containsKey('districtCode'))">
a.districtCode=#{data.districtCode},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIp')) or (colPickMode==1 and !data.containsKey('siteIp'))"> <if test="(colPickMode==0 and data.containsKey('siteIp')) or (colPickMode==1 and !data.containsKey('siteIp'))">
a.siteIp=#{data.siteIp}, a.siteIp=#{data.siteIp},
</if> </if>
...@@ -206,6 +244,9 @@ ...@@ -206,6 +244,9 @@
<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>
...@@ -227,6 +268,18 @@ ...@@ -227,6 +268,18 @@
<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>
...@@ -281,8 +334,23 @@ ...@@ -281,8 +334,23 @@
<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('modelIds')) or (colPickMode==1 and !data.containsKey('modelIds'))"> <if test="(colPickMode==0 and data.containsKey('isSite')) or (colPickMode==1 and !data.containsKey('isSite'))">
a.modelIds=#{data.modelIds}, a.isSite=#{data.isSite},
</if>
<if test="(colPickMode==0 and data.containsKey('isSiteIncrement')) or (colPickMode==1 and !data.containsKey('isSiteIncrement'))">
a.isSite=ifnull(a.isSite,0) + #{data.isSiteIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('status')) or (colPickMode==1 and !data.containsKey('status'))">
a.status=#{data.status},
</if>
<if test="(colPickMode==0 and data.containsKey('statusIncrement')) or (colPickMode==1 and !data.containsKey('statusIncrement'))">
a.status=ifnull(a.status,0) + #{data.statusIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('logoPath')) or (colPickMode==1 and !data.containsKey('logoPath'))">
a.logoPath=#{data.logoPath},
</if>
<if test="(colPickMode==0 and data.containsKey('englishName')) or (colPickMode==1 and !data.containsKey('englishName'))">
a.englishName=#{data.englishName},
</if> </if>
<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},
...@@ -296,6 +364,9 @@ ...@@ -296,6 +364,9 @@
<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
...@@ -315,31 +386,43 @@ ...@@ -315,31 +386,43 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="siteCode=(case" suffix="ELSE siteCode end),"> <trim prefix="parentId=(case" suffix="ELSE parentId 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'))"> <choose>
when a.id=#{item.id} then #{item.siteCode} <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="" >
<if test="(colPickMode==0 and item.containsKey('ancestors')) or (colPickMode==1 and !item.containsKey('ancestors'))">
when a.id=#{item.id} then #{item.ancestors}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="areaID=(case" suffix="ELSE areaID end),"> <trim prefix="regionCode=(case" suffix="ELSE regionCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('areaID')) or (colPickMode==1 and !item.containsKey('areaID'))"> <if test="(colPickMode==0 and item.containsKey('regionCode')) or (colPickMode==1 and !item.containsKey('regionCode'))">
when a.id=#{item.id} then #{item.areaID} when a.id=#{item.id} then #{item.regionCode}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="areaCode=(case" suffix="ELSE areaCode end),"> <trim prefix="iid=(case" suffix="ELSE iid 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('areaCode')) or (colPickMode==1 and !item.containsKey('areaCode'))"> <if test="(colPickMode==0 and item.containsKey('iid')) or (colPickMode==1 and !item.containsKey('iid'))">
when a.id=#{item.id} then #{item.areaCode} when a.id=#{item.id} then #{item.iid}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="areaName=(case" suffix="ELSE areaName end),"> <trim prefix="siteCode=(case" suffix="ELSE siteCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('areaName')) or (colPickMode==1 and !item.containsKey('areaName'))"> <if test="(colPickMode==0 and item.containsKey('siteCode')) or (colPickMode==1 and !item.containsKey('siteCode'))">
when a.id=#{item.id} then #{item.areaName} when a.id=#{item.id} then #{item.siteCode}
</if> </if>
</foreach> </foreach>
</trim> </trim>
...@@ -350,17 +433,17 @@ ...@@ -350,17 +433,17 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="cityCode=(case" suffix="ELSE cityCode 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('cityCode')) or (colPickMode==1 and !item.containsKey('cityCode'))"> <if test="(colPickMode==0 and item.containsKey('areaCode')) or (colPickMode==1 and !item.containsKey('areaCode'))">
when a.id=#{item.id} then #{item.cityCode} when a.id=#{item.id} then #{item.areaCode}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="districtCode=(case" suffix="ELSE districtCode 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('districtCode')) or (colPickMode==1 and !item.containsKey('districtCode'))"> <if test="(colPickMode==0 and item.containsKey('cityCode')) or (colPickMode==1 and !item.containsKey('cityCode'))">
when a.id=#{item.id} then #{item.districtCode} when a.id=#{item.id} then #{item.cityCode}
</if> </if>
</foreach> </foreach>
</trim> </trim>
...@@ -392,6 +475,13 @@ ...@@ -392,6 +475,13 @@
</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'))">
...@@ -441,6 +531,30 @@ ...@@ -441,6 +531,30 @@
</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>
...@@ -549,10 +663,41 @@ ...@@ -549,10 +663,41 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="modelIds=(case" suffix="ELSE modelIds end),"> <trim prefix="isSite=(case" suffix="ELSE isSite end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('modelIds')) or (colPickMode==1 and !item.containsKey('modelIds'))"> <choose>
when a.id=#{item.id} then #{item.modelIds} <when test="(colPickMode==0 and item.containsKey('isSite')) or (colPickMode==1 and !item.containsKey('isSite'))">
when a.id=#{item.id} then #{item.isSite}
</when>
<when test="(colPickMode==0 and item.containsKey('isSiteIncrement')) or (colPickMode==1 and !item.containsKey('isSiteIncrement'))">
when a.id=#{item.id} then ifnull(a.isSite,0) + #{item.isSiteIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="status=(case" suffix="ELSE status end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('status')) or (colPickMode==1 and !item.containsKey('status'))">
when a.id=#{item.id} then #{item.status}
</when>
<when test="(colPickMode==0 and item.containsKey('statusIncrement')) or (colPickMode==1 and !item.containsKey('statusIncrement'))">
when a.id=#{item.id} then ifnull(a.status,0) + #{item.statusIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="logoPath=(case" suffix="ELSE logoPath end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('logoPath')) or (colPickMode==1 and !item.containsKey('logoPath'))">
when a.id=#{item.id} then #{item.logoPath}
</if>
</foreach>
</trim>
<trim prefix="englishName=(case" suffix="ELSE englishName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('englishName')) or (colPickMode==1 and !item.containsKey('englishName'))">
when a.id=#{item.id} then #{item.englishName}
</if> </if>
</foreach> </foreach>
</trim> </trim>
...@@ -582,6 +727,13 @@ ...@@ -582,6 +727,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> </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=")">
...@@ -719,63 +871,84 @@ ...@@ -719,63 +871,84 @@
#{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('siteCode')">
<if test="conditionParamRef.siteCode != null and conditionParamRef.siteCode != ''"> <if test="conditionParamRef.containsKey('ancestors')">
${_conditionType_} a.siteCode like #{${_conditionParam_}.siteCode} <if test="conditionParamRef.ancestors != null and conditionParamRef.ancestors != ''">
${_conditionType_} a.ancestors like #{${_conditionParam_}.ancestors}
</if> </if>
<if test="conditionParamRef.siteCode == null"> <if test="conditionParamRef.ancestors == null">
${_conditionType_} a.siteCode is null ${_conditionType_} a.ancestors is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('siteCodeList')"> <if test="conditionParamRef.containsKey('ancestorsList')">
${_conditionType_} a.siteCode in ${_conditionType_} a.ancestors in
<foreach collection="conditionParamRef.siteCodeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.ancestorsList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('areaID')"> <if test="conditionParamRef.containsKey('regionCode')">
<if test="conditionParamRef.areaID != null and conditionParamRef.areaID != ''"> <if test="conditionParamRef.regionCode != null and conditionParamRef.regionCode != ''">
${_conditionType_} a.areaID like #{${_conditionParam_}.areaID} ${_conditionType_} a.regionCode like #{${_conditionParam_}.regionCode}
</if> </if>
<if test="conditionParamRef.areaID == null"> <if test="conditionParamRef.regionCode == null">
${_conditionType_} a.areaID is null ${_conditionType_} a.regionCode is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('areaIDList')"> <if test="conditionParamRef.containsKey('regionCodeList')">
${_conditionType_} a.areaID in ${_conditionType_} a.regionCode in
<foreach collection="conditionParamRef.areaIDList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.regionCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('areaCode')"> <if test="conditionParamRef.containsKey('iid')">
<if test="conditionParamRef.areaCode != null and conditionParamRef.areaCode != ''"> <if test="conditionParamRef.iid != null and conditionParamRef.iid != ''">
${_conditionType_} a.areaCode like #{${_conditionParam_}.areaCode} ${_conditionType_} a.iid like #{${_conditionParam_}.iid}
</if> </if>
<if test="conditionParamRef.areaCode == null"> <if test="conditionParamRef.iid == null">
${_conditionType_} a.areaCode is null ${_conditionType_} a.iid is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('areaCodeList')"> <if test="conditionParamRef.containsKey('iidList')">
${_conditionType_} a.areaCode in ${_conditionType_} a.iid in
<foreach collection="conditionParamRef.areaCodeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.iidList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('areaName')"> <if test="conditionParamRef.containsKey('siteCode')">
<if test="conditionParamRef.areaName != null and conditionParamRef.areaName != ''"> <if test="conditionParamRef.siteCode != null and conditionParamRef.siteCode != ''">
${_conditionType_} a.areaName like #{${_conditionParam_}.areaName} ${_conditionType_} a.siteCode like #{${_conditionParam_}.siteCode}
</if> </if>
<if test="conditionParamRef.areaName == null"> <if test="conditionParamRef.siteCode == null">
${_conditionType_} a.areaName is null ${_conditionType_} a.siteCode is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('areaNameList')"> <if test="conditionParamRef.containsKey('siteCodeList')">
${_conditionType_} a.areaName in ${_conditionType_} a.siteCode in
<foreach collection="conditionParamRef.areaNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.siteCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
...@@ -795,6 +968,21 @@ ...@@ -795,6 +968,21 @@
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('areaCode')">
<if test="conditionParamRef.areaCode != null and conditionParamRef.areaCode != ''">
${_conditionType_} a.areaCode like #{${_conditionParam_}.areaCode}
</if>
<if test="conditionParamRef.areaCode == null">
${_conditionType_} a.areaCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('areaCodeList')">
${_conditionType_} a.areaCode in
<foreach collection="conditionParamRef.areaCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('cityCode')"> <if test="conditionParamRef.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}
...@@ -810,21 +998,6 @@ ...@@ -810,21 +998,6 @@
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('districtCode')">
<if test="conditionParamRef.districtCode != null and conditionParamRef.districtCode != ''">
${_conditionType_} a.districtCode like #{${_conditionParam_}.districtCode}
</if>
<if test="conditionParamRef.districtCode == null">
${_conditionType_} a.districtCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('districtCodeList')">
${_conditionType_} a.districtCode in
<foreach collection="conditionParamRef.districtCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIp')"> <if test="conditionParamRef.containsKey('siteIp')">
<if test="conditionParamRef.siteIp != null and conditionParamRef.siteIp != ''"> <if test="conditionParamRef.siteIp != null and conditionParamRef.siteIp != ''">
${_conditionType_} a.siteIp like #{${_conditionParam_}.siteIp} ${_conditionType_} a.siteIp like #{${_conditionParam_}.siteIp}
...@@ -885,6 +1058,21 @@ ...@@ -885,6 +1058,21 @@
</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}
...@@ -931,64 +1119,106 @@ ...@@ -931,64 +1119,106 @@
</if> </if>
<if test="conditionParamRef.containsKey('amWorkStartTime')"> <if test="conditionParamRef.containsKey('amWorkStartTime')">
<if test="conditionParamRef.amWorkStartTime != null "> <if test="conditionParamRef.amWorkStartTime != null and conditionParamRef.amWorkStartTime != ''">
${_conditionType_} a.amWorkStartTime = #{${_conditionParam_}.amWorkStartTime} ${_conditionType_} a.amWorkStartTime like #{${_conditionParam_}.amWorkStartTime}
</if> </if>
<if test="conditionParamRef.amWorkStartTime == null"> <if test="conditionParamRef.amWorkStartTime == null">
${_conditionType_} a.amWorkStartTime is null ${_conditionType_} a.amWorkStartTime is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('amWorkStartTimeStart') and conditionParamRef.amWorkStartTimeStart != null and conditionParamRef.amWorkStartTimeStart!=''"> <if test="conditionParamRef.containsKey('amWorkStartTimeList')">
${_conditionType_} a.amWorkStartTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.amWorkStartTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.amWorkStartTime in
</if> <foreach collection="conditionParamRef.amWorkStartTimeList" open="(" close=")" index="index" item="item" separator=",">
<if test="conditionParamRef.containsKey('amWorkStartTimeEnd') and conditionParamRef.amWorkStartTimeEnd != null and conditionParamRef.amWorkStartTimeEnd!=''"> #{item}
${_conditionType_} a.amWorkStartTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.amWorkStartTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('amWorkEndTime')"> <if test="conditionParamRef.containsKey('amWorkEndTime')">
<if test="conditionParamRef.amWorkEndTime != null "> <if test="conditionParamRef.amWorkEndTime != null and conditionParamRef.amWorkEndTime != ''">
${_conditionType_} a.amWorkEndTime = #{${_conditionParam_}.amWorkEndTime} ${_conditionType_} a.amWorkEndTime like #{${_conditionParam_}.amWorkEndTime}
</if> </if>
<if test="conditionParamRef.amWorkEndTime == null"> <if test="conditionParamRef.amWorkEndTime == null">
${_conditionType_} a.amWorkEndTime is null ${_conditionType_} a.amWorkEndTime is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('amWorkEndTimeStart') and conditionParamRef.amWorkEndTimeStart != null and conditionParamRef.amWorkEndTimeStart!=''"> <if test="conditionParamRef.containsKey('amWorkEndTimeList')">
${_conditionType_} a.amWorkEndTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.amWorkEndTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.amWorkEndTime in
</if> <foreach collection="conditionParamRef.amWorkEndTimeList" open="(" close=")" index="index" item="item" separator=",">
<if test="conditionParamRef.containsKey('amWorkEndTimeEnd') and conditionParamRef.amWorkEndTimeEnd != null and conditionParamRef.amWorkEndTimeEnd!=''"> #{item}
${_conditionType_} a.amWorkEndTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.amWorkEndTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('pmWorkStartTime')"> <if test="conditionParamRef.containsKey('pmWorkStartTime')">
<if test="conditionParamRef.pmWorkStartTime != null "> <if test="conditionParamRef.pmWorkStartTime != null and conditionParamRef.pmWorkStartTime != ''">
${_conditionType_} a.pmWorkStartTime = #{${_conditionParam_}.pmWorkStartTime} ${_conditionType_} a.pmWorkStartTime like #{${_conditionParam_}.pmWorkStartTime}
</if> </if>
<if test="conditionParamRef.pmWorkStartTime == null"> <if test="conditionParamRef.pmWorkStartTime == null">
${_conditionType_} a.pmWorkStartTime is null ${_conditionType_} a.pmWorkStartTime is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('pmWorkStartTimeStart') and conditionParamRef.pmWorkStartTimeStart != null and conditionParamRef.pmWorkStartTimeStart!=''"> <if test="conditionParamRef.containsKey('pmWorkStartTimeList')">
${_conditionType_} a.pmWorkStartTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.pmWorkStartTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.pmWorkStartTime in
</if> <foreach collection="conditionParamRef.pmWorkStartTimeList" open="(" close=")" index="index" item="item" separator=",">
<if test="conditionParamRef.containsKey('pmWorkStartTimeEnd') and conditionParamRef.pmWorkStartTimeEnd != null and conditionParamRef.pmWorkStartTimeEnd!=''"> #{item}
${_conditionType_} a.pmWorkStartTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.pmWorkStartTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('pmWorkEndTime')"> <if test="conditionParamRef.containsKey('pmWorkEndTime')">
<if test="conditionParamRef.pmWorkEndTime != null "> <if test="conditionParamRef.pmWorkEndTime != null and conditionParamRef.pmWorkEndTime != ''">
${_conditionType_} a.pmWorkEndTime = #{${_conditionParam_}.pmWorkEndTime} ${_conditionType_} a.pmWorkEndTime like #{${_conditionParam_}.pmWorkEndTime}
</if> </if>
<if test="conditionParamRef.pmWorkEndTime == null"> <if test="conditionParamRef.pmWorkEndTime == null">
${_conditionType_} a.pmWorkEndTime is null ${_conditionType_} a.pmWorkEndTime is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('pmWorkEndTimeStart') and conditionParamRef.pmWorkEndTimeStart != null and conditionParamRef.pmWorkEndTimeStart!=''"> <if test="conditionParamRef.containsKey('pmWorkEndTimeList')">
${_conditionType_} a.pmWorkEndTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.pmWorkEndTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.pmWorkEndTime in
<foreach collection="conditionParamRef.pmWorkEndTimeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('pmWorkEndTimeEnd') and conditionParamRef.pmWorkEndTimeEnd != null and conditionParamRef.pmWorkEndTimeEnd!=''"> <if test="conditionParamRef.containsKey('averageTime')">
${_conditionType_} a.pmWorkEndTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.pmWorkEndTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') <if test="conditionParamRef.averageTime != null ">
${_conditionType_} a.averageTime = #{${_conditionParam_}.averageTime}
</if>
<if test="conditionParamRef.averageTime == null">
${_conditionType_} a.averageTime is null
</if>
</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 test="conditionParamRef.containsKey('waitingNumberEnd') and conditionParamRef.waitingNumberEnd != null">
${_conditionType_} a.waitingNumber <![CDATA[ <= ]]> #{${_conditionParam_}.waitingNumberEnd}
</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}
...@@ -1178,18 +1408,75 @@ ...@@ -1178,18 +1408,75 @@
${_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('modelIds')"> <if test="conditionParamRef.containsKey('status')">
<if test="conditionParamRef.modelIds != null and conditionParamRef.modelIds != ''"> <if test="conditionParamRef.status != null ">
${_conditionType_} a.modelIds like #{${_conditionParam_}.modelIds} ${_conditionType_} a.status = #{${_conditionParam_}.status}
</if> </if>
<if test="conditionParamRef.modelIds == null"> <if test="conditionParamRef.status == null">
${_conditionType_} a.modelIds is null ${_conditionType_} a.status is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('modelIdsList')"> <if test="conditionParamRef.containsKey('statusList')">
${_conditionType_} a.modelIds in ${_conditionType_} a.status in
<foreach collection="conditionParamRef.modelIdsList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('statusStart') and conditionParamRef.statusStart != null">
${_conditionType_} a.status <![CDATA[ >= ]]> #{${_conditionParam_}.statusStart}
</if>
<if test="conditionParamRef.containsKey('statusEnd') and conditionParamRef.statusEnd != null">
${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd}
</if>
<if test="conditionParamRef.containsKey('logoPath')">
<if test="conditionParamRef.logoPath != null and conditionParamRef.logoPath != ''">
${_conditionType_} a.logoPath like #{${_conditionParam_}.logoPath}
</if>
<if test="conditionParamRef.logoPath == null">
${_conditionType_} a.logoPath is null
</if>
</if>
<if test="conditionParamRef.containsKey('logoPathList')">
${_conditionType_} a.logoPath in
<foreach collection="conditionParamRef.logoPathList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('englishName')">
<if test="conditionParamRef.englishName != null and conditionParamRef.englishName != ''">
${_conditionType_} a.englishName like #{${_conditionParam_}.englishName}
</if>
<if test="conditionParamRef.englishName == null">
${_conditionType_} a.englishName is null
</if>
</if>
<if test="conditionParamRef.containsKey('englishNameList')">
${_conditionType_} a.englishName in
<foreach collection="conditionParamRef.englishNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
...@@ -1244,6 +1531,21 @@ ...@@ -1244,6 +1531,21 @@
<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()">
...@@ -1267,24 +1569,29 @@ ...@@ -1267,24 +1569,29 @@
<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('siteCode')"> <if test="orderCol.containsKey('parentId')">
a.siteCode a.parentId
<if test='orderCol.siteCode != null and "DESC".equalsIgnoreCase(orderCol.siteCode)'>DESC</if> <if test='orderCol.parentId != null and "DESC".equalsIgnoreCase(orderCol.parentId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('areaID')"> <if test="orderCol.containsKey('ancestors')">
a.areaID a.ancestors
<if test='orderCol.areaID != null and "DESC".equalsIgnoreCase(orderCol.areaID)'>DESC</if> <if test='orderCol.ancestors != null and "DESC".equalsIgnoreCase(orderCol.ancestors)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('areaCode')"> <if test="orderCol.containsKey('regionCode')">
a.areaCode a.regionCode
<if test='orderCol.areaCode != null and "DESC".equalsIgnoreCase(orderCol.areaCode)'>DESC</if> <if test='orderCol.regionCode != null and "DESC".equalsIgnoreCase(orderCol.regionCode)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('areaName')"> <if test="orderCol.containsKey('iid')">
a.areaName a.iid
<if test='orderCol.areaName != null and "DESC".equalsIgnoreCase(orderCol.areaName)'>DESC</if> <if test='orderCol.iid != null and "DESC".equalsIgnoreCase(orderCol.iid)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('siteCode')">
a.siteCode
<if test='orderCol.siteCode != null and "DESC".equalsIgnoreCase(orderCol.siteCode)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('proCode')"> <if test="orderCol.containsKey('proCode')">
...@@ -1292,16 +1599,16 @@ ...@@ -1292,16 +1599,16 @@
<if test='orderCol.proCode != null and "DESC".equalsIgnoreCase(orderCol.proCode)'>DESC</if> <if test='orderCol.proCode != null and "DESC".equalsIgnoreCase(orderCol.proCode)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('areaCode')">
a.areaCode
<if test='orderCol.areaCode != null and "DESC".equalsIgnoreCase(orderCol.areaCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('cityCode')"> <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>
, ,
</if> </if>
<if test="orderCol.containsKey('districtCode')">
a.districtCode
<if test='orderCol.districtCode != null and "DESC".equalsIgnoreCase(orderCol.districtCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('siteIp')"> <if test="orderCol.containsKey('siteIp')">
a.siteIp a.siteIp
<if test='orderCol.siteIp != null and "DESC".equalsIgnoreCase(orderCol.siteIp)'>DESC</if> <if test='orderCol.siteIp != null and "DESC".equalsIgnoreCase(orderCol.siteIp)'>DESC</if>
...@@ -1322,6 +1629,11 @@ ...@@ -1322,6 +1629,11 @@
<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>
...@@ -1357,6 +1669,16 @@ ...@@ -1357,6 +1669,16 @@
<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>
...@@ -1402,9 +1724,24 @@ ...@@ -1402,9 +1724,24 @@
<if test='orderCol.building != null and "DESC".equalsIgnoreCase(orderCol.building)'>DESC</if> <if test='orderCol.building != null and "DESC".equalsIgnoreCase(orderCol.building)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('modelIds')"> <if test="orderCol.containsKey('isSite')">
a.modelIds a.isSite
<if test='orderCol.modelIds != null and "DESC".equalsIgnoreCase(orderCol.modelIds)'>DESC</if> <if test='orderCol.isSite != null and "DESC".equalsIgnoreCase(orderCol.isSite)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('status')">
a.status
<if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('logoPath')">
a.logoPath
<if test='orderCol.logoPath != null and "DESC".equalsIgnoreCase(orderCol.logoPath)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('englishName')">
a.englishName
<if test='orderCol.englishName != null and "DESC".equalsIgnoreCase(orderCol.englishName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('createTime')">
...@@ -1422,6 +1759,11 @@ ...@@ -1422,6 +1759,11 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('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