添加大厅入住事项

base-manager/db/add.sql

@@ -236,3 +236,9 @@ ALTER TABLE mortals_sys_site_matter ADD COLUMN   `agentPost` varchar(64)      CO
 UPDATE mortals_sys_skin_base SET imageResolution="1920x1080" WHERE imageResolution="1";
 UPDATE mortals_sys_skin_base SET imageResolution="1080x1920" WHERE imageResolution="2";
 UPDATE mortals_sys_skin_base SET imageResolution="1280x1280" WHERE imageResolution="3";
+
+
+-- ----------------------------
+2024-03-08
+-- ----------------------------
+ALTER TABLE mortals_sys_site_matter ADD COLUMN   `hallCheckIn` tinyint(2)    DEFAULT '0'  COMMENT '大厅事项入驻(0.否,1.是)'  AFTER agentPost;

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

@@ -13,7 +13,7 @@ import lombok.Data;
  * 站点事项实体对象
  *
  * @author zxfei
- * @date 2024-01-04
+ * @date 2024-03-09
  */
 @Data
 public class SiteMatterEntity extends SiteMatterVo {
@@ -35,6 +35,10 @@ public class SiteMatterEntity extends SiteMatterVo {
      * 事项名称
      */
     private String matterName;
+    /**
+     * 事项编码
+     */
+    private String matterCode;
     /**
      * 部门ID
      */
@@ -43,10 +47,6 @@ public class SiteMatterEntity extends SiteMatterVo {
      * 部门名称
      */
     private String deptName;
-    /**
-     * 事项编码
-     */
-    private String matterCode;
     /**
      * 事项类型
      */
@@ -83,6 +83,10 @@ public class SiteMatterEntity extends SiteMatterVo {
      * 职务
      */
     private String agentPost;
+    /**
+     * 大厅事项入驻(0.否,1.是)
+     */
+    private Integer hallCheckIn;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -104,9 +108,9 @@ public class SiteMatterEntity extends SiteMatterVo {
         this.siteName = "";
         this.matterId = null;
         this.matterName = "";
+        this.matterCode = "";
         this.deptId = null;
         this.deptName = "";
-        this.matterCode = "";
         this.eventTypeShow = "";
         this.source = 0;
         this.hot = 0;
@@ -116,5 +120,6 @@ public class SiteMatterEntity extends SiteMatterVo {
         this.agentName = "";
         this.agentPhone = "";
         this.agentPost = "";
+        this.hallCheckIn = 0;
     }
 }
\ No newline at end of file

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

@@ -6,7 +6,7 @@ import com.mortals.xhx.module.site.model.SiteMatterEntity;
  * 站点事项查询对象
  *
  * @author zxfei
- * @date 2024-01-04
+ * @date 2024-03-09
  */
 public class SiteMatterQuery extends SiteMatterEntity {
     /** 开始 序号，主键，自增长 */
@@ -64,33 +64,11 @@ public class SiteMatterQuery extends SiteMatterEntity {
 
     /** 事项名称排除列表 */
     private List <String> matterNameNotList;
-    /** 开始 创建时间 */
-    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;
+    /** 事项编码 */
+    private List<String> matterCodeList;
 
+    /** 事项编码排除列表 */
+    private List <String> matterCodeNotList;
     /** 开始 部门ID */
     private Long deptIdStart;
 
@@ -111,11 +89,6 @@ public class SiteMatterQuery extends SiteMatterEntity {
 
     /** 部门名称排除列表 */
     private List <String> deptNameNotList;
-    /** 事项编码 */
-    private List<String> matterCodeList;
-
-    /** 事项编码排除列表 */
-    private List <String> matterCodeNotList;
     /** 事项类型 */
     private List<String> eventTypeShowList;
 
@@ -201,6 +174,48 @@ public class SiteMatterQuery extends SiteMatterEntity {
 
     /** 职务排除列表 */
     private List <String> agentPostNotList;
+    /** 开始 大厅事项入驻(0.否,1.是) */
+    private Integer hallCheckInStart;
+
+    /** 结束 大厅事项入驻(0.否,1.是) */
+    private Integer hallCheckInEnd;
+
+    /** 增加 大厅事项入驻(0.否,1.是) */
+    private Integer hallCheckInIncrement;
+
+    /** 大厅事项入驻(0.否,1.是)列表 */
+    private List <Integer> hallCheckInList;
+
+    /** 大厅事项入驻(0.否,1.是)排除列表 */
+    private List <Integer> hallCheckInNotList;
+
+    /** 开始 创建时间 */
+    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<SiteMatterQuery> orConditionList;
 
@@ -517,148 +532,35 @@ public class SiteMatterQuery extends SiteMatterEntity {
     }
 
     /**
-     * 获取 开始 创建时间
-     * @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
+     * 获取 事项编码
+     * @return matterCodeList
      */
-    public String getUpdateTimeStart(){
-        return this.updateTimeStart;
+    public List<String> getMatterCodeList(){
+        return this.matterCodeList;
     }
 
     /**
-     * 设置 开始 修改时间
-     * @param updateTimeStart
+     * 设置 事项编码
+     * @param matterCodeList
      */
-    public void setUpdateTimeStart(String updateTimeStart){
-        this.updateTimeStart = updateTimeStart;
+    public void setMatterCodeList(List<String> matterCodeList){
+        this.matterCodeList = matterCodeList;
     }
 
     /**
-     * 获取 结束 修改时间
-     * @return updateTimeEnd
+     * 获取 事项编码
+     * @return matterCodeNotList
      */
-    public String getUpdateTimeEnd(){
-        return this.updateTimeEnd;
+    public List<String> getMatterCodeNotList(){
+        return this.matterCodeNotList;
     }
 
     /**
-     * 设置 结束 修改时间
-     * @param updateTimeEnd
+     * 设置 事项编码
+     * @param matterCodeNotList
      */
-    public void setUpdateTimeEnd(String updateTimeEnd){
-        this.updateTimeEnd = updateTimeEnd;
+    public void setMatterCodeNotList(List<String> matterCodeNotList){
+        this.matterCodeNotList = matterCodeNotList;
     }
 
     /**
@@ -774,38 +676,6 @@ public class SiteMatterQuery extends SiteMatterEntity {
         this.deptNameNotList = deptNameNotList;
     }
 
-    /**
-     * 获取 事项编码
-     * @return matterCodeList
-     */
-    public List<String> getMatterCodeList(){
-        return this.matterCodeList;
-    }
-
-    /**
-     * 设置 事项编码
-     * @param matterCodeList
-     */
-    public void setMatterCodeList(List<String> matterCodeList){
-        this.matterCodeList = matterCodeList;
-    }
-
-    /**
-     * 获取 事项编码
-     * @return matterCodeNotList
-     */
-    public List<String> getMatterCodeNotList(){
-        return this.matterCodeNotList;
-    }
-
-    /**
-     * 设置 事项编码
-     * @param matterCodeNotList
-     */
-    public void setMatterCodeNotList(List<String> matterCodeNotList){
-        this.matterCodeNotList = matterCodeNotList;
-    }
-
     /**
      * 获取 事项类型
      * @return eventTypeShowList
@@ -1291,26 +1161,252 @@ public class SiteMatterQuery extends SiteMatterEntity {
     }
 
     /**
-     * 设置  序号，主键，自增长
-     * @param id
+     * 获取 开始 大厅事项入驻(0.否,1.是)
+     * @return hallCheckInStart
      */
-    public SiteMatterQuery id(Long id){
-        setId(id);
-        return this;
+    public Integer getHallCheckInStart(){
+        return this.hallCheckInStart;
     }
 
     /**
-     * 设置 开始 序号，主键，自增长
-     * @param idStart
+     * 设置 开始 大厅事项入驻(0.否,1.是)
+     * @param hallCheckInStart
      */
-    public SiteMatterQuery idStart(Long idStart){
-        this.idStart = idStart;
-        return this;
+    public void setHallCheckInStart(Integer hallCheckInStart){
+        this.hallCheckInStart = hallCheckInStart;
     }
 
     /**
-     * 设置 结束 序号，主键，自增长
-     * @param idEnd
+     * 获取 结束 大厅事项入驻(0.否,1.是)
+     * @return $hallCheckInEnd
+     */
+    public Integer getHallCheckInEnd(){
+        return this.hallCheckInEnd;
+    }
+
+    /**
+     * 设置 结束 大厅事项入驻(0.否,1.是)
+     * @param hallCheckInEnd
+     */
+    public void setHallCheckInEnd(Integer hallCheckInEnd){
+        this.hallCheckInEnd = hallCheckInEnd;
+    }
+
+    /**
+     * 获取 增加 大厅事项入驻(0.否,1.是)
+     * @return hallCheckInIncrement
+     */
+    public Integer getHallCheckInIncrement(){
+        return this.hallCheckInIncrement;
+    }
+
+    /**
+     * 设置 增加 大厅事项入驻(0.否,1.是)
+     * @param hallCheckInIncrement
+     */
+    public void setHallCheckInIncrement(Integer hallCheckInIncrement){
+        this.hallCheckInIncrement = hallCheckInIncrement;
+    }
+
+    /**
+     * 获取 大厅事项入驻(0.否,1.是)
+     * @return hallCheckInList
+     */
+    public List<Integer> getHallCheckInList(){
+        return this.hallCheckInList;
+    }
+
+    /**
+     * 设置 大厅事项入驻(0.否,1.是)
+     * @param hallCheckInList
+     */
+    public void setHallCheckInList(List<Integer> hallCheckInList){
+        this.hallCheckInList = hallCheckInList;
+    }
+
+    /**
+     * 获取 大厅事项入驻(0.否,1.是)
+     * @return hallCheckInNotList
+     */
+    public List<Integer> getHallCheckInNotList(){
+        return this.hallCheckInNotList;
+    }
+
+    /**
+     * 设置 大厅事项入驻(0.否,1.是)
+     * @param hallCheckInNotList
+     */
+    public void setHallCheckInNotList(List<Integer> hallCheckInNotList){
+        this.hallCheckInNotList = hallCheckInNotList;
+    }
+
+
+    /**
+     * 获取 开始 创建时间
+     * @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 SiteMatterQuery id(Long id){
+        setId(id);
+        return this;
+    }
+
+    /**
+     * 设置 开始 序号，主键，自增长
+     * @param idStart
+     */
+    public SiteMatterQuery idStart(Long idStart){
+        this.idStart = idStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 序号，主键，自增长
+     * @param idEnd
      */
     public SiteMatterQuery idEnd(Long idEnd){
         this.idEnd = idEnd;
@@ -1492,60 +1588,23 @@ public class SiteMatterQuery extends SiteMatterEntity {
 
 
     /**
-     * 设置  创建用户
-     * @param createUserId
-     */
-    public SiteMatterQuery createUserId(Long createUserId){
-        setCreateUserId(createUserId);
-        return this;
-    }
-
-    /**
-     * 设置 开始 创建用户
-     * @param createUserIdStart
-     */
-    public SiteMatterQuery createUserIdStart(Long createUserIdStart){
-        this.createUserIdStart = createUserIdStart;
-        return this;
-    }
-
-    /**
-     * 设置 结束 创建用户
-     * @param createUserIdEnd
-     */
-    public SiteMatterQuery createUserIdEnd(Long createUserIdEnd){
-        this.createUserIdEnd = createUserIdEnd;
-        return this;
-    }
-
-    /**
-     * 设置 增加 创建用户
-     * @param createUserIdIncrement
-     */
-    public SiteMatterQuery createUserIdIncrement(Long createUserIdIncrement){
-        this.createUserIdIncrement = createUserIdIncrement;
-        return this;
-    }
-
-    /**
-     * 设置 创建用户
-     * @param createUserIdList
+     * 设置 事项编码
+     * @param matterCode
      */
-    public SiteMatterQuery createUserIdList(List<Long> createUserIdList){
-        this.createUserIdList = createUserIdList;
+    public SiteMatterQuery matterCode(String matterCode){
+        setMatterCode(matterCode);
         return this;
     }
 
     /**
-     * 设置 创建用户
-     * @param createUserIdNotList
+     * 设置 事项编码
+     * @param matterCodeList
      */
-    public SiteMatterQuery createUserIdNotList(List<Long> createUserIdNotList){
-        this.createUserIdNotList = createUserIdNotList;
+    public SiteMatterQuery matterCodeList(List<String> matterCodeList){
+        this.matterCodeList = matterCodeList;
         return this;
     }
 
-
     /**
      * 设置  部门ID
      * @param deptId
@@ -1620,25 +1679,6 @@ public class SiteMatterQuery extends SiteMatterEntity {
     }
 
 
-    /**
-     * 设置 事项编码
-     * @param matterCode
-     */
-    public SiteMatterQuery matterCode(String matterCode){
-        setMatterCode(matterCode);
-        return this;
-    }
-
-    /**
-     * 设置 事项编码
-     * @param matterCodeList
-     */
-    public SiteMatterQuery matterCodeList(List<String> matterCodeList){
-        this.matterCodeList = matterCodeList;
-        return this;
-    }
-
-
     /**
      * 设置 事项类型
      * @param eventTypeShow
@@ -1949,6 +1989,116 @@ public class SiteMatterQuery extends SiteMatterEntity {
         return this;
     }
 
+    /**
+     * 设置  大厅事项入驻(0.否,1.是)
+     * @param hallCheckIn
+     */
+    public SiteMatterQuery hallCheckIn(Integer hallCheckIn){
+        setHallCheckIn(hallCheckIn);
+        return this;
+    }
+
+    /**
+     * 设置 开始 大厅事项入驻(0.否,1.是)
+     * @param hallCheckInStart
+     */
+    public SiteMatterQuery hallCheckInStart(Integer hallCheckInStart){
+        this.hallCheckInStart = hallCheckInStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 大厅事项入驻(0.否,1.是)
+     * @param hallCheckInEnd
+     */
+    public SiteMatterQuery hallCheckInEnd(Integer hallCheckInEnd){
+        this.hallCheckInEnd = hallCheckInEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 大厅事项入驻(0.否,1.是)
+     * @param hallCheckInIncrement
+     */
+    public SiteMatterQuery hallCheckInIncrement(Integer hallCheckInIncrement){
+        this.hallCheckInIncrement = hallCheckInIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 大厅事项入驻(0.否,1.是)
+     * @param hallCheckInList
+     */
+    public SiteMatterQuery hallCheckInList(List<Integer> hallCheckInList){
+        this.hallCheckInList = hallCheckInList;
+        return this;
+    }
+
+    /**
+     * 设置 大厅事项入驻(0.否,1.是)
+     * @param hallCheckInNotList
+     */
+    public SiteMatterQuery hallCheckInNotList(List<Integer> hallCheckInNotList){
+        this.hallCheckInNotList = hallCheckInNotList;
+        return this;
+    }
+
+
+    /**
+     * 设置  创建用户
+     * @param createUserId
+     */
+    public SiteMatterQuery createUserId(Long createUserId){
+        setCreateUserId(createUserId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 创建用户
+     * @param createUserIdStart
+     */
+    public SiteMatterQuery createUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 创建用户
+     * @param createUserIdEnd
+     */
+    public SiteMatterQuery createUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 创建用户
+     * @param createUserIdIncrement
+     */
+    public SiteMatterQuery createUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 创建用户
+     * @param createUserIdList
+     */
+    public SiteMatterQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+        return this;
+    }
+
+    /**
+     * 设置 创建用户
+     * @param createUserIdNotList
+     */
+    public SiteMatterQuery 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

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

@@ -10,12 +10,9 @@
         <result property="siteName" column="siteName" />
         <result property="matterId" column="matterId" />
         <result property="matterName" column="matterName" />
-        <result property="createTime" column="createTime" />
-        <result property="createUserId" column="createUserId" />
-        <result property="updateTime" column="updateTime" />
+        <result property="matterCode" column="matterCode" />
         <result property="deptId" column="deptId" />
         <result property="deptName" column="deptName" />
-        <result property="matterCode" column="matterCode" />
         <result property="eventTypeShow" column="eventTypeShow" />
         <result property="source" column="source" />
         <result property="hot" column="hot" />
@@ -25,6 +22,10 @@
         <result property="agentName" column="agentName" />
         <result property="agentPhone" column="agentPhone" />
         <result property="agentPost" column="agentPost" />
+        <result property="hallCheckIn" column="hallCheckIn" />
+        <result property="createTime" column="createTime" />
+        <result property="createUserId" column="createUserId" />
+        <result property="updateTime" column="updateTime" />
 
     </resultMap>
 
@@ -47,14 +48,8 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterName') or colPickMode == 1 and data.containsKey('matterName')))">
                 a.matterName,
             </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 test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterCode') or colPickMode == 1 and data.containsKey('matterCode')))">
+                a.matterCode,
             </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptId') or colPickMode == 1 and data.containsKey('deptId')))">
                 a.deptId,
@@ -62,9 +57,6 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptName') or colPickMode == 1 and data.containsKey('deptName')))">
                 a.deptName,
             </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterCode') or colPickMode == 1 and data.containsKey('matterCode')))">
-                a.matterCode,
-            </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('eventTypeShow') or colPickMode == 1 and data.containsKey('eventTypeShow')))">
                 a.eventTypeShow,
             </if>
@@ -92,23 +84,35 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('agentPost') or colPickMode == 1 and data.containsKey('agentPost')))">
                 a.agentPost,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('hallCheckIn') or colPickMode == 1 and data.containsKey('hallCheckIn')))">
+                a.hallCheckIn,
+            </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="SiteMatterEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_sys_site_matter
-        (siteId,siteName,matterId,matterName,createTime,createUserId,updateTime,deptId,deptName,matterCode,eventTypeShow,source,hot,display,deptCode,agent,agentName,agentPhone,agentPost)
+        (siteId,siteName,matterId,matterName,matterCode,deptId,deptName,eventTypeShow,source,hot,display,deptCode,agent,agentName,agentPhone,agentPost,hallCheckIn,createTime,createUserId,updateTime)
         VALUES
-        (#{siteId},#{siteName},#{matterId},#{matterName},#{createTime},#{createUserId},#{updateTime},#{deptId},#{deptName},#{matterCode},#{eventTypeShow},#{source},#{hot},#{display},#{deptCode},#{agent},#{agentName},#{agentPhone},#{agentPost})
+        (#{siteId},#{siteName},#{matterId},#{matterName},#{matterCode},#{deptId},#{deptName},#{eventTypeShow},#{source},#{hot},#{display},#{deptCode},#{agent},#{agentName},#{agentPhone},#{agentPost},#{hallCheckIn},#{createTime},#{createUserId},#{updateTime})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_sys_site_matter
-        (siteId,siteName,matterId,matterName,createTime,createUserId,updateTime,deptId,deptName,matterCode,eventTypeShow,source,hot,display,deptCode,agent,agentName,agentPhone,agentPost)
+        (siteId,siteName,matterId,matterName,matterCode,deptId,deptName,eventTypeShow,source,hot,display,deptCode,agent,agentName,agentPhone,agentPost,hallCheckIn,createTime,createUserId,updateTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.siteId},#{item.siteName},#{item.matterId},#{item.matterName},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.deptId},#{item.deptName},#{item.matterCode},#{item.eventTypeShow},#{item.source},#{item.hot},#{item.display},#{item.deptCode},#{item.agent},#{item.agentName},#{item.agentPhone},#{item.agentPost})
+            (#{item.siteId},#{item.siteName},#{item.matterId},#{item.matterName},#{item.matterCode},#{item.deptId},#{item.deptName},#{item.eventTypeShow},#{item.source},#{item.hot},#{item.display},#{item.deptCode},#{item.agent},#{item.agentName},#{item.agentPhone},#{item.agentPost},#{item.hallCheckIn},#{item.createTime},#{item.createUserId},#{item.updateTime})
         </foreach>
     </insert>
 
@@ -136,17 +140,8 @@
             <if test="(colPickMode==0 and data.containsKey('matterName')) or (colPickMode==1 and !data.containsKey('matterName'))">
                 a.matterName=#{data.matterName},
             </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 test="(colPickMode==0 and data.containsKey('matterCode')) or (colPickMode==1 and !data.containsKey('matterCode'))">
+                a.matterCode=#{data.matterCode},
             </if>
             <if test="(colPickMode==0 and data.containsKey('deptId')) or (colPickMode==1 and !data.containsKey('deptId'))">
                 a.deptId=#{data.deptId},
@@ -157,9 +152,6 @@
             <if test="(colPickMode==0 and data.containsKey('deptName')) or (colPickMode==1 and !data.containsKey('deptName'))">
                 a.deptName=#{data.deptName},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('matterCode')) or (colPickMode==1 and !data.containsKey('matterCode'))">
-                a.matterCode=#{data.matterCode},
-            </if>
             <if test="(colPickMode==0 and data.containsKey('eventTypeShow')) or (colPickMode==1 and !data.containsKey('eventTypeShow'))">
                 a.eventTypeShow=#{data.eventTypeShow},
             </if>
@@ -199,6 +191,24 @@
             <if test="(colPickMode==0 and data.containsKey('agentPost')) or (colPickMode==1 and !data.containsKey('agentPost'))">
                 a.agentPost=#{data.agentPost},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('hallCheckIn')) or (colPickMode==1 and !data.containsKey('hallCheckIn'))">
+                a.hallCheckIn=#{data.hallCheckIn},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('hallCheckInIncrement')) or (colPickMode==1 and !data.containsKey('hallCheckInIncrement'))">
+                a.hallCheckIn=ifnull(a.hallCheckIn,0) + #{data.hallCheckInIncrement},
+            </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
@@ -249,29 +259,10 @@
                     </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),">
+            <trim prefix="matterCode=(case" suffix="ELSE matterCode 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 test="(colPickMode==0 and item.containsKey('matterCode')) or (colPickMode==1 and !item.containsKey('matterCode'))">
+                        when a.id=#{item.id} then #{item.matterCode}
                     </if>
                 </foreach>
             </trim>
@@ -294,13 +285,6 @@
                     </if>
                 </foreach>
             </trim>
-            <trim prefix="matterCode=(case" suffix="ELSE matterCode end),">
-                <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('matterCode')) or (colPickMode==1 and !item.containsKey('matterCode'))">
-                        when a.id=#{item.id} then #{item.matterCode}
-                    </if>
-                </foreach>
-            </trim>
             <trim prefix="eventTypeShow=(case" suffix="ELSE eventTypeShow end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
                     <if test="(colPickMode==0 and item.containsKey('eventTypeShow')) or (colPickMode==1 and !item.containsKey('eventTypeShow'))">
@@ -384,6 +368,44 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="hallCheckIn=(case" suffix="ELSE hallCheckIn end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('hallCheckIn')) or (colPickMode==1 and !item.containsKey('hallCheckIn'))">
+                            when a.id=#{item.id} then #{item.hallCheckIn}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('hallCheckInIncrement')) or (colPickMode==1 and !item.containsKey('hallCheckInIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.hallCheckIn,0) + #{item.hallCheckInIncrement}
+                        </when>
+                    </choose>
+                </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=")">
@@ -624,62 +646,26 @@
             </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 test="conditionParamRef.containsKey('matterCode')">
+            <if test="conditionParamRef.matterCode != null and conditionParamRef.matterCode != ''">
+                ${_conditionType_} a.matterCode like #{${_conditionParam_}.matterCode}
             </if>
-            <if test="conditionParamRef.createUserId == null">
-                ${_conditionType_} a.createUserId is null
+            <if test="conditionParamRef.matterCode == null">
+                ${_conditionType_} a.matterCode 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=",">
+        <if test="conditionParamRef.containsKey('matterCodeList') and conditionParamRef.matterCodeList.size() > 0">
+            ${_conditionType_} a.matterCode in
+            <foreach collection="conditionParamRef.matterCodeList" 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=",">
+        <if test="conditionParamRef.containsKey('matterCodeNotList') and conditionParamRef.matterCodeNotList.size() > 0">
+            ${_conditionType_} a.matterCode not in
+            <foreach collection="conditionParamRef.matterCodeNotList" 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>
         <if test="conditionParamRef.containsKey('deptId')">
             <if test="conditionParamRef.deptId != null ">
                 ${_conditionType_} a.deptId = #{${_conditionParam_}.deptId}
@@ -729,27 +715,6 @@
             </foreach>
         </if>
 
-        <if test="conditionParamRef.containsKey('matterCode')">
-            <if test="conditionParamRef.matterCode != null and conditionParamRef.matterCode != ''">
-                ${_conditionType_} a.matterCode like #{${_conditionParam_}.matterCode}
-            </if>
-            <if test="conditionParamRef.matterCode == null">
-                ${_conditionType_} a.matterCode is null
-            </if>
-        </if>
-        <if test="conditionParamRef.containsKey('matterCodeList') and conditionParamRef.matterCodeList.size() > 0">
-            ${_conditionType_} a.matterCode in
-            <foreach collection="conditionParamRef.matterCodeList" open="(" close=")" index="index" item="item" separator=",">
-                #{item}
-            </foreach>
-        </if>
-        <if test="conditionParamRef.containsKey('matterCodeNotList') and conditionParamRef.matterCodeNotList.size() > 0">
-            ${_conditionType_} a.matterCode not in
-            <foreach collection="conditionParamRef.matterCodeNotList" open="(" close=")" index="index" item="item" separator=",">
-                #{item}
-            </foreach>
-        </if>
-
         <if test="conditionParamRef.containsKey('eventTypeShow')">
             <if test="conditionParamRef.eventTypeShow != null and conditionParamRef.eventTypeShow != ''">
                 ${_conditionType_} a.eventTypeShow like #{${_conditionParam_}.eventTypeShow}
@@ -962,6 +927,90 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('hallCheckIn')">
+            <if test="conditionParamRef.hallCheckIn != null ">
+                ${_conditionType_} a.hallCheckIn = #{${_conditionParam_}.hallCheckIn}
+            </if>
+            <if test="conditionParamRef.hallCheckIn == null">
+                ${_conditionType_} a.hallCheckIn is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('hallCheckInList') and conditionParamRef.hallCheckInList.size() > 0">
+            ${_conditionType_} a.hallCheckIn in
+            <foreach collection="conditionParamRef.hallCheckInList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('hallCheckInNotList') and conditionParamRef.hallCheckInNotList.size() > 0">
+            ${_conditionType_} a.hallCheckIn not in
+            <foreach collection="conditionParamRef.hallCheckInNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('hallCheckInStart') and conditionParamRef.hallCheckInStart != null">
+            ${_conditionType_} a.hallCheckIn <![CDATA[ >= ]]> #{${_conditionParam_}.hallCheckInStart}
+        </if>
+        <if test="conditionParamRef.containsKey('hallCheckInEnd') and conditionParamRef.hallCheckInEnd != null">
+            ${_conditionType_} a.hallCheckIn <![CDATA[ <= ]]> #{${_conditionParam_}.hallCheckInEnd}
+        </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()">
@@ -987,13 +1036,6 @@
                 </foreach>
                 ,
             </if>
-            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
-                field(a.createUserId,
-                <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-                ,
-            </if>
             <if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
                 field(a.deptId,
                 <foreach collection="conditionParamRef.deptIdList" open="" close=")" index="index" item="item" separator=",">
@@ -1029,6 +1071,20 @@
                 </foreach>
                 ,
             </if>
+            <if test="conditionParamRef.containsKey('hallCheckInList') and conditionParamRef.hallCheckInList.size() > 0">
+                field(a.hallCheckIn,
+                <foreach collection="conditionParamRef.hallCheckInList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                field(a.createUserId,
+                <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
                     a.${item.colName} ${item.sortKind}
@@ -1058,13 +1114,6 @@
                 </foreach>
                 ,
             </if>
-            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
-                field(a.createUserId,
-                <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-                ,
-            </if>
             <if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
                 field(a.deptId,
                 <foreach collection="conditionParamRef.deptIdList" open="" close=")" index="index" item="item" separator=",">
@@ -1100,6 +1149,20 @@
                 </foreach>
                 ,
             </if>
+            <if test="conditionParamRef.containsKey('hallCheckInList') and conditionParamRef.hallCheckInList.size() > 0">
+                field(a.hallCheckIn,
+                <foreach collection="conditionParamRef.hallCheckInList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                field(a.createUserId,
+                <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
             <trim suffixOverrides=","  suffix="">
                 <if test="orderCol.containsKey('id')">
                     a.id
@@ -1126,19 +1189,9 @@
                     <if test='orderCol.matterName != null and "DESC".equalsIgnoreCase(orderCol.matterName)'>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 test="orderCol.containsKey('matterCode')">
+                    a.matterCode
+                    <if test='orderCol.matterCode != null and "DESC".equalsIgnoreCase(orderCol.matterCode)'>DESC</if>
                     ,
                 </if>
                 <if test="orderCol.containsKey('deptId')">
@@ -1151,11 +1204,6 @@
                     <if test='orderCol.deptName != null and "DESC".equalsIgnoreCase(orderCol.deptName)'>DESC</if>
                     ,
                 </if>
-                <if test="orderCol.containsKey('matterCode')">
-                    a.matterCode
-                    <if test='orderCol.matterCode != null and "DESC".equalsIgnoreCase(orderCol.matterCode)'>DESC</if>
-                    ,
-                </if>
                 <if test="orderCol.containsKey('eventTypeShow')">
                     a.eventTypeShow
                     <if test='orderCol.eventTypeShow != null and "DESC".equalsIgnoreCase(orderCol.eventTypeShow)'>DESC</if>
@@ -1201,6 +1249,26 @@
                     <if test='orderCol.agentPost != null and "DESC".equalsIgnoreCase(orderCol.agentPost)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('hallCheckIn')">
+                    a.hallCheckIn
+                    <if test='orderCol.hallCheckIn != null and "DESC".equalsIgnoreCase(orderCol.hallCheckIn)'>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>