添加大厅与窗口关联

base-manager/db/add.sql

@@ -46,3 +46,54 @@ ALTER TABLE mortals_sys_site_matter ADD COLUMN   `display` tinyint(2)    DEFAULT
 -- ----------------------------
 ALTER TABLE mortals_sys_site_theme_matter ADD COLUMN   `hot` tinyint(2)    DEFAULT '0'  COMMENT '热门(0.否,1.是)' AFTER userType;
 ALTER TABLE mortals_sys_site_theme_matter ADD COLUMN   `display` tinyint(2)    DEFAULT '1'  COMMENT '显示(0.否,1.是)' AFTER hot;
+
+
+-- ----------------------------
+2023-4-25
+-- ----------------------------
+-- ----------------------------
+-- 站点大厅信息表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_sys_site_hall`;
+CREATE TABLE mortals_sys_site_hall(
+    `id` bigint(20)   AUTO_INCREMENT   COMMENT '序号，主键，自增长',
+    `siteId` bigint(20)      COMMENT '站点ID',
+    `siteName` varchar(255)      COMMENT '站点名称',
+    `hallName` varchar(256)      COMMENT '大厅名称',
+    `address` varchar(256)      COMMENT '地址',
+    `floor` tinyint(2)    DEFAULT '1'  COMMENT '楼层',
+    `build` tinyint(2)    DEFAULT '1'  COMMENT '楼栋',
+    `remark` varchar(255)      COMMENT '备注',
+    `createTime` datetime      COMMENT '创建时间',
+    `createUserId` bigint(20)      COMMENT '创建用户',
+    `updateUserId` bigint(20)      COMMENT '更新用户',
+    `updateTime` datetime      COMMENT '修改时间',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='站点大厅信息';
+-- ----------------------------
+-- 大厅窗口表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_sys_window_hall`;
+CREATE TABLE mortals_sys_window_hall(
+    `id` bigint(20)   AUTO_INCREMENT   COMMENT '序号，主键，自增长',
+    `windowId` bigint(20)      COMMENT '窗口ID',
+    `windowName` varchar(255)      COMMENT '窗口名称',
+    `hallId` bigint(20)      COMMENT '大厅ID',
+    `hallName` varchar(255)      COMMENT '大厅名称',
+    `sort` int(4)    DEFAULT '0'  COMMENT '排序',
+    `remark` varchar(512)      COMMENT '备注',
+    `createTime` datetime      COMMENT '创建时间',
+    `createUserId` bigint(20)      COMMENT '创建用户',
+    `updateTime` datetime      COMMENT '修改时间',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='大厅窗口';
+
+
+INSERT INTO `mortals_xhx_resource` VALUES (null, '站点大厅信息-菜单管理-查看', '/site/hall/list,/site/hall/view,/site/hall/info,/site/hall/export,/site/hall/exportExcel,/site/hall/downloadTemplate,/site/hall/download', 3, 0, NULL, NULL, NULL, 0);
+INSERT INTO `mortals_xhx_resource` VALUES (null, '站点大厅信息-菜单管理-维护', '/site/hall/add,/site/hall/edit,/site/hall/delete,/site/hall/logicDelete,/site/hall/save,/site/hall/importData', 3, 0, NULL, NULL, NULL, 0);
+
+
+INSERT INTO `mortals_xhx_resource` VALUES (null, '大厅窗口-菜单管理-查看', '/window/hall/list,/window/hall/view,/window/hall/info,/window/hall/export,/window/hall/exportExcel,/window/hall/downloadTemplate,/window/hall/download', 3, 0, NULL, NULL, NULL, 0);
+INSERT INTO `mortals_xhx_resource` VALUES (null, '大厅窗口-菜单管理-维护', '/window/hall/add,/window/hall/edit,/window/hall/delete,/window/hall/logicDelete,/window/hall/save,/window/hall/importData', 3, 0, NULL, NULL, NULL, 0);
+
+

base-manager/doc/api.md

@@ -12280,6 +12280,451 @@ dict|object|字典对象
 }
 ```
 
+## 站点大厅信息
+
+### 查询站点大厅信息列表
+
+**请求URL:** site/hall/list
+
+**请求方式:** POST
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 查询站点大厅信息
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:------
+page|Integer|否|当前页
+size|Integer|否|每页条数，值为-1，查询所有记录
+
+**请求样例:**
+```
+  {
+        "page":1,
+        "size":10
+  }
+
+```
+**响应参数:**
+
+参数名称|参数类型|描述
+:---|:---|:------
+code|Integer|结果码（-1.失败，1.成功）
+msg|String|消息
+data|object|数据对象
+ per_page|Integer|每页条数
+ total|Integer|总条数
+ last_page|Integer|总页数
+ current_page|Integer|当前页
+ data|array|结果集列表|数组
+  id|Long|序号，主键，自增长
+  siteId|Long|站点ID
+  siteName|String|站点名称
+  hallName|String|大厅名称
+  address|String|地址
+  floor|Integer|楼层
+  build|Integer|楼栋
+  remark|String|备注
+  createTime|Date|创建时间
+  createUserId|Long|创建用户
+  updateUserId|Long|更新用户
+  updateTime|Date|修改时间
+dict|object|字典对象
+
+**响应消息样例:**
+```
+{
+    "code":1,
+    "data":{
+    }
+}
+```
+
+### 查看站点大厅信息
+
+**请求URL:** site/hall/info
+
+**请求方式:** GET
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 查看站点大厅信息，返回实例详细信息
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:------
+id|Long|是|ID
+
+**请求样例:**
+```
+    http://localhost/site/hall/info?id=549
+```
+**响应参数:**
+
+参数名称 |参数类型|描述
+:---|:---|:-------
+code|Integer|结果码（-1.失败，1.成功）
+msg|String|消息
+data|object|数据对象
+ id|Long|序号，主键，自增长
+ siteId|Long|站点ID
+ siteName|String|站点名称
+ hallName|String|大厅名称
+ address|String|地址
+ floor|Integer|楼层
+ build|Integer|楼栋
+ remark|String|备注
+ createTime|Date|创建时间
+ createUserId|Long|创建用户
+ updateUserId|Long|更新用户
+ updateTime|Date|修改时间
+dict|object|字典对象
+
+**响应消息样例:**
+```
+{
+    "code": 1,
+    "data": {
+            "id":9840,
+            "siteId":5054,
+            "siteName":"i5a751",
+            "hallName":"hoz3ni",
+            "address":"s6vhsd",
+            "floor":6966,
+            "build":7397,
+            "remark":"fjcm49",
+            "createTime":"2023-04-25",
+            "createUserId":9242,
+            "updateUserId":5587,
+            "updateTime":"2023-04-25"
+        }
+}
+```
+
+### 保存更新站点大厅信息
+
+**请求URL:** site/hall/save
+
+**请求方式:** POST
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 保存或更新站点大厅信息：id为空时为新增保存，否则为更新提交
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:-------
+siteId|Long|否|站点ID
+siteName|String|否|站点名称
+hallName|String|否|大厅名称
+address|String|否|地址
+floor|Integer|否|楼层
+build|Integer|否|楼栋
+remark|String|否|备注
+
+**请求样例:**
+```
+{
+    "siteId":4938,
+    "siteName":"8ivb5x",
+    "hallName":"fjm0wv",
+    "address":"fcnr01",
+    "floor":700,
+    "build":4881,
+    "remark":"x1qvxm",
+}
+
+```
+**响应参数:**
+
+参数名称 |参数类型|描述
+:---|:---|:------
+code|Integer|结果码（-1.失败，1.成功）
+msg|String|消息
+data|object|数据对象
+ id|Long|保存后主键id
+ entity|object|保存更新实体
+  id|Long|序号，主键，自增长
+  siteId|Long|站点ID
+  siteName|String|站点名称
+  hallName|String|大厅名称
+  address|String|地址
+  floor|Integer|楼层
+  build|Integer|楼栋
+  remark|String|备注
+  createTime|Date|创建时间
+  createUserId|Long|创建用户
+  updateUserId|Long|更新用户
+  updateTime|Date|修改时间
+
+**响应消息样例:**
+```
+{
+    "msg":"新增模块成功",
+    "code":1,
+    "data":{}
+    }
+}
+
+```
+
+### 删除站点大厅信息
+
+**请求URL:** site/hall/delete
+
+**请求方式:** GET
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 删除站点大厅信息
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:------
+id|String|是|数组
+
+**请求样例:**
+```
+    http://localhost:8080/site/hall/delete?id=1&id=2'
+```
+**响应参数:**
+
+参数名称 |参数类型|备注|其它
+---|---|---|---
+code|Integer|结果码（-1.失败，1.成功）|-
+msg|String|消息|-
+
+**响应消息样例:**
+```
+{
+    "code":1,
+	"msg":"成功"
+}
+
+```
+## 大厅窗口
+
+### 查询大厅窗口列表
+
+**请求URL:** window/hall/list
+
+**请求方式:** POST
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 查询大厅窗口
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:------
+page|Integer|否|当前页
+size|Integer|否|每页条数，值为-1，查询所有记录
+
+**请求样例:**
+```
+  {
+        "page":1,
+        "size":10
+  }
+
+```
+**响应参数:**
+
+参数名称|参数类型|描述
+:---|:---|:------
+code|Integer|结果码（-1.失败，1.成功）
+msg|String|消息
+data|object|数据对象
+ per_page|Integer|每页条数
+ total|Integer|总条数
+ last_page|Integer|总页数
+ current_page|Integer|当前页
+ data|array|结果集列表|数组
+  id|Long|序号，主键，自增长
+  windowId|Long|窗口ID
+  windowName|String|窗口名称
+  hallId|Long|大厅ID
+  hallName|String|大厅名称
+  sort|Integer|排序
+  remark|String|备注
+  createTime|Date|创建时间
+  createUserId|Long|创建用户
+  updateTime|Date|修改时间
+dict|object|字典对象
+
+**响应消息样例:**
+```
+{
+    "code":1,
+    "data":{
+    }
+}
+```
+
+### 查看大厅窗口
+
+**请求URL:** window/hall/info
+
+**请求方式:** GET
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 查看大厅窗口，返回实例详细信息
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:------
+id|Long|是|ID
+
+**请求样例:**
+```
+    http://localhost/window/hall/info?id=549
+```
+**响应参数:**
+
+参数名称 |参数类型|描述
+:---|:---|:-------
+code|Integer|结果码（-1.失败，1.成功）
+msg|String|消息
+data|object|数据对象
+ id|Long|序号，主键，自增长
+ windowId|Long|窗口ID
+ windowName|String|窗口名称
+ hallId|Long|大厅ID
+ hallName|String|大厅名称
+ sort|Integer|排序
+ remark|String|备注
+ createTime|Date|创建时间
+ createUserId|Long|创建用户
+ updateTime|Date|修改时间
+dict|object|字典对象
+
+**响应消息样例:**
+```
+{
+    "code": 1,
+    "data": {
+            "id":6104,
+            "windowId":6254,
+            "windowName":"1c5gt9",
+            "hallId":6706,
+            "hallName":"kneski",
+            "sort":6714,
+            "remark":"g8htor",
+            "createTime":"2023-04-25",
+            "createUserId":5190,
+            "updateTime":"2023-04-25"
+        }
+}
+```
+
+### 保存更新大厅窗口
+
+**请求URL:** window/hall/save
+
+**请求方式:** POST
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 保存或更新大厅窗口：id为空时为新增保存，否则为更新提交
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:-------
+windowId|Long|否|窗口ID
+windowName|String|否|窗口名称
+hallId|Long|否|大厅ID
+hallName|String|否|大厅名称
+sort|Integer|否|排序
+remark|String|否|备注
+
+**请求样例:**
+```
+{
+    "windowId":7283,
+    "windowName":"0n0oca",
+    "hallId":5929,
+    "hallName":"ukcvnf",
+    "sort":298,
+    "remark":"b9xvxa",
+}
+
+```
+**响应参数:**
+
+参数名称 |参数类型|描述
+:---|:---|:------
+code|Integer|结果码（-1.失败，1.成功）
+msg|String|消息
+data|object|数据对象
+ id|Long|保存后主键id
+ entity|object|保存更新实体
+  id|Long|序号，主键，自增长
+  windowId|Long|窗口ID
+  windowName|String|窗口名称
+  hallId|Long|大厅ID
+  hallName|String|大厅名称
+  sort|Integer|排序
+  remark|String|备注
+  createTime|Date|创建时间
+  createUserId|Long|创建用户
+  updateTime|Date|修改时间
+
+**响应消息样例:**
+```
+{
+    "msg":"新增模块成功",
+    "code":1,
+    "data":{}
+    }
+}
+
+```
+
+### 删除大厅窗口
+
+**请求URL:** window/hall/delete
+
+**请求方式:** GET
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 删除大厅窗口
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:------
+id|String|是|数组
+
+**请求样例:**
+```
+    http://localhost:8080/window/hall/delete?id=1&id=2'
+```
+**响应参数:**
+
+参数名称 |参数类型|备注|其它
+---|---|---|---
+code|Integer|结果码（-1.失败，1.成功）|-
+msg|String|消息|-
+
+**响应消息样例:**
+```
+{
+    "code":1,
+	"msg":"成功"
+}
+
+```
+
 
 ## 字典附录
 

base-manager/src/main/java/com/mortals/xhx/module/site/dao/SiteHallDao.java

+package com.mortals.xhx.module.site.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.site.model.SiteHallEntity;
+import java.util.List;
+/**
+* 站点大厅信息Dao
+* 站点大厅信息 DAO接口
+*
+* @author zxfei
+* @date 2023-04-25
+*/
+
+public interface  SiteHallDao extends ICRUDDao<SiteHallEntity,Long>{
+
+
+}

base-manager/src/main/java/com/mortals/xhx/module/site/dao/ibatis/SiteHallDaoImpl.java

+package com.mortals.xhx.module.site.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.site.dao.SiteHallDao;
+import com.mortals.xhx.module.site.model.SiteHallEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 站点大厅信息DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2023-04-25
+*/
+@Repository("siteHallDao")
+public class SiteHallDaoImpl extends BaseCRUDDaoMybatis<SiteHallEntity,Long> implements SiteHallDao {
+
+
+
+}

base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteHallEntity.java

+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.SiteHallVo;
+import lombok.Data;
+/**
+* 站点大厅信息实体对象
+*
+* @author zxfei
+* @date 2023-04-25
+*/
+@Data
+public class SiteHallEntity extends SiteHallVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 站点ID
+    */
+    private Long siteId;
+    /**
+    * 站点名称
+    */
+    private String siteName;
+    /**
+    * 大厅名称
+    */
+    private String hallName;
+    /**
+    * 地址
+    */
+    private String address;
+    /**
+    * 楼层
+    */
+    private Integer floor;
+    /**
+    * 楼栋
+    */
+    private Integer build;
+    /**
+    * 备注
+    */
+    private String remark;
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof SiteHallEntity) {
+            SiteHallEntity tmp = (SiteHallEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+
+            this.siteId = null;
+
+            this.siteName = "";
+
+            this.hallName = "";
+
+            this.address = "";
+
+            this.floor = 1;
+
+            this.build = 1;
+
+            this.remark = "";
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteHallQuery.java

+package com.mortals.xhx.module.site.model;
+
+import java.util.List;
+import com.mortals.xhx.module.site.model.SiteHallEntity;
+/**
+* 站点大厅信息查询对象
+*
+* @author zxfei
+* @date 2023-04-25
+*/
+public class SiteHallQuery extends SiteHallEntity {
+    /** 开始 序号，主键，自增长 */
+    private Long idStart;
+
+    /** 结束 序号，主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 序号，主键，自增长 */
+    private Long idIncrement;
+
+    /** 序号，主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 序号，主键，自增长排除列表 */
+    private List <Long> idNotList;
+
+    /** 开始 站点ID */
+    private Long siteIdStart;
+
+    /** 结束 站点ID */
+    private Long siteIdEnd;
+
+    /** 增加 站点ID */
+    private Long siteIdIncrement;
+
+    /** 站点ID列表 */
+    private List <Long> siteIdList;
+
+    /** 站点ID排除列表 */
+    private List <Long> siteIdNotList;
+
+    /** 站点名称 */
+    private List<String> siteNameList;
+
+    /** 站点名称排除列表 */
+    private List <String> siteNameNotList;
+    /** 大厅名称 */
+    private List<String> hallNameList;
+
+    /** 大厅名称排除列表 */
+    private List <String> hallNameNotList;
+    /** 地址 */
+    private List<String> addressList;
+
+    /** 地址排除列表 */
+    private List <String> addressNotList;
+    /** 开始 楼层 */
+    private Integer floorStart;
+
+    /** 结束 楼层 */
+    private Integer floorEnd;
+
+    /** 增加 楼层 */
+    private Integer floorIncrement;
+
+    /** 楼层列表 */
+    private List <Integer> floorList;
+
+    /** 楼层排除列表 */
+    private List <Integer> floorNotList;
+
+    /** 开始 楼栋 */
+    private Integer buildStart;
+
+    /** 结束 楼栋 */
+    private Integer buildEnd;
+
+    /** 增加 楼栋 */
+    private Integer buildIncrement;
+
+    /** 楼栋列表 */
+    private List <Integer> buildList;
+
+    /** 楼栋排除列表 */
+    private List <Integer> buildNotList;
+
+    /** 备注 */
+    private List<String> remarkList;
+
+    /** 备注排除列表 */
+    private List <String> remarkNotList;
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
+    /** 创建用户排除列表 */
+    private List <Long> createUserIdNotList;
+
+    /** 开始 更新用户 */
+    private Long updateUserIdStart;
+
+    /** 结束 更新用户 */
+    private Long updateUserIdEnd;
+
+    /** 增加 更新用户 */
+    private Long updateUserIdIncrement;
+
+    /** 更新用户列表 */
+    private List <Long> updateUserIdList;
+
+    /** 更新用户排除列表 */
+    private List <Long> updateUserIdNotList;
+
+    /** 开始 修改时间 */
+    private String updateTimeStart;
+
+    /** 结束 修改时间 */
+    private String updateTimeEnd;
+
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<SiteHallQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<SiteHallQuery> andConditionList;
+
+    public SiteHallQuery(){}
+
+    /**
+    * 获取 开始 序号，主键，自增长
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 序号，主键，自增长
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 序号，主键，自增长
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 序号，主键，自增长
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 序号，主键，自增长
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 序号，主键，自增长
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 序号，主键，自增长
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 序号，主键，自增长
+    * @return idNotList
+    */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idNotList
+    */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
+    /**
+    * 获取 开始 站点ID
+    * @return siteIdStart
+    */
+    public Long getSiteIdStart(){
+        return this.siteIdStart;
+    }
+
+    /**
+    * 设置 开始 站点ID
+    * @param siteIdStart
+    */
+    public void setSiteIdStart(Long siteIdStart){
+        this.siteIdStart = siteIdStart;
+    }
+
+    /**
+    * 获取 结束 站点ID
+    * @return $siteIdEnd
+    */
+    public Long getSiteIdEnd(){
+        return this.siteIdEnd;
+    }
+
+    /**
+    * 设置 结束 站点ID
+    * @param siteIdEnd
+    */
+    public void setSiteIdEnd(Long siteIdEnd){
+        this.siteIdEnd = siteIdEnd;
+    }
+
+    /**
+    * 获取 增加 站点ID
+    * @return siteIdIncrement
+    */
+    public Long getSiteIdIncrement(){
+        return this.siteIdIncrement;
+    }
+
+    /**
+    * 设置 增加 站点ID
+    * @param siteIdIncrement
+    */
+    public void setSiteIdIncrement(Long siteIdIncrement){
+        this.siteIdIncrement = siteIdIncrement;
+    }
+
+    /**
+    * 获取 站点ID
+    * @return siteIdList
+    */
+    public List<Long> getSiteIdList(){
+        return this.siteIdList;
+    }
+
+    /**
+    * 设置 站点ID
+    * @param siteIdList
+    */
+    public void setSiteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+    }
+
+    /**
+    * 获取 站点ID
+    * @return siteIdNotList
+    */
+    public List<Long> getSiteIdNotList(){
+        return this.siteIdNotList;
+    }
+
+    /**
+    * 设置 站点ID
+    * @param siteIdNotList
+    */
+    public void setSiteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+    }
+
+
+    /**
+    * 获取 站点名称
+    * @return siteNameList
+    */
+    public List<String> getSiteNameList(){
+        return this.siteNameList;
+    }
+
+    /**
+    * 设置 站点名称
+    * @param siteNameList
+    */
+    public void setSiteNameList(List<String> siteNameList){
+        this.siteNameList = siteNameList;
+    }
+
+    /**
+    * 获取 站点名称
+    * @return siteNameNotList
+    */
+    public List<String> getSiteNameNotList(){
+        return this.siteNameNotList;
+    }
+
+    /**
+    * 设置 站点名称
+    * @param siteNameNotList
+    */
+    public void setSiteNameNotList(List<String> siteNameNotList){
+        this.siteNameNotList = siteNameNotList;
+    }
+
+    /**
+    * 获取 大厅名称
+    * @return hallNameList
+    */
+    public List<String> getHallNameList(){
+        return this.hallNameList;
+    }
+
+    /**
+    * 设置 大厅名称
+    * @param hallNameList
+    */
+    public void setHallNameList(List<String> hallNameList){
+        this.hallNameList = hallNameList;
+    }
+
+    /**
+    * 获取 大厅名称
+    * @return hallNameNotList
+    */
+    public List<String> getHallNameNotList(){
+        return this.hallNameNotList;
+    }
+
+    /**
+    * 设置 大厅名称
+    * @param hallNameNotList
+    */
+    public void setHallNameNotList(List<String> hallNameNotList){
+        this.hallNameNotList = hallNameNotList;
+    }
+
+    /**
+    * 获取 地址
+    * @return addressList
+    */
+    public List<String> getAddressList(){
+        return this.addressList;
+    }
+
+    /**
+    * 设置 地址
+    * @param addressList
+    */
+    public void setAddressList(List<String> addressList){
+        this.addressList = addressList;
+    }
+
+    /**
+    * 获取 地址
+    * @return addressNotList
+    */
+    public List<String> getAddressNotList(){
+        return this.addressNotList;
+    }
+
+    /**
+    * 设置 地址
+    * @param addressNotList
+    */
+    public void setAddressNotList(List<String> addressNotList){
+        this.addressNotList = addressNotList;
+    }
+
+    /**
+    * 获取 开始 楼层
+    * @return floorStart
+    */
+    public Integer getFloorStart(){
+        return this.floorStart;
+    }
+
+    /**
+    * 设置 开始 楼层
+    * @param floorStart
+    */
+    public void setFloorStart(Integer floorStart){
+        this.floorStart = floorStart;
+    }
+
+    /**
+    * 获取 结束 楼层
+    * @return $floorEnd
+    */
+    public Integer getFloorEnd(){
+        return this.floorEnd;
+    }
+
+    /**
+    * 设置 结束 楼层
+    * @param floorEnd
+    */
+    public void setFloorEnd(Integer floorEnd){
+        this.floorEnd = floorEnd;
+    }
+
+    /**
+    * 获取 增加 楼层
+    * @return floorIncrement
+    */
+    public Integer getFloorIncrement(){
+        return this.floorIncrement;
+    }
+
+    /**
+    * 设置 增加 楼层
+    * @param floorIncrement
+    */
+    public void setFloorIncrement(Integer floorIncrement){
+        this.floorIncrement = floorIncrement;
+    }
+
+    /**
+    * 获取 楼层
+    * @return floorList
+    */
+    public List<Integer> getFloorList(){
+        return this.floorList;
+    }
+
+    /**
+    * 设置 楼层
+    * @param floorList
+    */
+    public void setFloorList(List<Integer> floorList){
+        this.floorList = floorList;
+    }
+
+    /**
+    * 获取 楼层
+    * @return floorNotList
+    */
+    public List<Integer> getFloorNotList(){
+        return this.floorNotList;
+    }
+
+    /**
+    * 设置 楼层
+    * @param floorNotList
+    */
+    public void setFloorNotList(List<Integer> floorNotList){
+        this.floorNotList = floorNotList;
+    }
+
+
+    /**
+    * 获取 开始 楼栋
+    * @return buildStart
+    */
+    public Integer getBuildStart(){
+        return this.buildStart;
+    }
+
+    /**
+    * 设置 开始 楼栋
+    * @param buildStart
+    */
+    public void setBuildStart(Integer buildStart){
+        this.buildStart = buildStart;
+    }
+
+    /**
+    * 获取 结束 楼栋
+    * @return $buildEnd
+    */
+    public Integer getBuildEnd(){
+        return this.buildEnd;
+    }
+
+    /**
+    * 设置 结束 楼栋
+    * @param buildEnd
+    */
+    public void setBuildEnd(Integer buildEnd){
+        this.buildEnd = buildEnd;
+    }
+
+    /**
+    * 获取 增加 楼栋
+    * @return buildIncrement
+    */
+    public Integer getBuildIncrement(){
+        return this.buildIncrement;
+    }
+
+    /**
+    * 设置 增加 楼栋
+    * @param buildIncrement
+    */
+    public void setBuildIncrement(Integer buildIncrement){
+        this.buildIncrement = buildIncrement;
+    }
+
+    /**
+    * 获取 楼栋
+    * @return buildList
+    */
+    public List<Integer> getBuildList(){
+        return this.buildList;
+    }
+
+    /**
+    * 设置 楼栋
+    * @param buildList
+    */
+    public void setBuildList(List<Integer> buildList){
+        this.buildList = buildList;
+    }
+
+    /**
+    * 获取 楼栋
+    * @return buildNotList
+    */
+    public List<Integer> getBuildNotList(){
+        return this.buildNotList;
+    }
+
+    /**
+    * 设置 楼栋
+    * @param buildNotList
+    */
+    public void setBuildNotList(List<Integer> buildNotList){
+        this.buildNotList = buildNotList;
+    }
+
+
+    /**
+    * 获取 备注
+    * @return remarkList
+    */
+    public List<String> getRemarkList(){
+        return this.remarkList;
+    }
+
+    /**
+    * 设置 备注
+    * @param remarkList
+    */
+    public void setRemarkList(List<String> remarkList){
+        this.remarkList = remarkList;
+    }
+
+    /**
+    * 获取 备注
+    * @return remarkNotList
+    */
+    public List<String> getRemarkNotList(){
+        return this.remarkNotList;
+    }
+
+    /**
+    * 设置 备注
+    * @param remarkNotList
+    */
+    public void setRemarkNotList(List<String> remarkNotList){
+        this.remarkNotList = remarkNotList;
+    }
+
+    /**
+    * 获取 开始 创建时间
+    * @return createTimeStart
+    */
+    public String getCreateTimeStart(){
+        return this.createTimeStart;
+    }
+
+    /**
+    * 设置 开始 创建时间
+    * @param createTimeStart
+    */
+    public void setCreateTimeStart(String createTimeStart){
+        this.createTimeStart = createTimeStart;
+    }
+
+    /**
+    * 获取 结束 创建时间
+    * @return createTimeEnd
+    */
+    public String getCreateTimeEnd(){
+        return this.createTimeEnd;
+    }
+
+    /**
+    * 设置 结束 创建时间
+    * @param createTimeEnd
+    */
+    public void setCreateTimeEnd(String createTimeEnd){
+        this.createTimeEnd = createTimeEnd;
+    }
+
+    /**
+    * 获取 开始 创建用户
+    * @return createUserIdStart
+    */
+    public Long getCreateUserIdStart(){
+        return this.createUserIdStart;
+    }
+
+    /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public void setCreateUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
+    }
+
+    /**
+    * 获取 结束 创建用户
+    * @return $createUserIdEnd
+    */
+    public Long getCreateUserIdEnd(){
+        return this.createUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public void setCreateUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 创建用户
+    * @return createUserIdIncrement
+    */
+    public Long getCreateUserIdIncrement(){
+        return this.createUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public void setCreateUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
+    }
+
+    /**
+    * 获取 创建用户
+    * @return createUserIdList
+    */
+    public List<Long> getCreateUserIdList(){
+        return this.createUserIdList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public void setCreateUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+    }
+
+    /**
+    * 获取 创建用户
+    * @return createUserIdNotList
+    */
+    public List<Long> getCreateUserIdNotList(){
+        return this.createUserIdNotList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdNotList
+    */
+    public void setCreateUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+    }
+
+
+    /**
+    * 获取 开始 更新用户
+    * @return updateUserIdStart
+    */
+    public Long getUpdateUserIdStart(){
+        return this.updateUserIdStart;
+    }
+
+    /**
+    * 设置 开始 更新用户
+    * @param updateUserIdStart
+    */
+    public void setUpdateUserIdStart(Long updateUserIdStart){
+        this.updateUserIdStart = updateUserIdStart;
+    }
+
+    /**
+    * 获取 结束 更新用户
+    * @return $updateUserIdEnd
+    */
+    public Long getUpdateUserIdEnd(){
+        return this.updateUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 更新用户
+    * @param updateUserIdEnd
+    */
+    public void setUpdateUserIdEnd(Long updateUserIdEnd){
+        this.updateUserIdEnd = updateUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 更新用户
+    * @return updateUserIdIncrement
+    */
+    public Long getUpdateUserIdIncrement(){
+        return this.updateUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 更新用户
+    * @param updateUserIdIncrement
+    */
+    public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
+        this.updateUserIdIncrement = updateUserIdIncrement;
+    }
+
+    /**
+    * 获取 更新用户
+    * @return updateUserIdList
+    */
+    public List<Long> getUpdateUserIdList(){
+        return this.updateUserIdList;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdList
+    */
+    public void setUpdateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+    }
+
+    /**
+    * 获取 更新用户
+    * @return updateUserIdNotList
+    */
+    public List<Long> getUpdateUserIdNotList(){
+        return this.updateUserIdNotList;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdNotList
+    */
+    public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
+    }
+
+
+    /**
+    * 获取 开始 修改时间
+    * @return updateTimeStart
+    */
+    public String getUpdateTimeStart(){
+        return this.updateTimeStart;
+    }
+
+    /**
+    * 设置 开始 修改时间
+    * @param updateTimeStart
+    */
+    public void setUpdateTimeStart(String updateTimeStart){
+        this.updateTimeStart = updateTimeStart;
+    }
+
+    /**
+    * 获取 结束 修改时间
+    * @return updateTimeEnd
+    */
+    public String getUpdateTimeEnd(){
+        return this.updateTimeEnd;
+    }
+
+    /**
+    * 设置 结束 修改时间
+    * @param updateTimeEnd
+    */
+    public void setUpdateTimeEnd(String updateTimeEnd){
+        this.updateTimeEnd = updateTimeEnd;
+    }
+
+    /**
+    * 设置  序号，主键，自增长
+    * @param id
+    */
+    public SiteHallQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 序号，主键，自增长
+    * @param idStart
+    */
+    public SiteHallQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 序号，主键，自增长
+    * @param idEnd
+    */
+    public SiteHallQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 序号，主键，自增长
+    * @param idIncrement
+    */
+    public SiteHallQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idList
+    */
+    public SiteHallQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+        /**
+        * 设置 序号，主键，自增长
+        * @param idNotList
+        */
+        public SiteHallQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+        }
+
+    /**
+    * 设置  站点ID
+    * @param siteId
+    */
+    public SiteHallQuery siteId(Long siteId){
+	    setSiteId(siteId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 站点ID
+    * @param siteIdStart
+    */
+    public SiteHallQuery siteIdStart(Long siteIdStart){
+		this.siteIdStart = siteIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 站点ID
+    * @param siteIdEnd
+    */
+    public SiteHallQuery siteIdEnd(Long siteIdEnd){
+		this.siteIdEnd = siteIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 站点ID
+    * @param siteIdIncrement
+    */
+    public SiteHallQuery siteIdIncrement(Long siteIdIncrement){
+		this.siteIdIncrement = siteIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 站点ID
+    * @param siteIdList
+    */
+    public SiteHallQuery siteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+		return this;
+        }
+
+        /**
+        * 设置 站点ID
+        * @param siteIdNotList
+        */
+        public SiteHallQuery siteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 站点名称
+    * @param siteName
+    */
+    public SiteHallQuery siteName(String siteName){
+        setSiteName(siteName);
+		return this;
+    }
+
+    /**
+    * 设置 站点名称
+    * @param siteNameList
+    */
+    public SiteHallQuery siteNameList(List<String> siteNameList){
+        this.siteNameList = siteNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 大厅名称
+    * @param hallName
+    */
+    public SiteHallQuery hallName(String hallName){
+        setHallName(hallName);
+		return this;
+    }
+
+    /**
+    * 设置 大厅名称
+    * @param hallNameList
+    */
+    public SiteHallQuery hallNameList(List<String> hallNameList){
+        this.hallNameList = hallNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 地址
+    * @param address
+    */
+    public SiteHallQuery address(String address){
+        setAddress(address);
+		return this;
+    }
+
+    /**
+    * 设置 地址
+    * @param addressList
+    */
+    public SiteHallQuery addressList(List<String> addressList){
+        this.addressList = addressList;
+		return this;
+    }
+
+    /**
+    * 设置  楼层
+    * @param floor
+    */
+    public SiteHallQuery floor(Integer floor){
+	    setFloor(floor);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 楼层
+    * @param floorStart
+    */
+    public SiteHallQuery floorStart(Integer floorStart){
+		this.floorStart = floorStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 楼层
+    * @param floorEnd
+    */
+    public SiteHallQuery floorEnd(Integer floorEnd){
+		this.floorEnd = floorEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 楼层
+    * @param floorIncrement
+    */
+    public SiteHallQuery floorIncrement(Integer floorIncrement){
+		this.floorIncrement = floorIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 楼层
+    * @param floorList
+    */
+    public SiteHallQuery floorList(List<Integer> floorList){
+        this.floorList = floorList;
+		return this;
+        }
+
+        /**
+        * 设置 楼层
+        * @param floorNotList
+        */
+        public SiteHallQuery floorNotList(List<Integer> floorNotList){
+        this.floorNotList = floorNotList;
+        return this;
+        }
+
+    /**
+    * 设置  楼栋
+    * @param build
+    */
+    public SiteHallQuery build(Integer build){
+	    setBuild(build);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 楼栋
+    * @param buildStart
+    */
+    public SiteHallQuery buildStart(Integer buildStart){
+		this.buildStart = buildStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 楼栋
+    * @param buildEnd
+    */
+    public SiteHallQuery buildEnd(Integer buildEnd){
+		this.buildEnd = buildEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 楼栋
+    * @param buildIncrement
+    */
+    public SiteHallQuery buildIncrement(Integer buildIncrement){
+		this.buildIncrement = buildIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 楼栋
+    * @param buildList
+    */
+    public SiteHallQuery buildList(List<Integer> buildList){
+        this.buildList = buildList;
+		return this;
+        }
+
+        /**
+        * 设置 楼栋
+        * @param buildNotList
+        */
+        public SiteHallQuery buildNotList(List<Integer> buildNotList){
+        this.buildNotList = buildNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 备注
+    * @param remark
+    */
+    public SiteHallQuery remark(String remark){
+        setRemark(remark);
+		return this;
+    }
+
+    /**
+    * 设置 备注
+    * @param remarkList
+    */
+    public SiteHallQuery remarkList(List<String> remarkList){
+        this.remarkList = remarkList;
+		return this;
+    }
+
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public SiteHallQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public SiteHallQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public SiteHallQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public SiteHallQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public SiteHallQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 创建用户
+        * @param createUserIdNotList
+        */
+        public SiteHallQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        return this;
+        }
+
+    /**
+    * 设置  更新用户
+    * @param updateUserId
+    */
+    public SiteHallQuery updateUserId(Long updateUserId){
+	    setUpdateUserId(updateUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 更新用户
+    * @param updateUserIdStart
+    */
+    public SiteHallQuery updateUserIdStart(Long updateUserIdStart){
+		this.updateUserIdStart = updateUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 更新用户
+    * @param updateUserIdEnd
+    */
+    public SiteHallQuery updateUserIdEnd(Long updateUserIdEnd){
+		this.updateUserIdEnd = updateUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 更新用户
+    * @param updateUserIdIncrement
+    */
+    public SiteHallQuery updateUserIdIncrement(Long updateUserIdIncrement){
+		this.updateUserIdIncrement = updateUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdList
+    */
+    public SiteHallQuery updateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 更新用户
+        * @param updateUserIdNotList
+        */
+        public SiteHallQuery updateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
+        return this;
+        }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<SiteHallQuery> getOrConditionList(){
+    return this.orConditionList;
+    }
+
+    /**
+    * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @param orConditionList
+    */
+    public void setOrConditionList(List<SiteHallQuery> orConditionList){
+        this.orConditionList = orConditionList;
+    }
+
+    /**
+    * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @return andConditionList
+    */
+    public List<SiteHallQuery> getAndConditionList(){
+        return this.andConditionList;
+    }
+
+    /**
+    * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @param andConditionList
+    */
+    public void setAndConditionList(List<SiteHallQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/site/model/vo/SiteHallVo.java

+package com.mortals.xhx.module.site.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.site.model.SiteHallEntity;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+/**
+* 站点大厅信息视图对象
+*
+* @author zxfei
+* @date 2023-04-25
+*/
+@Data
+public class SiteHallVo extends BaseEntityLong {
+
+
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/site/service/SiteHallService.java

+package com.mortals.xhx.module.site.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.site.model.SiteHallEntity;
+import com.mortals.xhx.module.site.dao.SiteHallDao;
+/**
+* SiteHallService
+*
+* 站点大厅信息 service接口
+*
+* @author zxfei
+* @date 2023-04-25
+*/
+public interface SiteHallService extends ICRUDService<SiteHallEntity,Long>{
+
+    SiteHallDao getDao();
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteHallServiceImpl.java

+package com.mortals.xhx.module.site.service.impl;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.site.dao.SiteHallDao;
+import com.mortals.xhx.module.site.model.SiteHallEntity;
+import com.mortals.xhx.module.site.service.SiteHallService;
+/**
+* SiteHallService
+* 站点大厅信息 service实现
+*
+* @author zxfei
+* @date 2023-04-25
+*/
+@Service("siteHallService")
+public class SiteHallServiceImpl extends AbstractCRUDServiceImpl<SiteHallDao, SiteHallEntity, Long> implements SiteHallService {
+    
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteHallController.java

+package com.mortals.xhx.module.site.web;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import com.mortals.framework.model.Context;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.site.model.SiteHallEntity;
+import com.mortals.xhx.module.site.service.SiteHallService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import java.util.Arrays;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+/**
+*
+* 站点大厅信息
+*
+* @author zxfei
+* @date 2023-04-25
+*/
+@RestController
+@RequestMapping("site/hall")
+public class SiteHallController extends BaseCRUDJsonBodyMappingController<SiteHallService,SiteHallEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public SiteHallController(){
+        super.setModuleDesc( "站点大厅信息");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        this.addDict(model, "floor", paramService.getParamBySecondOrganize("SiteHall","floor"));
+        this.addDict(model, "build", paramService.getParamBySecondOrganize("SiteHall","build"));
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/window/dao/WindowHallDao.java

+package com.mortals.xhx.module.window.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.window.model.WindowHallEntity;
+import java.util.List;
+/**
+* 大厅窗口Dao
+* 大厅窗口 DAO接口
+*
+* @author zxfei
+* @date 2023-04-25
+*/
+
+public interface  WindowHallDao extends ICRUDDao<WindowHallEntity,Long>{
+
+
+}

base-manager/src/main/java/com/mortals/xhx/module/window/dao/ibatis/WindowHallDaoImpl.java

+package com.mortals.xhx.module.window.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.window.dao.WindowHallDao;
+import com.mortals.xhx.module.window.model.WindowHallEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 大厅窗口DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2023-04-25
+*/
+@Repository("windowHallDao")
+public class WindowHallDaoImpl extends BaseCRUDDaoMybatis<WindowHallEntity,Long> implements WindowHallDao {
+
+
+
+}

base-manager/src/main/java/com/mortals/xhx/module/window/model/WindowHallEntity.java

+package com.mortals.xhx.module.window.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.window.model.vo.WindowHallVo;
+import lombok.Data;
+/**
+* 大厅窗口实体对象
+*
+* @author zxfei
+* @date 2023-04-25
+*/
+@Data
+public class WindowHallEntity extends WindowHallVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 窗口ID
+    */
+    private Long windowId;
+    /**
+    * 窗口名称
+    */
+    private String windowName;
+    /**
+    * 大厅ID
+    */
+    private Long hallId;
+    /**
+    * 大厅名称
+    */
+    private String hallName;
+    /**
+    * 排序
+    */
+    private Integer sort;
+    /**
+    * 备注
+    */
+    private String remark;
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof WindowHallEntity) {
+            WindowHallEntity tmp = (WindowHallEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+
+            this.windowId = null;
+
+            this.windowName = "";
+
+            this.hallId = null;
+
+            this.hallName = "";
+
+            this.sort = 0;
+
+            this.remark = "";
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/window/model/WindowHallQuery.java

+package com.mortals.xhx.module.window.model;
+
+import java.util.List;
+import com.mortals.xhx.module.window.model.WindowHallEntity;
+/**
+* 大厅窗口查询对象
+*
+* @author zxfei
+* @date 2023-04-25
+*/
+public class WindowHallQuery extends WindowHallEntity {
+    /** 开始 序号，主键，自增长 */
+    private Long idStart;
+
+    /** 结束 序号，主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 序号，主键，自增长 */
+    private Long idIncrement;
+
+    /** 序号，主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 序号，主键，自增长排除列表 */
+    private List <Long> idNotList;
+
+    /** 开始 窗口ID */
+    private Long windowIdStart;
+
+    /** 结束 窗口ID */
+    private Long windowIdEnd;
+
+    /** 增加 窗口ID */
+    private Long windowIdIncrement;
+
+    /** 窗口ID列表 */
+    private List <Long> windowIdList;
+
+    /** 窗口ID排除列表 */
+    private List <Long> windowIdNotList;
+
+    /** 窗口名称 */
+    private List<String> windowNameList;
+
+    /** 窗口名称排除列表 */
+    private List <String> windowNameNotList;
+    /** 开始 大厅ID */
+    private Long hallIdStart;
+
+    /** 结束 大厅ID */
+    private Long hallIdEnd;
+
+    /** 增加 大厅ID */
+    private Long hallIdIncrement;
+
+    /** 大厅ID列表 */
+    private List <Long> hallIdList;
+
+    /** 大厅ID排除列表 */
+    private List <Long> hallIdNotList;
+
+    /** 大厅名称 */
+    private List<String> hallNameList;
+
+    /** 大厅名称排除列表 */
+    private List <String> hallNameNotList;
+    /** 开始 排序 */
+    private Integer sortStart;
+
+    /** 结束 排序 */
+    private Integer sortEnd;
+
+    /** 增加 排序 */
+    private Integer sortIncrement;
+
+    /** 排序列表 */
+    private List <Integer> sortList;
+
+    /** 排序排除列表 */
+    private List <Integer> sortNotList;
+
+    /** 备注 */
+    private List<String> remarkList;
+
+    /** 备注排除列表 */
+    private List <String> remarkNotList;
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
+    /** 创建用户排除列表 */
+    private List <Long> createUserIdNotList;
+
+    /** 开始 修改时间 */
+    private String updateTimeStart;
+
+    /** 结束 修改时间 */
+    private String updateTimeEnd;
+
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<WindowHallQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<WindowHallQuery> andConditionList;
+
+    public WindowHallQuery(){}
+
+    /**
+    * 获取 开始 序号，主键，自增长
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 序号，主键，自增长
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 序号，主键，自增长
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 序号，主键，自增长
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 序号，主键，自增长
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 序号，主键，自增长
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 序号，主键，自增长
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 序号，主键，自增长
+    * @return idNotList
+    */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idNotList
+    */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
+    /**
+    * 获取 开始 窗口ID
+    * @return windowIdStart
+    */
+    public Long getWindowIdStart(){
+        return this.windowIdStart;
+    }
+
+    /**
+    * 设置 开始 窗口ID
+    * @param windowIdStart
+    */
+    public void setWindowIdStart(Long windowIdStart){
+        this.windowIdStart = windowIdStart;
+    }
+
+    /**
+    * 获取 结束 窗口ID
+    * @return $windowIdEnd
+    */
+    public Long getWindowIdEnd(){
+        return this.windowIdEnd;
+    }
+
+    /**
+    * 设置 结束 窗口ID
+    * @param windowIdEnd
+    */
+    public void setWindowIdEnd(Long windowIdEnd){
+        this.windowIdEnd = windowIdEnd;
+    }
+
+    /**
+    * 获取 增加 窗口ID
+    * @return windowIdIncrement
+    */
+    public Long getWindowIdIncrement(){
+        return this.windowIdIncrement;
+    }
+
+    /**
+    * 设置 增加 窗口ID
+    * @param windowIdIncrement
+    */
+    public void setWindowIdIncrement(Long windowIdIncrement){
+        this.windowIdIncrement = windowIdIncrement;
+    }
+
+    /**
+    * 获取 窗口ID
+    * @return windowIdList
+    */
+    public List<Long> getWindowIdList(){
+        return this.windowIdList;
+    }
+
+    /**
+    * 设置 窗口ID
+    * @param windowIdList
+    */
+    public void setWindowIdList(List<Long> windowIdList){
+        this.windowIdList = windowIdList;
+    }
+
+    /**
+    * 获取 窗口ID
+    * @return windowIdNotList
+    */
+    public List<Long> getWindowIdNotList(){
+        return this.windowIdNotList;
+    }
+
+    /**
+    * 设置 窗口ID
+    * @param windowIdNotList
+    */
+    public void setWindowIdNotList(List<Long> windowIdNotList){
+        this.windowIdNotList = windowIdNotList;
+    }
+
+
+    /**
+    * 获取 窗口名称
+    * @return windowNameList
+    */
+    public List<String> getWindowNameList(){
+        return this.windowNameList;
+    }
+
+    /**
+    * 设置 窗口名称
+    * @param windowNameList
+    */
+    public void setWindowNameList(List<String> windowNameList){
+        this.windowNameList = windowNameList;
+    }
+
+    /**
+    * 获取 窗口名称
+    * @return windowNameNotList
+    */
+    public List<String> getWindowNameNotList(){
+        return this.windowNameNotList;
+    }
+
+    /**
+    * 设置 窗口名称
+    * @param windowNameNotList
+    */
+    public void setWindowNameNotList(List<String> windowNameNotList){
+        this.windowNameNotList = windowNameNotList;
+    }
+
+    /**
+    * 获取 开始 大厅ID
+    * @return hallIdStart
+    */
+    public Long getHallIdStart(){
+        return this.hallIdStart;
+    }
+
+    /**
+    * 设置 开始 大厅ID
+    * @param hallIdStart
+    */
+    public void setHallIdStart(Long hallIdStart){
+        this.hallIdStart = hallIdStart;
+    }
+
+    /**
+    * 获取 结束 大厅ID
+    * @return $hallIdEnd
+    */
+    public Long getHallIdEnd(){
+        return this.hallIdEnd;
+    }
+
+    /**
+    * 设置 结束 大厅ID
+    * @param hallIdEnd
+    */
+    public void setHallIdEnd(Long hallIdEnd){
+        this.hallIdEnd = hallIdEnd;
+    }
+
+    /**
+    * 获取 增加 大厅ID
+    * @return hallIdIncrement
+    */
+    public Long getHallIdIncrement(){
+        return this.hallIdIncrement;
+    }
+
+    /**
+    * 设置 增加 大厅ID
+    * @param hallIdIncrement
+    */
+    public void setHallIdIncrement(Long hallIdIncrement){
+        this.hallIdIncrement = hallIdIncrement;
+    }
+
+    /**
+    * 获取 大厅ID
+    * @return hallIdList
+    */
+    public List<Long> getHallIdList(){
+        return this.hallIdList;
+    }
+
+    /**
+    * 设置 大厅ID
+    * @param hallIdList
+    */
+    public void setHallIdList(List<Long> hallIdList){
+        this.hallIdList = hallIdList;
+    }
+
+    /**
+    * 获取 大厅ID
+    * @return hallIdNotList
+    */
+    public List<Long> getHallIdNotList(){
+        return this.hallIdNotList;
+    }
+
+    /**
+    * 设置 大厅ID
+    * @param hallIdNotList
+    */
+    public void setHallIdNotList(List<Long> hallIdNotList){
+        this.hallIdNotList = hallIdNotList;
+    }
+
+
+    /**
+    * 获取 大厅名称
+    * @return hallNameList
+    */
+    public List<String> getHallNameList(){
+        return this.hallNameList;
+    }
+
+    /**
+    * 设置 大厅名称
+    * @param hallNameList
+    */
+    public void setHallNameList(List<String> hallNameList){
+        this.hallNameList = hallNameList;
+    }
+
+    /**
+    * 获取 大厅名称
+    * @return hallNameNotList
+    */
+    public List<String> getHallNameNotList(){
+        return this.hallNameNotList;
+    }
+
+    /**
+    * 设置 大厅名称
+    * @param hallNameNotList
+    */
+    public void setHallNameNotList(List<String> hallNameNotList){
+        this.hallNameNotList = hallNameNotList;
+    }
+
+    /**
+    * 获取 开始 排序
+    * @return sortStart
+    */
+    public Integer getSortStart(){
+        return this.sortStart;
+    }
+
+    /**
+    * 设置 开始 排序
+    * @param sortStart
+    */
+    public void setSortStart(Integer sortStart){
+        this.sortStart = sortStart;
+    }
+
+    /**
+    * 获取 结束 排序
+    * @return $sortEnd
+    */
+    public Integer getSortEnd(){
+        return this.sortEnd;
+    }
+
+    /**
+    * 设置 结束 排序
+    * @param sortEnd
+    */
+    public void setSortEnd(Integer sortEnd){
+        this.sortEnd = sortEnd;
+    }
+
+    /**
+    * 获取 增加 排序
+    * @return sortIncrement
+    */
+    public Integer getSortIncrement(){
+        return this.sortIncrement;
+    }
+
+    /**
+    * 设置 增加 排序
+    * @param sortIncrement
+    */
+    public void setSortIncrement(Integer sortIncrement){
+        this.sortIncrement = sortIncrement;
+    }
+
+    /**
+    * 获取 排序
+    * @return sortList
+    */
+    public List<Integer> getSortList(){
+        return this.sortList;
+    }
+
+    /**
+    * 设置 排序
+    * @param sortList
+    */
+    public void setSortList(List<Integer> sortList){
+        this.sortList = sortList;
+    }
+
+    /**
+    * 获取 排序
+    * @return sortNotList
+    */
+    public List<Integer> getSortNotList(){
+        return this.sortNotList;
+    }
+
+    /**
+    * 设置 排序
+    * @param sortNotList
+    */
+    public void setSortNotList(List<Integer> sortNotList){
+        this.sortNotList = sortNotList;
+    }
+
+
+    /**
+    * 获取 备注
+    * @return remarkList
+    */
+    public List<String> getRemarkList(){
+        return this.remarkList;
+    }
+
+    /**
+    * 设置 备注
+    * @param remarkList
+    */
+    public void setRemarkList(List<String> remarkList){
+        this.remarkList = remarkList;
+    }
+
+    /**
+    * 获取 备注
+    * @return remarkNotList
+    */
+    public List<String> getRemarkNotList(){
+        return this.remarkNotList;
+    }
+
+    /**
+    * 设置 备注
+    * @param remarkNotList
+    */
+    public void setRemarkNotList(List<String> remarkNotList){
+        this.remarkNotList = remarkNotList;
+    }
+
+    /**
+    * 获取 开始 创建时间
+    * @return createTimeStart
+    */
+    public String getCreateTimeStart(){
+        return this.createTimeStart;
+    }
+
+    /**
+    * 设置 开始 创建时间
+    * @param createTimeStart
+    */
+    public void setCreateTimeStart(String createTimeStart){
+        this.createTimeStart = createTimeStart;
+    }
+
+    /**
+    * 获取 结束 创建时间
+    * @return createTimeEnd
+    */
+    public String getCreateTimeEnd(){
+        return this.createTimeEnd;
+    }
+
+    /**
+    * 设置 结束 创建时间
+    * @param createTimeEnd
+    */
+    public void setCreateTimeEnd(String createTimeEnd){
+        this.createTimeEnd = createTimeEnd;
+    }
+
+    /**
+    * 获取 开始 创建用户
+    * @return createUserIdStart
+    */
+    public Long getCreateUserIdStart(){
+        return this.createUserIdStart;
+    }
+
+    /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public void setCreateUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
+    }
+
+    /**
+    * 获取 结束 创建用户
+    * @return $createUserIdEnd
+    */
+    public Long getCreateUserIdEnd(){
+        return this.createUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public void setCreateUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 创建用户
+    * @return createUserIdIncrement
+    */
+    public Long getCreateUserIdIncrement(){
+        return this.createUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public void setCreateUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
+    }
+
+    /**
+    * 获取 创建用户
+    * @return createUserIdList
+    */
+    public List<Long> getCreateUserIdList(){
+        return this.createUserIdList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public void setCreateUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+    }
+
+    /**
+    * 获取 创建用户
+    * @return createUserIdNotList
+    */
+    public List<Long> getCreateUserIdNotList(){
+        return this.createUserIdNotList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdNotList
+    */
+    public void setCreateUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+    }
+
+
+    /**
+    * 获取 开始 修改时间
+    * @return updateTimeStart
+    */
+    public String getUpdateTimeStart(){
+        return this.updateTimeStart;
+    }
+
+    /**
+    * 设置 开始 修改时间
+    * @param updateTimeStart
+    */
+    public void setUpdateTimeStart(String updateTimeStart){
+        this.updateTimeStart = updateTimeStart;
+    }
+
+    /**
+    * 获取 结束 修改时间
+    * @return updateTimeEnd
+    */
+    public String getUpdateTimeEnd(){
+        return this.updateTimeEnd;
+    }
+
+    /**
+    * 设置 结束 修改时间
+    * @param updateTimeEnd
+    */
+    public void setUpdateTimeEnd(String updateTimeEnd){
+        this.updateTimeEnd = updateTimeEnd;
+    }
+
+    /**
+    * 设置  序号，主键，自增长
+    * @param id
+    */
+    public WindowHallQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 序号，主键，自增长
+    * @param idStart
+    */
+    public WindowHallQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 序号，主键，自增长
+    * @param idEnd
+    */
+    public WindowHallQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 序号，主键，自增长
+    * @param idIncrement
+    */
+    public WindowHallQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idList
+    */
+    public WindowHallQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+        /**
+        * 设置 序号，主键，自增长
+        * @param idNotList
+        */
+        public WindowHallQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+        }
+
+    /**
+    * 设置  窗口ID
+    * @param windowId
+    */
+    public WindowHallQuery windowId(Long windowId){
+	    setWindowId(windowId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 窗口ID
+    * @param windowIdStart
+    */
+    public WindowHallQuery windowIdStart(Long windowIdStart){
+		this.windowIdStart = windowIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 窗口ID
+    * @param windowIdEnd
+    */
+    public WindowHallQuery windowIdEnd(Long windowIdEnd){
+		this.windowIdEnd = windowIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 窗口ID
+    * @param windowIdIncrement
+    */
+    public WindowHallQuery windowIdIncrement(Long windowIdIncrement){
+		this.windowIdIncrement = windowIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 窗口ID
+    * @param windowIdList
+    */
+    public WindowHallQuery windowIdList(List<Long> windowIdList){
+        this.windowIdList = windowIdList;
+		return this;
+        }
+
+        /**
+        * 设置 窗口ID
+        * @param windowIdNotList
+        */
+        public WindowHallQuery windowIdNotList(List<Long> windowIdNotList){
+        this.windowIdNotList = windowIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 窗口名称
+    * @param windowName
+    */
+    public WindowHallQuery windowName(String windowName){
+        setWindowName(windowName);
+		return this;
+    }
+
+    /**
+    * 设置 窗口名称
+    * @param windowNameList
+    */
+    public WindowHallQuery windowNameList(List<String> windowNameList){
+        this.windowNameList = windowNameList;
+		return this;
+    }
+
+    /**
+    * 设置  大厅ID
+    * @param hallId
+    */
+    public WindowHallQuery hallId(Long hallId){
+	    setHallId(hallId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 大厅ID
+    * @param hallIdStart
+    */
+    public WindowHallQuery hallIdStart(Long hallIdStart){
+		this.hallIdStart = hallIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 大厅ID
+    * @param hallIdEnd
+    */
+    public WindowHallQuery hallIdEnd(Long hallIdEnd){
+		this.hallIdEnd = hallIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 大厅ID
+    * @param hallIdIncrement
+    */
+    public WindowHallQuery hallIdIncrement(Long hallIdIncrement){
+		this.hallIdIncrement = hallIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 大厅ID
+    * @param hallIdList
+    */
+    public WindowHallQuery hallIdList(List<Long> hallIdList){
+        this.hallIdList = hallIdList;
+		return this;
+        }
+
+        /**
+        * 设置 大厅ID
+        * @param hallIdNotList
+        */
+        public WindowHallQuery hallIdNotList(List<Long> hallIdNotList){
+        this.hallIdNotList = hallIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 大厅名称
+    * @param hallName
+    */
+    public WindowHallQuery hallName(String hallName){
+        setHallName(hallName);
+		return this;
+    }
+
+    /**
+    * 设置 大厅名称
+    * @param hallNameList
+    */
+    public WindowHallQuery hallNameList(List<String> hallNameList){
+        this.hallNameList = hallNameList;
+		return this;
+    }
+
+    /**
+    * 设置  排序
+    * @param sort
+    */
+    public WindowHallQuery sort(Integer sort){
+	    setSort(sort);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 排序
+    * @param sortStart
+    */
+    public WindowHallQuery sortStart(Integer sortStart){
+		this.sortStart = sortStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 排序
+    * @param sortEnd
+    */
+    public WindowHallQuery sortEnd(Integer sortEnd){
+		this.sortEnd = sortEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 排序
+    * @param sortIncrement
+    */
+    public WindowHallQuery sortIncrement(Integer sortIncrement){
+		this.sortIncrement = sortIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 排序
+    * @param sortList
+    */
+    public WindowHallQuery sortList(List<Integer> sortList){
+        this.sortList = sortList;
+		return this;
+        }
+
+        /**
+        * 设置 排序
+        * @param sortNotList
+        */
+        public WindowHallQuery sortNotList(List<Integer> sortNotList){
+        this.sortNotList = sortNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 备注
+    * @param remark
+    */
+    public WindowHallQuery remark(String remark){
+        setRemark(remark);
+		return this;
+    }
+
+    /**
+    * 设置 备注
+    * @param remarkList
+    */
+    public WindowHallQuery remarkList(List<String> remarkList){
+        this.remarkList = remarkList;
+		return this;
+    }
+
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public WindowHallQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public WindowHallQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public WindowHallQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public WindowHallQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public WindowHallQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 创建用户
+        * @param createUserIdNotList
+        */
+        public WindowHallQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        return this;
+        }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<WindowHallQuery> getOrConditionList(){
+    return this.orConditionList;
+    }
+
+    /**
+    * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @param orConditionList
+    */
+    public void setOrConditionList(List<WindowHallQuery> orConditionList){
+        this.orConditionList = orConditionList;
+    }
+
+    /**
+    * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @return andConditionList
+    */
+    public List<WindowHallQuery> getAndConditionList(){
+        return this.andConditionList;
+    }
+
+    /**
+    * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @param andConditionList
+    */
+    public void setAndConditionList(List<WindowHallQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/window/model/vo/WindowHallVo.java

+package com.mortals.xhx.module.window.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.window.model.WindowHallEntity;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+/**
+* 大厅窗口视图对象
+*
+* @author zxfei
+* @date 2023-04-25
+*/
+@Data
+public class WindowHallVo extends BaseEntityLong {
+
+
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/window/service/WindowHallService.java

+package com.mortals.xhx.module.window.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.window.model.WindowHallEntity;
+import com.mortals.xhx.module.window.dao.WindowHallDao;
+/**
+* WindowHallService
+*
+* 大厅窗口 service接口
+*
+* @author zxfei
+* @date 2023-04-25
+*/
+public interface WindowHallService extends ICRUDService<WindowHallEntity,Long>{
+
+    WindowHallDao getDao();
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowHallServiceImpl.java

+package com.mortals.xhx.module.window.service.impl;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.window.dao.WindowHallDao;
+import com.mortals.xhx.module.window.model.WindowHallEntity;
+import com.mortals.xhx.module.window.service.WindowHallService;
+/**
+* WindowHallService
+* 大厅窗口 service实现
+*
+* @author zxfei
+* @date 2023-04-25
+*/
+@Service("windowHallService")
+public class WindowHallServiceImpl extends AbstractCRUDServiceImpl<WindowHallDao, WindowHallEntity, Long> implements WindowHallService {
+    
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/window/web/WindowHallController.java

+package com.mortals.xhx.module.window.web;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import com.mortals.framework.model.Context;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.window.model.WindowHallEntity;
+import com.mortals.xhx.module.window.service.WindowHallService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import java.util.Arrays;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+/**
+*
+* 大厅窗口
+*
+* @author zxfei
+* @date 2023-04-25
+*/
+@RestController
+@RequestMapping("window/hall")
+public class WindowHallController extends BaseCRUDJsonBodyMappingController<WindowHallService,WindowHallEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public WindowHallController(){
+        super.setModuleDesc( "大厅窗口");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

base-manager/src/main/resources/sqlmap/module/site/SiteHallMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.site.dao.ibatis.SiteHallDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="SiteHallEntity" id="SiteHallEntity-Map">
+            <id  property="id" column="id" />
+            <result property="siteId" column="siteId" />
+            <result property="siteName" column="siteName" />
+            <result property="hallName" column="hallName" />
+            <result property="address" column="address" />
+            <result property="floor" column="floor" />
+            <result property="build" column="build" />
+            <result property="remark" column="remark" />
+            <result property="createTime" column="createTime" />
+            <result property="createUserId" column="createUserId" />
+            <result property="updateUserId" column="updateUserId" />
+            <result property="updateTime" column="updateTime" />
+            
+    </resultMap>
+
+
+    <!-- 表所有列 -->
+    <sql id="_columns">
+        <trim suffixOverrides="," suffix="">
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+                    a.id,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
+                    a.siteId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
+                    a.siteName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('hallName') or colPickMode == 1 and data.containsKey('hallName')))">
+                    a.hallName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('address') or colPickMode == 1 and data.containsKey('address')))">
+                    a.address,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('floor') or colPickMode == 1 and data.containsKey('floor')))">
+                    a.floor,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('build') or colPickMode == 1 and data.containsKey('build')))">
+                    a.build,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
+                    a.remark,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                    a.createTime,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+                    a.createUserId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
+                    a.updateUserId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+                    a.updateTime,
+                </if>
+        </trim>
+    </sql>
+    <!-- 新增 区分主键自增加还是业务插入 -->
+    <insert id="insert" parameterType="SiteHallEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_sys_site_hall
+        (siteId,siteName,hallName,address,floor,build,remark,createTime,createUserId,updateUserId,updateTime)
+        VALUES
+        (#{siteId},#{siteName},#{hallName},#{address},#{floor},#{build},#{remark},#{createTime},#{createUserId},#{updateUserId},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_sys_site_hall
+        (siteId,siteName,hallName,address,floor,build,remark,createTime,createUserId,updateUserId,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.siteId},#{item.siteName},#{item.hallName},#{item.address},#{item.floor},#{item.build},#{item.remark},#{item.createTime},#{item.createUserId},#{item.updateUserId},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_sys_site_hall as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
+                a.siteId=#{data.siteId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
+                a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteName')) or (colPickMode==1 and !data.containsKey('siteName'))">
+                a.siteName=#{data.siteName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('hallName')) or (colPickMode==1 and !data.containsKey('hallName'))">
+                a.hallName=#{data.hallName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('address')) or (colPickMode==1 and !data.containsKey('address'))">
+                a.address=#{data.address},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('floor')) or (colPickMode==1 and !data.containsKey('floor'))">
+                a.floor=#{data.floor},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('floorIncrement')) or (colPickMode==1 and !data.containsKey('floorIncrement'))">
+                a.floor=ifnull(a.floor,0) + #{data.floorIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('build')) or (colPickMode==1 and !data.containsKey('build'))">
+                a.build=#{data.build},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('buildIncrement')) or (colPickMode==1 and !data.containsKey('buildIncrement'))">
+                a.build=ifnull(a.build,0) + #{data.buildIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
+                a.remark=#{data.remark},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+                a.createTime=#{data.createTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
+                a.createUserId=#{data.createUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
+                a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))">
+                a.updateUserId=#{data.updateUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
+                a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
+                a.updateTime=#{data.updateTime},
+            </if>
+        </trim>
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </update>
+    <!-- 批量更新 -->
+    <update id="updateBatch" parameterType="paramDto">
+        update mortals_sys_site_hall as a
+        <trim prefix="set" suffixOverrides=",">
+                        <trim prefix="siteId=(case" suffix="ELSE siteId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
+                                        when a.id=#{item.id} then #{item.siteId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="siteName=(case" suffix="ELSE siteName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('siteName')) or (colPickMode==1 and !item.containsKey('siteName'))">
+                            when a.id=#{item.id} then #{item.siteName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="hallName=(case" suffix="ELSE hallName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('hallName')) or (colPickMode==1 and !item.containsKey('hallName'))">
+                            when a.id=#{item.id} then #{item.hallName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="address=(case" suffix="ELSE address end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('address')) or (colPickMode==1 and !item.containsKey('address'))">
+                            when a.id=#{item.id} then #{item.address}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="floor=(case" suffix="ELSE floor end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('floor')) or (colPickMode==1 and !item.containsKey('floor'))">
+                                        when a.id=#{item.id} then #{item.floor}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('floorIncrement')) or (colPickMode==1 and !item.containsKey('floorIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.floor,0) + #{item.floorIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                        <trim prefix="build=(case" suffix="ELSE build end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('build')) or (colPickMode==1 and !item.containsKey('build'))">
+                                        when a.id=#{item.id} then #{item.build}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('buildIncrement')) or (colPickMode==1 and !item.containsKey('buildIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.build,0) + #{item.buildIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="remark=(case" suffix="ELSE remark end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
+                            when a.id=#{item.id} then #{item.remark}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+                            when a.id=#{item.id} then #{item.createTime}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+                                        when a.id=#{item.id} then #{item.createUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                        <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
+                                        when a.id=#{item.id} then #{item.updateUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+                            when a.id=#{item.id} then #{item.updateTime}
+                        </if>
+                    </foreach>
+                </trim>
+        </trim>
+        where id in
+        <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </update>
+    <!-- 根据主健查询 -->
+    <select id="getByKey" parameterType="paramDto" resultMap="SiteHallEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_site_hall as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_sys_site_hall as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_sys_site_hall where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据主健列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeyList">
+        delete from mortals_sys_site_hall where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <!-- 根据对象列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByEntityList">
+        delete from mortals_sys_site_hall where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_sys_site_hall as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="SiteHallEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_site_hall as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+        <include refid="_orderCols_"/>
+    </select>
+
+
+
+    <!-- 获取 -->
+    <select id="getListCount" parameterType="paramDto" resultType="int">
+        select count(1)
+        from mortals_sys_site_hall as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </select>
+    <!-- 条件映射 -->
+    <sql id="_condition_">
+        <if test="condition != null and !condition.isEmpty()">
+            <!-- 条件映射-普通条件 -->
+            <include refid="_condition_param_">
+                <property name="_conditionParam_" value="condition"/>
+                <property name="_conditionType_" value="and"/>
+            </include>
+            <!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
+            <if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
+                and
+                <foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
+                    <trim prefixOverrides="or" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="andCondition"/>
+                            <property name="_conditionType_" value="or"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+            <!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
+            <if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
+                and
+                <foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
+                    <trim prefixOverrides="and" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="orCondition"/>
+                            <property name="_conditionType_" value="and"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+        </if>
+    </sql>
+    <!-- 条件映射-代参数 -->
+    <sql id="_condition_param_">
+        <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null">
+                ${_conditionType_} a.id=#{${_conditionParam_}.id}
+            </if>
+        </if>
+            <if test="conditionParamRef.containsKey('id')">
+                <if test="conditionParamRef.id != null ">
+                    ${_conditionType_} a.id = #{${_conditionParam_}.id}
+                </if>
+                <if test="conditionParamRef.id == null">
+                    ${_conditionType_} a.id is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
+                ${_conditionType_} a.id not in
+                <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+                ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+            </if>
+            <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+                ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('siteId')">
+                <if test="conditionParamRef.siteId != null ">
+                    ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
+                </if>
+                <if test="conditionParamRef.siteId == null">
+                    ${_conditionType_} a.siteId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+                ${_conditionType_} a.siteId in
+                <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
+                ${_conditionType_} a.siteId not in
+                <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
+                ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
+                ${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('siteName')">
+                <if test="conditionParamRef.siteName != null and conditionParamRef.siteName != ''">
+                    ${_conditionType_} a.siteName like #{${_conditionParam_}.siteName}
+                </if>
+                <if test="conditionParamRef.siteName == null">
+                    ${_conditionType_} a.siteName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
+                ${_conditionType_} a.siteName in
+                <foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('siteNameNotList') and conditionParamRef.siteNameNotList.size() > 0">
+                ${_conditionType_} a.siteName not in
+                <foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('hallName')">
+                <if test="conditionParamRef.hallName != null and conditionParamRef.hallName != ''">
+                    ${_conditionType_} a.hallName like #{${_conditionParam_}.hallName}
+                </if>
+                <if test="conditionParamRef.hallName == null">
+                    ${_conditionType_} a.hallName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('hallNameList') and conditionParamRef.hallNameList.size() > 0">
+                ${_conditionType_} a.hallName in
+                <foreach collection="conditionParamRef.hallNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('hallNameNotList') and conditionParamRef.hallNameNotList.size() > 0">
+                ${_conditionType_} a.hallName not in
+                <foreach collection="conditionParamRef.hallNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('address')">
+                <if test="conditionParamRef.address != null and conditionParamRef.address != ''">
+                    ${_conditionType_} a.address like #{${_conditionParam_}.address}
+                </if>
+                <if test="conditionParamRef.address == null">
+                    ${_conditionType_} a.address is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('addressList') and conditionParamRef.addressList.size() > 0">
+                ${_conditionType_} a.address in
+                <foreach collection="conditionParamRef.addressList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('addressNotList') and conditionParamRef.addressNotList.size() > 0">
+                ${_conditionType_} a.address not in
+                <foreach collection="conditionParamRef.addressNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('floor')">
+                <if test="conditionParamRef.floor != null ">
+                    ${_conditionType_} a.floor = #{${_conditionParam_}.floor}
+                </if>
+                <if test="conditionParamRef.floor == null">
+                    ${_conditionType_} a.floor is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('floorList') and conditionParamRef.floorList.size() > 0">
+                ${_conditionType_} a.floor in
+                <foreach collection="conditionParamRef.floorList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('floorNotList') and conditionParamRef.floorNotList.size() > 0">
+                ${_conditionType_} a.floor not in
+                <foreach collection="conditionParamRef.floorNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('floorStart') and conditionParamRef.floorStart != null">
+                ${_conditionType_} a.floor <![CDATA[ >= ]]> #{${_conditionParam_}.floorStart}
+            </if>
+            <if test="conditionParamRef.containsKey('floorEnd') and conditionParamRef.floorEnd != null">
+                ${_conditionType_} a.floor <![CDATA[ <= ]]> #{${_conditionParam_}.floorEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('build')">
+                <if test="conditionParamRef.build != null ">
+                    ${_conditionType_} a.build = #{${_conditionParam_}.build}
+                </if>
+                <if test="conditionParamRef.build == null">
+                    ${_conditionType_} a.build is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('buildList') and conditionParamRef.buildList.size() > 0">
+                ${_conditionType_} a.build in
+                <foreach collection="conditionParamRef.buildList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('buildNotList') and conditionParamRef.buildNotList.size() > 0">
+                ${_conditionType_} a.build not in
+                <foreach collection="conditionParamRef.buildNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('buildStart') and conditionParamRef.buildStart != null">
+                ${_conditionType_} a.build <![CDATA[ >= ]]> #{${_conditionParam_}.buildStart}
+            </if>
+            <if test="conditionParamRef.containsKey('buildEnd') and conditionParamRef.buildEnd != null">
+                ${_conditionType_} a.build <![CDATA[ <= ]]> #{${_conditionParam_}.buildEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('remark')">
+                <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
+                    ${_conditionType_} a.remark like #{${_conditionParam_}.remark}
+                </if>
+                <if test="conditionParamRef.remark == null">
+                    ${_conditionType_} a.remark is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
+                ${_conditionType_} a.remark in
+                <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
+                ${_conditionType_} a.remark not in
+                <foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('createTime')">
+                <if test="conditionParamRef.createTime != null ">
+                    ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
+                </if>
+                <if test="conditionParamRef.createTime == null">
+                    ${_conditionType_} a.createTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+                ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+                ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createUserId')">
+                <if test="conditionParamRef.createUserId != null ">
+                    ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
+                </if>
+                <if test="conditionParamRef.createUserId == null">
+                    ${_conditionType_} a.createUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                ${_conditionType_} a.createUserId in
+                <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
+                ${_conditionType_} a.createUserId not in
+                <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
+                ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+                ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('updateUserId')">
+                <if test="conditionParamRef.updateUserId != null ">
+                    ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
+                </if>
+                <if test="conditionParamRef.updateUserId == null">
+                    ${_conditionType_} a.updateUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
+                ${_conditionType_} a.updateUserId in
+                <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
+                ${_conditionType_} a.updateUserId not in
+                <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('updateTime')">
+                <if test="conditionParamRef.updateTime != null ">
+                    ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
+                </if>
+                <if test="conditionParamRef.updateTime == null">
+                    ${_conditionType_} a.updateTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+    </sql>
+    <sql id="_orderCols_">
+        <if test="orderColList != null and !orderColList.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                     ${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                    <if test="orderCol.containsKey('id')">
+                        a.id
+                        <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('siteId')">
+                        a.siteId
+                        <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('siteName')">
+                        a.siteName
+                        <if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('hallName')">
+                        a.hallName
+                        <if test='orderCol.hallName != null and "DESC".equalsIgnoreCase(orderCol.hallName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('address')">
+                        a.address
+                        <if test='orderCol.address != null and "DESC".equalsIgnoreCase(orderCol.address)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('floor')">
+                        a.floor
+                        <if test='orderCol.floor != null and "DESC".equalsIgnoreCase(orderCol.floor)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('build')">
+                        a.build
+                        <if test='orderCol.build != null and "DESC".equalsIgnoreCase(orderCol.build)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('remark')">
+                        a.remark
+                        <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createTime')">
+                        a.createTime
+                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createUserId')">
+                        a.createUserId
+                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateUserId')">
+                        a.updateUserId
+                        <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateTime')">
+                        a.updateTime
+                        <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+                        ,
+                    </if>
+            </trim>
+        </if>
+    </sql>
+    <sql id="_group_by_">
+        <if test="groupList != null and !groupList.isEmpty()">
+            GROUP BY
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
+                    ${item}
+                </foreach>
+            </trim>
+        </if>
+    </sql>
+</mapper>
\ No newline at end of file

base-manager/src/main/resources/sqlmap/module/window/WindowHallMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.window.dao.ibatis.WindowHallDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="WindowHallEntity" id="WindowHallEntity-Map">
+            <id  property="id" column="id" />
+            <result property="windowId" column="windowId" />
+            <result property="windowName" column="windowName" />
+            <result property="hallId" column="hallId" />
+            <result property="hallName" column="hallName" />
+            <result property="sort" column="sort" />
+            <result property="remark" column="remark" />
+            <result property="createTime" column="createTime" />
+            <result property="createUserId" column="createUserId" />
+            <result property="updateTime" column="updateTime" />
+            
+    </resultMap>
+
+
+    <!-- 表所有列 -->
+    <sql id="_columns">
+        <trim suffixOverrides="," suffix="">
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+                    a.id,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('windowId') or colPickMode == 1 and data.containsKey('windowId')))">
+                    a.windowId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('windowName') or colPickMode == 1 and data.containsKey('windowName')))">
+                    a.windowName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('hallId') or colPickMode == 1 and data.containsKey('hallId')))">
+                    a.hallId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('hallName') or colPickMode == 1 and data.containsKey('hallName')))">
+                    a.hallName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sort') or colPickMode == 1 and data.containsKey('sort')))">
+                    a.sort,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
+                    a.remark,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                    a.createTime,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+                    a.createUserId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+                    a.updateTime,
+                </if>
+        </trim>
+    </sql>
+    <!-- 新增 区分主键自增加还是业务插入 -->
+    <insert id="insert" parameterType="WindowHallEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_sys_window_hall
+        (windowId,windowName,hallId,hallName,sort,remark,createTime,createUserId,updateTime)
+        VALUES
+        (#{windowId},#{windowName},#{hallId},#{hallName},#{sort},#{remark},#{createTime},#{createUserId},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_sys_window_hall
+        (windowId,windowName,hallId,hallName,sort,remark,createTime,createUserId,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.windowId},#{item.windowName},#{item.hallId},#{item.hallName},#{item.sort},#{item.remark},#{item.createTime},#{item.createUserId},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_sys_window_hall as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('windowId')) or (colPickMode==1 and !data.containsKey('windowId'))">
+                a.windowId=#{data.windowId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('windowIdIncrement')) or (colPickMode==1 and !data.containsKey('windowIdIncrement'))">
+                a.windowId=ifnull(a.windowId,0) + #{data.windowIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('windowName')) or (colPickMode==1 and !data.containsKey('windowName'))">
+                a.windowName=#{data.windowName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('hallId')) or (colPickMode==1 and !data.containsKey('hallId'))">
+                a.hallId=#{data.hallId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('hallIdIncrement')) or (colPickMode==1 and !data.containsKey('hallIdIncrement'))">
+                a.hallId=ifnull(a.hallId,0) + #{data.hallIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('hallName')) or (colPickMode==1 and !data.containsKey('hallName'))">
+                a.hallName=#{data.hallName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('sort')) or (colPickMode==1 and !data.containsKey('sort'))">
+                a.sort=#{data.sort},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('sortIncrement')) or (colPickMode==1 and !data.containsKey('sortIncrement'))">
+                a.sort=ifnull(a.sort,0) + #{data.sortIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
+                a.remark=#{data.remark},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+                a.createTime=#{data.createTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
+                a.createUserId=#{data.createUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
+                a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
+                a.updateTime=#{data.updateTime},
+            </if>
+        </trim>
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </update>
+    <!-- 批量更新 -->
+    <update id="updateBatch" parameterType="paramDto">
+        update mortals_sys_window_hall as a
+        <trim prefix="set" suffixOverrides=",">
+                        <trim prefix="windowId=(case" suffix="ELSE windowId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('windowId')) or (colPickMode==1 and !item.containsKey('windowId'))">
+                                        when a.id=#{item.id} then #{item.windowId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('windowIdIncrement')) or (colPickMode==1 and !item.containsKey('windowIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.windowId,0) + #{item.windowIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="windowName=(case" suffix="ELSE windowName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('windowName')) or (colPickMode==1 and !item.containsKey('windowName'))">
+                            when a.id=#{item.id} then #{item.windowName}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="hallId=(case" suffix="ELSE hallId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('hallId')) or (colPickMode==1 and !item.containsKey('hallId'))">
+                                        when a.id=#{item.id} then #{item.hallId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('hallIdIncrement')) or (colPickMode==1 and !item.containsKey('hallIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.hallId,0) + #{item.hallIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="hallName=(case" suffix="ELSE hallName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('hallName')) or (colPickMode==1 and !item.containsKey('hallName'))">
+                            when a.id=#{item.id} then #{item.hallName}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="sort=(case" suffix="ELSE sort end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('sort')) or (colPickMode==1 and !item.containsKey('sort'))">
+                                        when a.id=#{item.id} then #{item.sort}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('sortIncrement')) or (colPickMode==1 and !item.containsKey('sortIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.sort,0) + #{item.sortIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="remark=(case" suffix="ELSE remark end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
+                            when a.id=#{item.id} then #{item.remark}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+                            when a.id=#{item.id} then #{item.createTime}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+                                        when a.id=#{item.id} then #{item.createUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+                            when a.id=#{item.id} then #{item.updateTime}
+                        </if>
+                    </foreach>
+                </trim>
+        </trim>
+        where id in
+        <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </update>
+    <!-- 根据主健查询 -->
+    <select id="getByKey" parameterType="paramDto" resultMap="WindowHallEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_window_hall as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_sys_window_hall as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_sys_window_hall where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据主健列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeyList">
+        delete from mortals_sys_window_hall where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <!-- 根据对象列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByEntityList">
+        delete from mortals_sys_window_hall where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_sys_window_hall as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="WindowHallEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_window_hall as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+        <include refid="_orderCols_"/>
+    </select>
+
+
+
+    <!-- 获取 -->
+    <select id="getListCount" parameterType="paramDto" resultType="int">
+        select count(1)
+        from mortals_sys_window_hall as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </select>
+    <!-- 条件映射 -->
+    <sql id="_condition_">
+        <if test="condition != null and !condition.isEmpty()">
+            <!-- 条件映射-普通条件 -->
+            <include refid="_condition_param_">
+                <property name="_conditionParam_" value="condition"/>
+                <property name="_conditionType_" value="and"/>
+            </include>
+            <!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
+            <if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
+                and
+                <foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
+                    <trim prefixOverrides="or" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="andCondition"/>
+                            <property name="_conditionType_" value="or"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+            <!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
+            <if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
+                and
+                <foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
+                    <trim prefixOverrides="and" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="orCondition"/>
+                            <property name="_conditionType_" value="and"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+        </if>
+    </sql>
+    <!-- 条件映射-代参数 -->
+    <sql id="_condition_param_">
+        <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null">
+                ${_conditionType_} a.id=#{${_conditionParam_}.id}
+            </if>
+        </if>
+            <if test="conditionParamRef.containsKey('id')">
+                <if test="conditionParamRef.id != null ">
+                    ${_conditionType_} a.id = #{${_conditionParam_}.id}
+                </if>
+                <if test="conditionParamRef.id == null">
+                    ${_conditionType_} a.id is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
+                ${_conditionType_} a.id not in
+                <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+                ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+            </if>
+            <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+                ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('windowId')">
+                <if test="conditionParamRef.windowId != null ">
+                    ${_conditionType_} a.windowId = #{${_conditionParam_}.windowId}
+                </if>
+                <if test="conditionParamRef.windowId == null">
+                    ${_conditionType_} a.windowId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('windowIdList') and conditionParamRef.windowIdList.size() > 0">
+                ${_conditionType_} a.windowId in
+                <foreach collection="conditionParamRef.windowIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('windowIdNotList') and conditionParamRef.windowIdNotList.size() > 0">
+                ${_conditionType_} a.windowId not in
+                <foreach collection="conditionParamRef.windowIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('windowIdStart') and conditionParamRef.windowIdStart != null">
+                ${_conditionType_} a.windowId <![CDATA[ >= ]]> #{${_conditionParam_}.windowIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('windowIdEnd') and conditionParamRef.windowIdEnd != null">
+                ${_conditionType_} a.windowId <![CDATA[ <= ]]> #{${_conditionParam_}.windowIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('windowName')">
+                <if test="conditionParamRef.windowName != null and conditionParamRef.windowName != ''">
+                    ${_conditionType_} a.windowName like #{${_conditionParam_}.windowName}
+                </if>
+                <if test="conditionParamRef.windowName == null">
+                    ${_conditionType_} a.windowName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('windowNameList') and conditionParamRef.windowNameList.size() > 0">
+                ${_conditionType_} a.windowName in
+                <foreach collection="conditionParamRef.windowNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('windowNameNotList') and conditionParamRef.windowNameNotList.size() > 0">
+                ${_conditionType_} a.windowName not in
+                <foreach collection="conditionParamRef.windowNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('hallId')">
+                <if test="conditionParamRef.hallId != null ">
+                    ${_conditionType_} a.hallId = #{${_conditionParam_}.hallId}
+                </if>
+                <if test="conditionParamRef.hallId == null">
+                    ${_conditionType_} a.hallId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('hallIdList') and conditionParamRef.hallIdList.size() > 0">
+                ${_conditionType_} a.hallId in
+                <foreach collection="conditionParamRef.hallIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('hallIdNotList') and conditionParamRef.hallIdNotList.size() > 0">
+                ${_conditionType_} a.hallId not in
+                <foreach collection="conditionParamRef.hallIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('hallIdStart') and conditionParamRef.hallIdStart != null">
+                ${_conditionType_} a.hallId <![CDATA[ >= ]]> #{${_conditionParam_}.hallIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('hallIdEnd') and conditionParamRef.hallIdEnd != null">
+                ${_conditionType_} a.hallId <![CDATA[ <= ]]> #{${_conditionParam_}.hallIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('hallName')">
+                <if test="conditionParamRef.hallName != null and conditionParamRef.hallName != ''">
+                    ${_conditionType_} a.hallName like #{${_conditionParam_}.hallName}
+                </if>
+                <if test="conditionParamRef.hallName == null">
+                    ${_conditionType_} a.hallName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('hallNameList') and conditionParamRef.hallNameList.size() > 0">
+                ${_conditionType_} a.hallName in
+                <foreach collection="conditionParamRef.hallNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('hallNameNotList') and conditionParamRef.hallNameNotList.size() > 0">
+                ${_conditionType_} a.hallName not in
+                <foreach collection="conditionParamRef.hallNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('sort')">
+                <if test="conditionParamRef.sort != null ">
+                    ${_conditionType_} a.sort = #{${_conditionParam_}.sort}
+                </if>
+                <if test="conditionParamRef.sort == null">
+                    ${_conditionType_} a.sort is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('sortList') and conditionParamRef.sortList.size() > 0">
+                ${_conditionType_} a.sort in
+                <foreach collection="conditionParamRef.sortList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('sortNotList') and conditionParamRef.sortNotList.size() > 0">
+                ${_conditionType_} a.sort not in
+                <foreach collection="conditionParamRef.sortNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('sortStart') and conditionParamRef.sortStart != null">
+                ${_conditionType_} a.sort <![CDATA[ >= ]]> #{${_conditionParam_}.sortStart}
+            </if>
+            <if test="conditionParamRef.containsKey('sortEnd') and conditionParamRef.sortEnd != null">
+                ${_conditionType_} a.sort <![CDATA[ <= ]]> #{${_conditionParam_}.sortEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('remark')">
+                <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
+                    ${_conditionType_} a.remark like #{${_conditionParam_}.remark}
+                </if>
+                <if test="conditionParamRef.remark == null">
+                    ${_conditionType_} a.remark is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
+                ${_conditionType_} a.remark in
+                <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
+                ${_conditionType_} a.remark not in
+                <foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('createTime')">
+                <if test="conditionParamRef.createTime != null ">
+                    ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
+                </if>
+                <if test="conditionParamRef.createTime == null">
+                    ${_conditionType_} a.createTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+                ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+                ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createUserId')">
+                <if test="conditionParamRef.createUserId != null ">
+                    ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
+                </if>
+                <if test="conditionParamRef.createUserId == null">
+                    ${_conditionType_} a.createUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                ${_conditionType_} a.createUserId in
+                <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
+                ${_conditionType_} a.createUserId not in
+                <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
+                ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+                ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('updateTime')">
+                <if test="conditionParamRef.updateTime != null ">
+                    ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
+                </if>
+                <if test="conditionParamRef.updateTime == null">
+                    ${_conditionType_} a.updateTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+    </sql>
+    <sql id="_orderCols_">
+        <if test="orderColList != null and !orderColList.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                     ${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                    <if test="orderCol.containsKey('id')">
+                        a.id
+                        <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('windowId')">
+                        a.windowId
+                        <if test='orderCol.windowId != null and "DESC".equalsIgnoreCase(orderCol.windowId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('windowName')">
+                        a.windowName
+                        <if test='orderCol.windowName != null and "DESC".equalsIgnoreCase(orderCol.windowName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('hallId')">
+                        a.hallId
+                        <if test='orderCol.hallId != null and "DESC".equalsIgnoreCase(orderCol.hallId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('hallName')">
+                        a.hallName
+                        <if test='orderCol.hallName != null and "DESC".equalsIgnoreCase(orderCol.hallName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('sort')">
+                        a.sort
+                        <if test='orderCol.sort != null and "DESC".equalsIgnoreCase(orderCol.sort)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('remark')">
+                        a.remark
+                        <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createTime')">
+                        a.createTime
+                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createUserId')">
+                        a.createUserId
+                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateTime')">
+                        a.updateTime
+                        <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+                        ,
+                    </if>
+            </trim>
+        </if>
+    </sql>
+    <sql id="_group_by_">
+        <if test="groupList != null and !groupList.isEmpty()">
+            GROUP BY
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
+                    ${item}
+                </foreach>
+            </trim>
+        </if>
+    </sql>
+</mapper>
\ No newline at end of file

base-manager/src/test/java/com/mortals/httpclient/site/SiteHallController.http

+###登录
+POST {{baseUrl}}/login/login
+Content-Type: application/json
+
+{
+"loginName":"admin",
+"password":"admin",
+"securityCode":"8888"
+}
+
+> {%
+client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
+client.global.set("authToken", JSON.parse(response.body).data.token);
+%}
+
+###站点大厅信息列表
+POST {{baseUrl}}/site/hall/list
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+    "page":1,
+    "size":10
+}
+
+
+###站点大厅信息更新与保存
+POST {{baseUrl}}/site/hall/save
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+        "siteId":759,
+        "siteName":"7r1bxj",
+        "hallName":"in9nu5",
+        "address":"48k2vz",
+        "floor":1,
+        "build":1,
+        "remark":"jzy16b",
+}
+
+> {%
+client.global.set("SiteHall_id", JSON.parse(response.body).data.id);
+%}
+
+###站点大厅信息查看
+GET {{baseUrl}}/site/hall/info?id={{SiteHall_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+###站点大厅信息编辑
+GET {{baseUrl}}/site/hall/edit?id={{SiteHall_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+###站点大厅信息删除
+GET {{baseUrl}}/site/hall/delete?id={{SiteHall_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+
+

base-manager/src/test/java/com/mortals/httpclient/window/WindowHallController.http

+###登录
+POST {{baseUrl}}/login/login
+Content-Type: application/json
+
+{
+"loginName":"admin",
+"password":"admin",
+"securityCode":"8888"
+}
+
+> {%
+client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
+client.global.set("authToken", JSON.parse(response.body).data.token);
+%}
+
+###大厅窗口列表
+POST {{baseUrl}}/window/hall/list
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+    "page":1,
+    "size":10
+}
+
+
+###大厅窗口更新与保存
+POST {{baseUrl}}/window/hall/save
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+        "windowId":103,
+        "windowName":"0af77v",
+        "hallId":762,
+        "hallName":"nj1uyz",
+        "sort":0,
+        "remark":"f0ek6j",
+}
+
+> {%
+client.global.set("WindowHall_id", JSON.parse(response.body).data.id);
+%}
+
+###大厅窗口查看
+GET {{baseUrl}}/window/hall/info?id={{WindowHall_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+###大厅窗口编辑
+GET {{baseUrl}}/window/hall/edit?id={{WindowHall_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+###大厅窗口删除
+GET {{baseUrl}}/window/hall/delete?id={{WindowHall_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+
+