去除多余代码

knowledge-base/db/base_modules.sql

@@ -420,6 +420,119 @@ CREATE TABLE mortals_sys_matter_ext
     PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='事项扩展';
 
+
+-- ----------------------------
+-- Table structure for mortals_iot_area
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_iot_area`;
+CREATE TABLE `mortals_iot_area` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id号',
+  `areaCode` char(32) DEFAULT NULL COMMENT '区域编码',
+  `name` varchar(64) DEFAULT NULL COMMENT '区域名称',
+  `areaLevel` char(2) DEFAULT NULL COMMENT '区域等级，1省，2地市州，3区县，4街道，5社区',
+  `haveSonArea` char(5) DEFAULT NULL COMMENT '是否有下级区域',
+  `haveSonDept` char(5) DEFAULT NULL COMMENT '是否有下级部门',
+  `shortName` varchar(64) DEFAULT NULL COMMENT '名称简称',
+  `domain` varchar(1024) DEFAULT NULL COMMENT '访问地址',
+  `iid` char(32) DEFAULT NULL COMMENT '一体化的ID号',
+  `pid` char(32) DEFAULT NULL COMMENT '一体化的父id',
+  `haveGetDept` char(5) DEFAULT NULL COMMENT '是否获取部门',
+  `haveGetMatterList` char(5) DEFAULT NULL COMMENT '是否获取事项列表',
+  `updateTime` datetime DEFAULT NULL COMMENT '修改时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=MyISAM AUTO_INCREMENT=36358 DEFAULT CHARSET=utf8 COMMENT='区域表';
+
+-- ----------------------------
+-- Table structure for mortals_iot_matters
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_iot_matters`;
+CREATE TABLE `mortals_iot_matters` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id号',
+  `areaCode` char(32) DEFAULT NULL COMMENT '区域编码',
+  `deptCode` char(32) DEFAULT NULL COMMENT '部门编号',
+  `powerCode` char(3) DEFAULT NULL COMMENT '行政权力编号',
+  `themeCode` char(128) DEFAULT NULL COMMENT '主题编号',
+  `usertypeCode` char(3) DEFAULT NULL COMMENT '服务类型编号',
+  `matterCode` char(64) DEFAULT NULL COMMENT '事项编号',
+  `name` varchar(256) DEFAULT NULL COMMENT '事项名称',
+  `groupName` varchar(256) DEFAULT NULL COMMENT '事项组名',
+  `url` varchar(1024) DEFAULT NULL COMMENT '事项详情链接',
+  `haveGetMatterInfo` char(5) DEFAULT NULL COMMENT '是否获取事项详情',
+  `updateTime` datetime DEFAULT NULL COMMENT '修改时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=MyISAM AUTO_INCREMENT=6079 DEFAULT CHARSET=utf8 COMMENT='事项列表';
+
+-- ----------------------------
+-- Table structure for mortals_iot_matters_dept
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_iot_matters_dept`;
+CREATE TABLE `mortals_iot_matters_dept` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id号',
+  `areaCode` char(32) DEFAULT NULL COMMENT '区域编号',
+  `deptCode` char(32) DEFAULT NULL COMMENT '部门编号',
+  `name` varchar(256) DEFAULT NULL COMMENT '部门名称',
+  `updateTime` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=MyISAM AUTO_INCREMENT=35 DEFAULT CHARSET=utf8 COMMENT='部门表';
+
+-- ----------------------------
+-- Table structure for mortals_iot_matters_detail
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_iot_matters_detail`;
+CREATE TABLE `mortals_iot_matters_detail` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id号',
+  `matterCode` char(64) DEFAULT NULL COMMENT '事项编号',
+  `onlineUrl_zxsq` varchar(1024) DEFAULT NULL COMMENT '在线申请',
+  `basicInfo_jbxx` text COMMENT '基本信息',
+  `materials_sqcl` text COMMENT '申请材料',
+  `conditions_sltj` text COMMENT '受理条件',
+  `process_bllc` text COMMENT '办理流程',
+  `charging_sfbz` text COMMENT '收费标准',
+  `basis_sdyj` text COMMENT '设定依据',
+  `intermediary_zjfw` text COMMENT '中介服务',
+  `question_cjwt` text COMMENT '常见问题',
+  `updateTime` datetime DEFAULT NULL COMMENT '修改时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=MyISAM AUTO_INCREMENT=6079 DEFAULT CHARSET=utf8 COMMENT='事项详情表';
+
+-- ----------------------------
+-- Table structure for mortals_iot_matters_power
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_iot_matters_power`;
+CREATE TABLE `mortals_iot_matters_power` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id号',
+  `powerCode` char(3) DEFAULT NULL COMMENT '行政权力编号',
+  `name` varchar(64) DEFAULT NULL COMMENT '行政权力名称',
+  `updateTime` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=MyISAM AUTO_INCREMENT=12 DEFAULT CHARSET=utf8 COMMENT='行政权力表';
+
+-- ----------------------------
+-- Table structure for mortals_iot_matters_theme
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_iot_matters_theme`;
+CREATE TABLE `mortals_iot_matters_theme` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id号',
+  `usertypeCode` char(3) DEFAULT NULL COMMENT '服务类型编号',
+  `themeCode` char(3) DEFAULT NULL COMMENT '主题编号',
+  `name` varchar(64) DEFAULT NULL COMMENT '主题名称',
+  `updateTime` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=MyISAM AUTO_INCREMENT=67 DEFAULT CHARSET=utf8 COMMENT='主题表';
+
+-- ----------------------------
+-- Table structure for mortals_iot_matters_usertype
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_iot_matters_usertype`;
+CREATE TABLE `mortals_iot_matters_usertype` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id号',
+  `usertypeCode` char(3) DEFAULT NULL COMMENT '服务类型编号',
+  `name` varchar(64) DEFAULT NULL COMMENT '服务类型名称',
+  `updateTime` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=MyISAM AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COMMENT='服务类型表';
+
+
 -- ----------------------------
 -- 材料公共库表
 -- ----------------------------
@@ -482,3 +595,20 @@ CREATE TABLE mortals_xhx_dept_office(
     `updateTime` datetime      COMMENT '更新时间',
 PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='股室管理';
+
+-- ----------------------------
+-- 用户收藏夹表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_user_collect`;
+CREATE TABLE mortals_xhx_user_collect(
+    `id` bigint(20)   AUTO_INCREMENT   COMMENT '序号，主键，自增长',
+    `userId` bigint(20)      COMMENT '用户id',
+    `collectType` tinyint(2)    DEFAULT '1'  COMMENT '收藏类型1单事项2一件事',
+    `collectName` varchar(128)      COMMENT '收藏名称',
+    `collectUrl` varchar(128)      COMMENT '收藏链接',
+    `createUserId` bigint(20) NOT NULL     COMMENT '创建用户',
+    `createTime` datetime NOT NULL     COMMENT '创建时间',
+    `updateUserId` bigint(20)      COMMENT '更新用户',
+    `updateTime` datetime      COMMENT '更新时间',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户收藏夹';
\ No newline at end of file

knowledge-base/src/main/java/com/mortals/xhx/module/user/dao/UserCollectDao.java

+package com.mortals.xhx.module.user.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.user.model.UserCollectEntity;
+import java.util.List;
+/**
+* 用户收藏夹Dao
+* 用户收藏夹 DAO接口
+*
+* @author zxfei
+* @date 2023-03-09
+*/
+
+public interface  UserCollectDao extends ICRUDDao<UserCollectEntity,Long>{
+
+
+}

knowledge-base/src/main/java/com/mortals/xhx/module/user/dao/ibatis/UserCollectDaoImpl.java

+package com.mortals.xhx.module.user.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.user.dao.UserCollectDao;
+import com.mortals.xhx.module.user.model.UserCollectEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 用户收藏夹DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2023-03-09
+*/
+@Repository("userCollectDao")
+public class UserCollectDaoImpl extends BaseCRUDDaoMybatis<UserCollectEntity,Long> implements UserCollectDao {
+
+
+
+}

knowledge-base/src/main/java/com/mortals/xhx/module/user/model/UserCollectEntity.java

+package com.mortals.xhx.module.user.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.user.model.vo.UserCollectVo;
+/**
+* 用户收藏夹实体对象
+*
+* @author zxfei
+* @date 2023-03-09
+*/
+
+public class UserCollectEntity extends UserCollectVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 用户id
+    */
+    private Long userId;
+    /**
+    * 收藏类型1单事项2一件事
+    */
+    private Integer collectType;
+    /**
+    * 收藏名称
+    */
+    private String collectName;
+    /**
+    * 收藏链接
+    */
+    private String collectUrl;
+
+
+
+    public UserCollectEntity(){}
+    /**
+    * 获取 用户id
+    * @return Long
+    */
+    public Long getUserId(){
+        return userId;
+    }
+    /**
+    * 设置 用户id
+    * @param userId
+    */
+    public void setUserId(Long userId){
+        this.userId = userId;
+    }
+    /**
+    * 获取 收藏类型1单事项2一件事
+    * @return Integer
+    */
+    public Integer getCollectType(){
+        return collectType;
+    }
+    /**
+    * 设置 收藏类型1单事项2一件事
+    * @param collectType
+    */
+    public void setCollectType(Integer collectType){
+        this.collectType = collectType;
+    }
+    /**
+    * 获取 收藏名称
+    * @return String
+    */
+    public String getCollectName(){
+        return collectName;
+    }
+    /**
+    * 设置 收藏名称
+    * @param collectName
+    */
+    public void setCollectName(String collectName){
+        this.collectName = collectName;
+    }
+    /**
+    * 获取 收藏链接
+    * @return String
+    */
+    public String getCollectUrl(){
+        return collectUrl;
+    }
+    /**
+    * 设置 收藏链接
+    * @param collectUrl
+    */
+    public void setCollectUrl(String collectUrl){
+        this.collectUrl = collectUrl;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof UserCollectEntity) {
+            UserCollectEntity tmp = (UserCollectEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",userId:").append(getUserId());
+        sb.append(",collectType:").append(getCollectType());
+        sb.append(",collectName:").append(getCollectName());
+        sb.append(",collectUrl:").append(getCollectUrl());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.userId = null;
+
+            this.collectType = 1;
+
+            this.collectName = "";
+
+            this.collectUrl = "";
+    }
+}
\ No newline at end of file

knowledge-base/src/main/java/com/mortals/xhx/module/user/model/UserCollectQuery.java

+package com.mortals.xhx.module.user.model;
+
+import java.util.List;
+import com.mortals.xhx.module.user.model.UserCollectEntity;
+/**
+* 用户收藏夹查询对象
+*
+* @author zxfei
+* @date 2023-03-09
+*/
+public class UserCollectQuery extends UserCollectEntity {
+    /** 开始 序号，主键，自增长 */
+    private Long idStart;
+
+    /** 结束 序号，主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 序号，主键，自增长 */
+    private Long idIncrement;
+
+    /** 序号，主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 序号，主键，自增长排除列表 */
+    private List <Long> idNotList;
+
+    /** 开始 用户id */
+    private Long userIdStart;
+
+    /** 结束 用户id */
+    private Long userIdEnd;
+
+    /** 增加 用户id */
+    private Long userIdIncrement;
+
+    /** 用户id列表 */
+    private List <Long> userIdList;
+
+    /** 用户id排除列表 */
+    private List <Long> userIdNotList;
+
+    /** 开始 收藏类型1单事项2一件事 */
+    private Integer collectTypeStart;
+
+    /** 结束 收藏类型1单事项2一件事 */
+    private Integer collectTypeEnd;
+
+    /** 增加 收藏类型1单事项2一件事 */
+    private Integer collectTypeIncrement;
+
+    /** 收藏类型1单事项2一件事列表 */
+    private List <Integer> collectTypeList;
+
+    /** 收藏类型1单事项2一件事排除列表 */
+    private List <Integer> collectTypeNotList;
+
+    /** 收藏名称 */
+    private List<String> collectNameList;
+
+    /** 收藏名称排除列表 */
+    private List <String> collectNameNotList;
+    /** 收藏链接 */
+    private List<String> collectUrlList;
+
+    /** 收藏链接排除列表 */
+    private List <String> collectUrlNotList;
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
+    /** 创建用户排除列表 */
+    private List <Long> createUserIdNotList;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 更新用户 */
+    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<UserCollectQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<UserCollectQuery> andConditionList;
+
+    public UserCollectQuery(){}
+
+    /**
+    * 获取 开始 序号，主键，自增长
+    * @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 userIdStart
+    */
+    public Long getUserIdStart(){
+        return this.userIdStart;
+    }
+
+    /**
+    * 设置 开始 用户id
+    * @param userIdStart
+    */
+    public void setUserIdStart(Long userIdStart){
+        this.userIdStart = userIdStart;
+    }
+
+    /**
+    * 获取 结束 用户id
+    * @return $userIdEnd
+    */
+    public Long getUserIdEnd(){
+        return this.userIdEnd;
+    }
+
+    /**
+    * 设置 结束 用户id
+    * @param userIdEnd
+    */
+    public void setUserIdEnd(Long userIdEnd){
+        this.userIdEnd = userIdEnd;
+    }
+
+    /**
+    * 获取 增加 用户id
+    * @return userIdIncrement
+    */
+    public Long getUserIdIncrement(){
+        return this.userIdIncrement;
+    }
+
+    /**
+    * 设置 增加 用户id
+    * @param userIdIncrement
+    */
+    public void setUserIdIncrement(Long userIdIncrement){
+        this.userIdIncrement = userIdIncrement;
+    }
+
+    /**
+    * 获取 用户id
+    * @return userIdList
+    */
+    public List<Long> getUserIdList(){
+        return this.userIdList;
+    }
+
+    /**
+    * 设置 用户id
+    * @param userIdList
+    */
+    public void setUserIdList(List<Long> userIdList){
+        this.userIdList = userIdList;
+    }
+
+    /**
+    * 获取 用户id
+    * @return userIdNotList
+    */
+    public List<Long> getUserIdNotList(){
+        return this.userIdNotList;
+    }
+
+    /**
+    * 设置 用户id
+    * @param userIdNotList
+    */
+    public void setUserIdNotList(List<Long> userIdNotList){
+        this.userIdNotList = userIdNotList;
+    }
+
+
+    /**
+    * 获取 开始 收藏类型1单事项2一件事
+    * @return collectTypeStart
+    */
+    public Integer getCollectTypeStart(){
+        return this.collectTypeStart;
+    }
+
+    /**
+    * 设置 开始 收藏类型1单事项2一件事
+    * @param collectTypeStart
+    */
+    public void setCollectTypeStart(Integer collectTypeStart){
+        this.collectTypeStart = collectTypeStart;
+    }
+
+    /**
+    * 获取 结束 收藏类型1单事项2一件事
+    * @return $collectTypeEnd
+    */
+    public Integer getCollectTypeEnd(){
+        return this.collectTypeEnd;
+    }
+
+    /**
+    * 设置 结束 收藏类型1单事项2一件事
+    * @param collectTypeEnd
+    */
+    public void setCollectTypeEnd(Integer collectTypeEnd){
+        this.collectTypeEnd = collectTypeEnd;
+    }
+
+    /**
+    * 获取 增加 收藏类型1单事项2一件事
+    * @return collectTypeIncrement
+    */
+    public Integer getCollectTypeIncrement(){
+        return this.collectTypeIncrement;
+    }
+
+    /**
+    * 设置 增加 收藏类型1单事项2一件事
+    * @param collectTypeIncrement
+    */
+    public void setCollectTypeIncrement(Integer collectTypeIncrement){
+        this.collectTypeIncrement = collectTypeIncrement;
+    }
+
+    /**
+    * 获取 收藏类型1单事项2一件事
+    * @return collectTypeList
+    */
+    public List<Integer> getCollectTypeList(){
+        return this.collectTypeList;
+    }
+
+    /**
+    * 设置 收藏类型1单事项2一件事
+    * @param collectTypeList
+    */
+    public void setCollectTypeList(List<Integer> collectTypeList){
+        this.collectTypeList = collectTypeList;
+    }
+
+    /**
+    * 获取 收藏类型1单事项2一件事
+    * @return collectTypeNotList
+    */
+    public List<Integer> getCollectTypeNotList(){
+        return this.collectTypeNotList;
+    }
+
+    /**
+    * 设置 收藏类型1单事项2一件事
+    * @param collectTypeNotList
+    */
+    public void setCollectTypeNotList(List<Integer> collectTypeNotList){
+        this.collectTypeNotList = collectTypeNotList;
+    }
+
+
+    /**
+    * 获取 收藏名称
+    * @return collectNameList
+    */
+    public List<String> getCollectNameList(){
+        return this.collectNameList;
+    }
+
+    /**
+    * 设置 收藏名称
+    * @param collectNameList
+    */
+    public void setCollectNameList(List<String> collectNameList){
+        this.collectNameList = collectNameList;
+    }
+
+    /**
+    * 获取 收藏名称
+    * @return collectNameNotList
+    */
+    public List<String> getCollectNameNotList(){
+        return this.collectNameNotList;
+    }
+
+    /**
+    * 设置 收藏名称
+    * @param collectNameNotList
+    */
+    public void setCollectNameNotList(List<String> collectNameNotList){
+        this.collectNameNotList = collectNameNotList;
+    }
+
+    /**
+    * 获取 收藏链接
+    * @return collectUrlList
+    */
+    public List<String> getCollectUrlList(){
+        return this.collectUrlList;
+    }
+
+    /**
+    * 设置 收藏链接
+    * @param collectUrlList
+    */
+    public void setCollectUrlList(List<String> collectUrlList){
+        this.collectUrlList = collectUrlList;
+    }
+
+    /**
+    * 获取 收藏链接
+    * @return collectUrlNotList
+    */
+    public List<String> getCollectUrlNotList(){
+        return this.collectUrlNotList;
+    }
+
+    /**
+    * 设置 收藏链接
+    * @param collectUrlNotList
+    */
+    public void setCollectUrlNotList(List<String> collectUrlNotList){
+        this.collectUrlNotList = collectUrlNotList;
+    }
+
+    /**
+    * 获取 开始 创建用户
+    * @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 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 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 UserCollectQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 序号，主键，自增长
+    * @param idStart
+    */
+    public UserCollectQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 序号，主键，自增长
+    * @param idEnd
+    */
+    public UserCollectQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 序号，主键，自增长
+    * @param idIncrement
+    */
+    public UserCollectQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idList
+    */
+    public UserCollectQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+        /**
+        * 设置 序号，主键，自增长
+        * @param idNotList
+        */
+        public UserCollectQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+        }
+
+    /**
+    * 设置  用户id
+    * @param userId
+    */
+    public UserCollectQuery userId(Long userId){
+	    setUserId(userId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 用户id
+    * @param userIdStart
+    */
+    public UserCollectQuery userIdStart(Long userIdStart){
+		this.userIdStart = userIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 用户id
+    * @param userIdEnd
+    */
+    public UserCollectQuery userIdEnd(Long userIdEnd){
+		this.userIdEnd = userIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 用户id
+    * @param userIdIncrement
+    */
+    public UserCollectQuery userIdIncrement(Long userIdIncrement){
+		this.userIdIncrement = userIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 用户id
+    * @param userIdList
+    */
+    public UserCollectQuery userIdList(List<Long> userIdList){
+        this.userIdList = userIdList;
+		return this;
+        }
+
+        /**
+        * 设置 用户id
+        * @param userIdNotList
+        */
+        public UserCollectQuery userIdNotList(List<Long> userIdNotList){
+        this.userIdNotList = userIdNotList;
+        return this;
+        }
+
+    /**
+    * 设置  收藏类型1单事项2一件事
+    * @param collectType
+    */
+    public UserCollectQuery collectType(Integer collectType){
+	    setCollectType(collectType);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 收藏类型1单事项2一件事
+    * @param collectTypeStart
+    */
+    public UserCollectQuery collectTypeStart(Integer collectTypeStart){
+		this.collectTypeStart = collectTypeStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 收藏类型1单事项2一件事
+    * @param collectTypeEnd
+    */
+    public UserCollectQuery collectTypeEnd(Integer collectTypeEnd){
+		this.collectTypeEnd = collectTypeEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 收藏类型1单事项2一件事
+    * @param collectTypeIncrement
+    */
+    public UserCollectQuery collectTypeIncrement(Integer collectTypeIncrement){
+		this.collectTypeIncrement = collectTypeIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 收藏类型1单事项2一件事
+    * @param collectTypeList
+    */
+    public UserCollectQuery collectTypeList(List<Integer> collectTypeList){
+        this.collectTypeList = collectTypeList;
+		return this;
+        }
+
+        /**
+        * 设置 收藏类型1单事项2一件事
+        * @param collectTypeNotList
+        */
+        public UserCollectQuery collectTypeNotList(List<Integer> collectTypeNotList){
+        this.collectTypeNotList = collectTypeNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 收藏名称
+    * @param collectName
+    */
+    public UserCollectQuery collectName(String collectName){
+        setCollectName(collectName);
+		return this;
+    }
+
+    /**
+    * 设置 收藏名称
+    * @param collectNameList
+    */
+    public UserCollectQuery collectNameList(List<String> collectNameList){
+        this.collectNameList = collectNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 收藏链接
+    * @param collectUrl
+    */
+    public UserCollectQuery collectUrl(String collectUrl){
+        setCollectUrl(collectUrl);
+		return this;
+    }
+
+    /**
+    * 设置 收藏链接
+    * @param collectUrlList
+    */
+    public UserCollectQuery collectUrlList(List<String> collectUrlList){
+        this.collectUrlList = collectUrlList;
+		return this;
+    }
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public UserCollectQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public UserCollectQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public UserCollectQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public UserCollectQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public UserCollectQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 创建用户
+        * @param createUserIdNotList
+        */
+        public UserCollectQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        return this;
+        }
+
+
+    /**
+    * 设置  更新用户
+    * @param updateUserId
+    */
+    public UserCollectQuery updateUserId(Long updateUserId){
+	    setUpdateUserId(updateUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 更新用户
+    * @param updateUserIdStart
+    */
+    public UserCollectQuery updateUserIdStart(Long updateUserIdStart){
+		this.updateUserIdStart = updateUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 更新用户
+    * @param updateUserIdEnd
+    */
+    public UserCollectQuery updateUserIdEnd(Long updateUserIdEnd){
+		this.updateUserIdEnd = updateUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 更新用户
+    * @param updateUserIdIncrement
+    */
+    public UserCollectQuery updateUserIdIncrement(Long updateUserIdIncrement){
+		this.updateUserIdIncrement = updateUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 更新用户
+    * @param updateUserIdList
+    */
+    public UserCollectQuery updateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
+		return this;
+        }
+
+        /**
+        * 设置 更新用户
+        * @param updateUserIdNotList
+        */
+        public UserCollectQuery 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<UserCollectQuery> 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<UserCollectQuery> 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<UserCollectQuery> 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<UserCollectQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

knowledge-base/src/main/java/com/mortals/xhx/module/user/model/vo/UserCollectVo.java

+package com.mortals.xhx.module.user.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.user.model.UserCollectEntity;
+import java.util.ArrayList;
+import java.util.List;
+/**
+* 用户收藏夹视图对象
+*
+* @author zxfei
+* @date 2023-03-09
+*/
+public class UserCollectVo extends BaseEntityLong {
+
+}
\ No newline at end of file

knowledge-base/src/main/java/com/mortals/xhx/module/user/service/UserCollectService.java

+package com.mortals.xhx.module.user.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.user.model.UserCollectEntity;
+/**
+* UserCollectService
+*
+* 用户收藏夹 service接口
+*
+* @author zxfei
+* @date 2023-03-09
+*/
+public interface UserCollectService extends ICRUDService<UserCollectEntity,Long>{
+
+}
\ No newline at end of file

knowledge-base/src/main/java/com/mortals/xhx/module/user/service/impl/UserCollectServiceImpl.java

+package com.mortals.xhx.module.user.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.user.dao.UserCollectDao;
+import com.mortals.xhx.module.user.model.UserCollectEntity;
+import com.mortals.xhx.module.user.service.UserCollectService;
+/**
+* UserCollectService
+* 用户收藏夹 service实现
+*
+* @author zxfei
+* @date 2023-03-09
+*/
+@Service("userCollectService")
+public class UserCollectServiceImpl extends AbstractCRUDServiceImpl<UserCollectDao, UserCollectEntity, Long> implements UserCollectService {
+    
+}
\ No newline at end of file

knowledge-base/src/main/resources/sqlmap/module/user/UserCollectMapper.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.user.dao.ibatis.UserCollectDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="UserCollectEntity" id="UserCollectEntity-Map">
+            <id  property="id" column="id" />
+            <result property="userId" column="userId" />
+            <result property="collectType" column="collectType" />
+            <result property="collectName" column="collectName" />
+            <result property="collectUrl" column="collectUrl" />
+            <result property="createUserId" column="createUserId" />
+            <result property="createTime" column="createTime" />
+            <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('userId') or colPickMode == 1 and data.containsKey('userId')))">
+                    a.userId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('collectType') or colPickMode == 1 and data.containsKey('collectType')))">
+                    a.collectType,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('collectName') or colPickMode == 1 and data.containsKey('collectName')))">
+                    a.collectName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('collectUrl') or colPickMode == 1 and data.containsKey('collectUrl')))">
+                    a.collectUrl,
+                </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('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                    a.createTime,
+                </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="UserCollectEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_xhx_user_collect
+        (userId,collectType,collectName,collectUrl,createUserId,createTime,updateUserId,updateTime)
+        VALUES
+        (#{userId},#{collectType},#{collectName},#{collectUrl},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_xhx_user_collect
+        (userId,collectType,collectName,collectUrl,createUserId,createTime,updateUserId,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.userId},#{item.collectType},#{item.collectName},#{item.collectUrl},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_xhx_user_collect as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('userId')) or (colPickMode==1 and !data.containsKey('userId'))">
+                a.userId=#{data.userId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('userIdIncrement')) or (colPickMode==1 and !data.containsKey('userIdIncrement'))">
+                a.userId=ifnull(a.userId,0) + #{data.userIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('collectType')) or (colPickMode==1 and !data.containsKey('collectType'))">
+                a.collectType=#{data.collectType},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('collectTypeIncrement')) or (colPickMode==1 and !data.containsKey('collectTypeIncrement'))">
+                a.collectType=ifnull(a.collectType,0) + #{data.collectTypeIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('collectName')) or (colPickMode==1 and !data.containsKey('collectName'))">
+                a.collectName=#{data.collectName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('collectUrl')) or (colPickMode==1 and !data.containsKey('collectUrl'))">
+                a.collectUrl=#{data.collectUrl},
+            </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('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+                a.createTime=#{data.createTime},
+            </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_xhx_user_collect as a
+        <trim prefix="set" suffixOverrides=",">
+                        <trim prefix="userId=(case" suffix="ELSE userId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('userId')) or (colPickMode==1 and !item.containsKey('userId'))">
+                                        when a.id=#{item.id} then #{item.userId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('userIdIncrement')) or (colPickMode==1 and !item.containsKey('userIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.userId,0) + #{item.userIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                        <trim prefix="collectType=(case" suffix="ELSE collectType end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('collectType')) or (colPickMode==1 and !item.containsKey('collectType'))">
+                                        when a.id=#{item.id} then #{item.collectType}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('collectTypeIncrement')) or (colPickMode==1 and !item.containsKey('collectTypeIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.collectType,0) + #{item.collectTypeIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="collectName=(case" suffix="ELSE collectName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('collectName')) or (colPickMode==1 and !item.containsKey('collectName'))">
+                            when a.id=#{item.id} then #{item.collectName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="collectUrl=(case" suffix="ELSE collectUrl end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('collectUrl')) or (colPickMode==1 and !item.containsKey('collectUrl'))">
+                            when a.id=#{item.id} then #{item.collectUrl}
+                        </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="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="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="UserCollectEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_user_collect as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_xhx_user_collect as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_xhx_user_collect where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据主健列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeyList">
+        delete from mortals_xhx_user_collect where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <!-- 根据对象列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByEntityList">
+        delete from mortals_xhx_user_collect 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_xhx_user_collect as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="UserCollectEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_user_collect 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_xhx_user_collect 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')">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('idNotList')">
+                ${_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('userId')">
+                <if test="conditionParamRef.userId != null ">
+                    ${_conditionType_} a.userId = #{${_conditionParam_}.userId}
+                </if>
+                <if test="conditionParamRef.userId == null">
+                    ${_conditionType_} a.userId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('userIdList')">
+                ${_conditionType_} a.userId in
+                <foreach collection="conditionParamRef.userIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('userIdNotList')">
+                ${_conditionType_} a.userId not in
+                <foreach collection="conditionParamRef.userIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('userIdStart') and conditionParamRef.userIdStart != null">
+                ${_conditionType_} a.userId <![CDATA[ >= ]]> #{${_conditionParam_}.userIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('userIdEnd') and conditionParamRef.userIdEnd != null">
+                ${_conditionType_} a.userId <![CDATA[ <= ]]> #{${_conditionParam_}.userIdEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('collectType')">
+                <if test="conditionParamRef.collectType != null ">
+                    ${_conditionType_} a.collectType = #{${_conditionParam_}.collectType}
+                </if>
+                <if test="conditionParamRef.collectType == null">
+                    ${_conditionType_} a.collectType is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('collectTypeList')">
+                ${_conditionType_} a.collectType in
+                <foreach collection="conditionParamRef.collectTypeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('collectTypeNotList')">
+                ${_conditionType_} a.collectType not in
+                <foreach collection="conditionParamRef.collectTypeNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('collectTypeStart') and conditionParamRef.collectTypeStart != null">
+                ${_conditionType_} a.collectType <![CDATA[ >= ]]> #{${_conditionParam_}.collectTypeStart}
+            </if>
+            <if test="conditionParamRef.containsKey('collectTypeEnd') and conditionParamRef.collectTypeEnd != null">
+                ${_conditionType_} a.collectType <![CDATA[ <= ]]> #{${_conditionParam_}.collectTypeEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('collectName')">
+                <if test="conditionParamRef.collectName != null and conditionParamRef.collectName != ''">
+                    ${_conditionType_} a.collectName like #{${_conditionParam_}.collectName}
+                </if>
+                <if test="conditionParamRef.collectName == null">
+                    ${_conditionType_} a.collectName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('collectNameList')">
+                ${_conditionType_} a.collectName in
+                <foreach collection="conditionParamRef.collectNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('collectNameNotList')">
+                ${_conditionType_} a.collectName not in
+                <foreach collection="conditionParamRef.collectNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('collectUrl')">
+                <if test="conditionParamRef.collectUrl != null and conditionParamRef.collectUrl != ''">
+                    ${_conditionType_} a.collectUrl like #{${_conditionParam_}.collectUrl}
+                </if>
+                <if test="conditionParamRef.collectUrl == null">
+                    ${_conditionType_} a.collectUrl is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('collectUrlList')">
+                ${_conditionType_} a.collectUrl in
+                <foreach collection="conditionParamRef.collectUrlList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('collectUrlNotList')">
+                ${_conditionType_} a.collectUrl not in
+                <foreach collection="conditionParamRef.collectUrlNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </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')">
+                ${_conditionType_} a.createUserId in
+                <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdNotList')">
+                ${_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('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('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')">
+                ${_conditionType_} a.updateUserId in
+                <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdNotList')">
+                ${_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('userId')">
+                        a.userId
+                        <if test='orderCol.userId != null and "DESC".equalsIgnoreCase(orderCol.userId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('collectType')">
+                        a.collectType
+                        <if test='orderCol.collectType != null and "DESC".equalsIgnoreCase(orderCol.collectType)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('collectName')">
+                        a.collectName
+                        <if test='orderCol.collectName != null and "DESC".equalsIgnoreCase(orderCol.collectName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('collectUrl')">
+                        a.collectUrl
+                        <if test='orderCol.collectUrl != null and "DESC".equalsIgnoreCase(orderCol.collectUrl)'>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('createTime')">
+                        a.createTime
+                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>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

single-matter/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java

@@ -87,9 +87,9 @@ public class AuthTokenServiceImpl implements IAuthTokenService {
                 Claims claims = parseToken(token);
                 String uuid = (String) claims.get(SysConstains.LOGIN_USER_KEY);
                 String userKey = getTokenKey(uuid);
-                cacheService.select(portalDb);
+//                cacheService.select(portalDb);
                 String userStr = cacheService.get(userKey);
-                cacheService.select(db);
+//                cacheService.select(db);
                 if (StringUtils.isNotEmpty(userStr)) {
                     UserEntity userEntity = JSONObject.parseObject(userStr, UserEntity.class);
                     userEntity.setToken(token);

single-matter/src/main/java/com/mortals/xhx/module/matter/dao/MatterAcceptDao.java

+package com.mortals.xhx.module.matter.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.matter.model.MatterAcceptEntity;
+import java.util.List;
+/**
+* 事项受理条件Dao
+* 事项受理条件 DAO接口
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+public interface  MatterAcceptDao extends ICRUDDao<MatterAcceptEntity,Long>{
+
+
+}

single-matter/src/main/java/com/mortals/xhx/module/matter/dao/MatterChargesDao.java

+package com.mortals.xhx.module.matter.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.matter.model.MatterChargesEntity;
+import java.util.List;
+/**
+* 事项收费标准Dao
+* 事项收费标准 DAO接口
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+public interface  MatterChargesDao extends ICRUDDao<MatterChargesEntity,Long>{
+
+
+}

single-matter/src/main/java/com/mortals/xhx/module/matter/dao/MatterFlowlimitDao.java

+package com.mortals.xhx.module.matter.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.matter.model.MatterFlowlimitEntity;
+import java.util.List;
+/**
+* 事项办理流程Dao
+* 事项办理流程 DAO接口
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+public interface  MatterFlowlimitDao extends ICRUDDao<MatterFlowlimitEntity,Long>{
+
+
+}

single-matter/src/main/java/com/mortals/xhx/module/matter/dao/MatterIntermediaryDao.java

+package com.mortals.xhx.module.matter.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.matter.model.MatterIntermediaryEntity;
+import java.util.List;
+/**
+* 事项中介服务Dao
+* 事项中介服务 DAO接口
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+public interface  MatterIntermediaryDao extends ICRUDDao<MatterIntermediaryEntity,Long>{
+
+
+}

single-matter/src/main/java/com/mortals/xhx/module/matter/dao/MatterQuestionDao.java

+package com.mortals.xhx.module.matter.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.matter.model.MatterQuestionEntity;
+import java.util.List;
+/**
+* 事项常见问题Dao
+* 事项常见问题 DAO接口
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+public interface  MatterQuestionDao extends ICRUDDao<MatterQuestionEntity,Long>{
+
+
+}

single-matter/src/main/java/com/mortals/xhx/module/matter/dao/MatterSetbaseDao.java

+package com.mortals.xhx.module.matter.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.matter.model.MatterSetbaseEntity;
+import java.util.List;
+/**
+* 事项设定依据Dao
+* 事项设定依据 DAO接口
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+public interface  MatterSetbaseDao extends ICRUDDao<MatterSetbaseEntity,Long>{
+
+
+}

single-matter/src/main/java/com/mortals/xhx/module/matter/dao/ibatis/MatterAcceptDaoImpl.java

+package com.mortals.xhx.module.matter.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.matter.dao.MatterAcceptDao;
+import com.mortals.xhx.module.matter.model.MatterAcceptEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 事项受理条件DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+@Repository("matterAcceptDao")
+public class MatterAcceptDaoImpl extends BaseCRUDDaoMybatis<MatterAcceptEntity,Long> implements MatterAcceptDao {
+
+
+
+}

single-matter/src/main/java/com/mortals/xhx/module/matter/dao/ibatis/MatterChargesDaoImpl.java

+package com.mortals.xhx.module.matter.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.matter.dao.MatterChargesDao;
+import com.mortals.xhx.module.matter.model.MatterChargesEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 事项收费标准DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+@Repository("matterChargesDao")
+public class MatterChargesDaoImpl extends BaseCRUDDaoMybatis<MatterChargesEntity,Long> implements MatterChargesDao {
+
+
+
+}

single-matter/src/main/java/com/mortals/xhx/module/matter/dao/ibatis/MatterFlowlimitDaoImpl.java

+package com.mortals.xhx.module.matter.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.matter.dao.MatterFlowlimitDao;
+import com.mortals.xhx.module.matter.model.MatterFlowlimitEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 事项办理流程DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+@Repository("matterFlowlimitDao")
+public class MatterFlowlimitDaoImpl extends BaseCRUDDaoMybatis<MatterFlowlimitEntity,Long> implements MatterFlowlimitDao {
+
+
+
+}

single-matter/src/main/java/com/mortals/xhx/module/matter/dao/ibatis/MatterIntermediaryDaoImpl.java

+package com.mortals.xhx.module.matter.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.matter.dao.MatterIntermediaryDao;
+import com.mortals.xhx.module.matter.model.MatterIntermediaryEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 事项中介服务DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+@Repository("matterIntermediaryDao")
+public class MatterIntermediaryDaoImpl extends BaseCRUDDaoMybatis<MatterIntermediaryEntity,Long> implements MatterIntermediaryDao {
+
+
+
+}

single-matter/src/main/java/com/mortals/xhx/module/matter/dao/ibatis/MatterQuestionDaoImpl.java

+package com.mortals.xhx.module.matter.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.matter.dao.MatterQuestionDao;
+import com.mortals.xhx.module.matter.model.MatterQuestionEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 事项常见问题DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+@Repository("matterQuestionDao")
+public class MatterQuestionDaoImpl extends BaseCRUDDaoMybatis<MatterQuestionEntity,Long> implements MatterQuestionDao {
+
+
+
+}

single-matter/src/main/java/com/mortals/xhx/module/matter/dao/ibatis/MatterSetbaseDaoImpl.java

+package com.mortals.xhx.module.matter.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.matter.dao.MatterSetbaseDao;
+import com.mortals.xhx.module.matter.model.MatterSetbaseEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 事项设定依据DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+@Repository("matterSetbaseDao")
+public class MatterSetbaseDaoImpl extends BaseCRUDDaoMybatis<MatterSetbaseEntity,Long> implements MatterSetbaseDao {
+
+
+
+}

single-matter/src/main/java/com/mortals/xhx/module/matter/model/MatterAcceptEntity.java

+package com.mortals.xhx.module.matter.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.matter.model.vo.MatterAcceptVo;
+/**
+* 事项受理条件实体对象
+*
+* @author zxfei
+* @date 2022-11-16
+*/
+
+public class MatterAcceptEntity extends MatterAcceptVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 基础事项表id
+    */
+    private Long matterId;
+    /**
+    * 事项编码
+    */
+    private String matterCode;
+    /**
+    * 事项名称
+    */
+    private String matterName;
+    /**
+    * 受理条件
+    */
+    private String content;
+    /**
+    * 事项来源 (0.政务网，1.自定义)
+    */
+    private Integer source;
+
+
+
+    public MatterAcceptEntity(){}
+    /**
+    * 获取 基础事项表id
+    * @return Long
+    */
+    public Long getMatterId(){
+        return matterId;
+    }
+    /**
+    * 设置 基础事项表id
+    * @param matterId
+    */
+    public void setMatterId(Long matterId){
+        this.matterId = matterId;
+    }
+    /**
+    * 获取 事项编码
+    * @return String
+    */
+    public String getMatterCode(){
+        return matterCode;
+    }
+    /**
+    * 设置 事项编码
+    * @param matterCode
+    */
+    public void setMatterCode(String matterCode){
+        this.matterCode = matterCode;
+    }
+    /**
+    * 获取 事项名称
+    * @return String
+    */
+    public String getMatterName(){
+        return matterName;
+    }
+    /**
+    * 设置 事项名称
+    * @param matterName
+    */
+    public void setMatterName(String matterName){
+        this.matterName = matterName;
+    }
+    /**
+    * 获取 受理条件
+    * @return String
+    */
+    public String getContent(){
+        return content;
+    }
+    /**
+    * 设置 受理条件
+    * @param content
+    */
+    public void setContent(String content){
+        this.content = content;
+    }
+    /**
+    * 获取 事项来源 (0.政务网，1.自定义)
+    * @return Integer
+    */
+    public Integer getSource(){
+        return source;
+    }
+    /**
+    * 设置 事项来源 (0.政务网，1.自定义)
+    * @param source
+    */
+    public void setSource(Integer source){
+        this.source = source;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof MatterAcceptEntity) {
+            MatterAcceptEntity tmp = (MatterAcceptEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",matterId:").append(getMatterId());
+        sb.append(",matterCode:").append(getMatterCode());
+        sb.append(",matterName:").append(getMatterName());
+        sb.append(",content:").append(getContent());
+        sb.append(",source:").append(getSource());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.matterId = 0L;
+
+            this.matterCode = "";
+
+            this.matterName = "";
+
+            this.content = "";
+
+            this.source = 0;
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/model/MatterAcceptQuery.java

+package com.mortals.xhx.module.matter.model;
+
+import java.util.List;
+import com.mortals.xhx.module.matter.model.MatterAcceptEntity;
+/**
+* 事项受理条件查询对象
+*
+* @author zxfei
+* @date 2022-11-16
+*/
+public class MatterAcceptQuery extends MatterAcceptEntity {
+    /** 开始 主键，自增长 */
+    private Long idStart;
+
+    /** 结束 主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 主键，自增长 */
+    private Long idIncrement;
+
+    /** 主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 开始 基础事项表id */
+    private Long matterIdStart;
+
+    /** 结束 基础事项表id */
+    private Long matterIdEnd;
+
+    /** 增加 基础事项表id */
+    private Long matterIdIncrement;
+
+    /** 基础事项表id列表 */
+    private List <Long> matterIdList;
+
+    /** 事项编码 */
+    private List<String> matterCodeList;
+
+    /** 事项名称 */
+    private List<String> matterNameList;
+
+    /** 受理条件 */
+    private List<String> contentList;
+
+    /** 开始 事项来源 (0.政务网，1.自定义) */
+    private Integer sourceStart;
+
+    /** 结束 事项来源 (0.政务网，1.自定义) */
+    private Integer sourceEnd;
+
+    /** 增加 事项来源 (0.政务网，1.自定义) */
+    private Integer sourceIncrement;
+
+    /** 事项来源 (0.政务网，1.自定义)列表 */
+    private List <Integer> sourceList;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
+    /** 开始 修改时间 */
+    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<MatterAcceptQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<MatterAcceptQuery> andConditionList;
+
+    public MatterAcceptQuery(){}
+
+    /**
+    * 获取 开始 主键，自增长
+    * @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;
+    }
+
+    /**
+    * 获取 开始 基础事项表id
+    * @return matterIdStart
+    */
+    public Long getMatterIdStart(){
+        return this.matterIdStart;
+    }
+
+    /**
+    * 设置 开始 基础事项表id
+    * @param matterIdStart
+    */
+    public void setMatterIdStart(Long matterIdStart){
+        this.matterIdStart = matterIdStart;
+    }
+
+    /**
+    * 获取 结束 基础事项表id
+    * @return $matterIdEnd
+    */
+    public Long getMatterIdEnd(){
+        return this.matterIdEnd;
+    }
+
+    /**
+    * 设置 结束 基础事项表id
+    * @param matterIdEnd
+    */
+    public void setMatterIdEnd(Long matterIdEnd){
+        this.matterIdEnd = matterIdEnd;
+    }
+
+    /**
+    * 获取 增加 基础事项表id
+    * @return matterIdIncrement
+    */
+    public Long getMatterIdIncrement(){
+        return this.matterIdIncrement;
+    }
+
+    /**
+    * 设置 增加 基础事项表id
+    * @param matterIdIncrement
+    */
+    public void setMatterIdIncrement(Long matterIdIncrement){
+        this.matterIdIncrement = matterIdIncrement;
+    }
+
+    /**
+    * 获取 基础事项表id
+    * @return matterIdList
+    */
+    public List<Long> getMatterIdList(){
+        return this.matterIdList;
+    }
+
+    /**
+    * 设置 基础事项表id
+    * @param matterIdList
+    */
+    public void setMatterIdList(List<Long> matterIdList){
+        this.matterIdList = matterIdList;
+    }
+
+    /**
+    * 获取 事项编码
+    * @return matterCodeList
+    */
+    public List<String> getMatterCodeList(){
+        return this.matterCodeList;
+    }
+
+    /**
+    * 设置 事项编码
+    * @param matterCodeList
+    */
+    public void setMatterCodeList(List<String> matterCodeList){
+        this.matterCodeList = matterCodeList;
+    }
+    /**
+    * 获取 事项名称
+    * @return matterNameList
+    */
+    public List<String> getMatterNameList(){
+        return this.matterNameList;
+    }
+
+    /**
+    * 设置 事项名称
+    * @param matterNameList
+    */
+    public void setMatterNameList(List<String> matterNameList){
+        this.matterNameList = matterNameList;
+    }
+    /**
+    * 获取 受理条件
+    * @return contentList
+    */
+    public List<String> getContentList(){
+        return this.contentList;
+    }
+
+    /**
+    * 设置 受理条件
+    * @param contentList
+    */
+    public void setContentList(List<String> contentList){
+        this.contentList = contentList;
+    }
+    /**
+    * 获取 开始 事项来源 (0.政务网，1.自定义)
+    * @return sourceStart
+    */
+    public Integer getSourceStart(){
+        return this.sourceStart;
+    }
+
+    /**
+    * 设置 开始 事项来源 (0.政务网，1.自定义)
+    * @param sourceStart
+    */
+    public void setSourceStart(Integer sourceStart){
+        this.sourceStart = sourceStart;
+    }
+
+    /**
+    * 获取 结束 事项来源 (0.政务网，1.自定义)
+    * @return $sourceEnd
+    */
+    public Integer getSourceEnd(){
+        return this.sourceEnd;
+    }
+
+    /**
+    * 设置 结束 事项来源 (0.政务网，1.自定义)
+    * @param sourceEnd
+    */
+    public void setSourceEnd(Integer sourceEnd){
+        this.sourceEnd = sourceEnd;
+    }
+
+    /**
+    * 获取 增加 事项来源 (0.政务网，1.自定义)
+    * @return sourceIncrement
+    */
+    public Integer getSourceIncrement(){
+        return this.sourceIncrement;
+    }
+
+    /**
+    * 设置 增加 事项来源 (0.政务网，1.自定义)
+    * @param sourceIncrement
+    */
+    public void setSourceIncrement(Integer sourceIncrement){
+        this.sourceIncrement = sourceIncrement;
+    }
+
+    /**
+    * 获取 事项来源 (0.政务网，1.自定义)
+    * @return sourceList
+    */
+    public List<Integer> getSourceList(){
+        return this.sourceList;
+    }
+
+    /**
+    * 设置 事项来源 (0.政务网，1.自定义)
+    * @param sourceList
+    */
+    public void setSourceList(List<Integer> sourceList){
+        this.sourceList = sourceList;
+    }
+
+    /**
+    * 获取 开始 创建时间
+    * @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 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 MatterAcceptQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 主键，自增长
+    * @param idStart
+    */
+    public MatterAcceptQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 主键，自增长
+    * @param idEnd
+    */
+    public MatterAcceptQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 主键，自增长
+    * @param idIncrement
+    */
+    public MatterAcceptQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 主键，自增长
+    * @param idList
+    */
+    public MatterAcceptQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+    /**
+    * 设置  基础事项表id
+    * @param matterId
+    */
+    public MatterAcceptQuery matterId(Long matterId){
+	    setMatterId(matterId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 基础事项表id
+    * @param matterIdStart
+    */
+    public MatterAcceptQuery matterIdStart(Long matterIdStart){
+		this.matterIdStart = matterIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 基础事项表id
+    * @param matterIdEnd
+    */
+    public MatterAcceptQuery matterIdEnd(Long matterIdEnd){
+		this.matterIdEnd = matterIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 基础事项表id
+    * @param matterIdIncrement
+    */
+    public MatterAcceptQuery matterIdIncrement(Long matterIdIncrement){
+		this.matterIdIncrement = matterIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 基础事项表id
+    * @param matterIdList
+    */
+    public MatterAcceptQuery matterIdList(List<Long> matterIdList){
+        this.matterIdList = matterIdList;
+		return this;
+        }
+
+
+	/**
+    * 设置 事项编码
+    * @param matterCode
+    */
+    public MatterAcceptQuery matterCode(String matterCode){
+        setMatterCode(matterCode);
+		return this;
+    }
+
+    /**
+    * 设置 事项编码
+    * @param matterCodeList
+    */
+    public MatterAcceptQuery matterCodeList(List<String> matterCodeList){
+        this.matterCodeList = matterCodeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 事项名称
+    * @param matterName
+    */
+    public MatterAcceptQuery matterName(String matterName){
+        setMatterName(matterName);
+		return this;
+    }
+
+    /**
+    * 设置 事项名称
+    * @param matterNameList
+    */
+    public MatterAcceptQuery matterNameList(List<String> matterNameList){
+        this.matterNameList = matterNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 受理条件
+    * @param content
+    */
+    public MatterAcceptQuery content(String content){
+        setContent(content);
+		return this;
+    }
+
+    /**
+    * 设置 受理条件
+    * @param contentList
+    */
+    public MatterAcceptQuery contentList(List<String> contentList){
+        this.contentList = contentList;
+		return this;
+    }
+
+    /**
+    * 设置  事项来源 (0.政务网，1.自定义)
+    * @param source
+    */
+    public MatterAcceptQuery source(Integer source){
+	    setSource(source);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 事项来源 (0.政务网，1.自定义)
+    * @param sourceStart
+    */
+    public MatterAcceptQuery sourceStart(Integer sourceStart){
+		this.sourceStart = sourceStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 事项来源 (0.政务网，1.自定义)
+    * @param sourceEnd
+    */
+    public MatterAcceptQuery sourceEnd(Integer sourceEnd){
+		this.sourceEnd = sourceEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 事项来源 (0.政务网，1.自定义)
+    * @param sourceIncrement
+    */
+    public MatterAcceptQuery sourceIncrement(Integer sourceIncrement){
+		this.sourceIncrement = sourceIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 事项来源 (0.政务网，1.自定义)
+    * @param sourceList
+    */
+    public MatterAcceptQuery sourceList(List<Integer> sourceList){
+        this.sourceList = sourceList;
+		return this;
+        }
+
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public MatterAcceptQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public MatterAcceptQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public MatterAcceptQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public MatterAcceptQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public MatterAcceptQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<MatterAcceptQuery> 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<MatterAcceptQuery> 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<MatterAcceptQuery> 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<MatterAcceptQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/model/MatterChargesEntity.java

+package com.mortals.xhx.module.matter.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.matter.model.vo.MatterChargesVo;
+/**
+* 事项收费标准实体对象
+*
+* @author zxfei
+* @date 2022-11-16
+*/
+
+public class MatterChargesEntity extends MatterChargesVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 事项基础表matter id
+    */
+    private Long matterId;
+    /**
+    * 事项编码
+    */
+    private String matterCode;
+    /**
+    * 事项名称
+    */
+    private String matterName;
+    /**
+    * 收费标准
+    */
+    private String content;
+    /**
+    * 事项来源，(0.政务网，1.自定义)
+    */
+    private Integer source;
+
+
+
+    public MatterChargesEntity(){}
+    /**
+    * 获取 事项基础表matter id
+    * @return Long
+    */
+    public Long getMatterId(){
+        return matterId;
+    }
+    /**
+    * 设置 事项基础表matter id
+    * @param matterId
+    */
+    public void setMatterId(Long matterId){
+        this.matterId = matterId;
+    }
+    /**
+    * 获取 事项编码
+    * @return String
+    */
+    public String getMatterCode(){
+        return matterCode;
+    }
+    /**
+    * 设置 事项编码
+    * @param matterCode
+    */
+    public void setMatterCode(String matterCode){
+        this.matterCode = matterCode;
+    }
+    /**
+    * 获取 事项名称
+    * @return String
+    */
+    public String getMatterName(){
+        return matterName;
+    }
+    /**
+    * 设置 事项名称
+    * @param matterName
+    */
+    public void setMatterName(String matterName){
+        this.matterName = matterName;
+    }
+    /**
+    * 获取 收费标准
+    * @return String
+    */
+    public String getContent(){
+        return content;
+    }
+    /**
+    * 设置 收费标准
+    * @param content
+    */
+    public void setContent(String content){
+        this.content = content;
+    }
+    /**
+    * 获取 事项来源，(0.政务网，1.自定义)
+    * @return Integer
+    */
+    public Integer getSource(){
+        return source;
+    }
+    /**
+    * 设置 事项来源，(0.政务网，1.自定义)
+    * @param source
+    */
+    public void setSource(Integer source){
+        this.source = source;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof MatterChargesEntity) {
+            MatterChargesEntity tmp = (MatterChargesEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",matterId:").append(getMatterId());
+        sb.append(",matterCode:").append(getMatterCode());
+        sb.append(",matterName:").append(getMatterName());
+        sb.append(",content:").append(getContent());
+        sb.append(",source:").append(getSource());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.matterId = 0L;
+
+            this.matterCode = "";
+
+            this.matterName = "";
+
+            this.content = "";
+
+            this.source = 0;
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/model/MatterChargesQuery.java

+package com.mortals.xhx.module.matter.model;
+
+import java.util.List;
+import com.mortals.xhx.module.matter.model.MatterChargesEntity;
+/**
+* 事项收费标准查询对象
+*
+* @author zxfei
+* @date 2022-11-16
+*/
+public class MatterChargesQuery extends MatterChargesEntity {
+    /** 开始 主键，自增长 */
+    private Long idStart;
+
+    /** 结束 主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 主键，自增长 */
+    private Long idIncrement;
+
+    /** 主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 开始 事项基础表matter id */
+    private Long matterIdStart;
+
+    /** 结束 事项基础表matter id */
+    private Long matterIdEnd;
+
+    /** 增加 事项基础表matter id */
+    private Long matterIdIncrement;
+
+    /** 事项基础表matter id列表 */
+    private List <Long> matterIdList;
+
+    /** 事项编码 */
+    private List<String> matterCodeList;
+
+    /** 事项名称 */
+    private List<String> matterNameList;
+
+    /** 收费标准 */
+    private List<String> contentList;
+
+    /** 开始 事项来源，(0.政务网，1.自定义) */
+    private Integer sourceStart;
+
+    /** 结束 事项来源，(0.政务网，1.自定义) */
+    private Integer sourceEnd;
+
+    /** 增加 事项来源，(0.政务网，1.自定义) */
+    private Integer sourceIncrement;
+
+    /** 事项来源，(0.政务网，1.自定义)列表 */
+    private List <Integer> sourceList;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
+    /** 开始 修改时间 */
+    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<MatterChargesQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<MatterChargesQuery> andConditionList;
+
+    public MatterChargesQuery(){}
+
+    /**
+    * 获取 开始 主键，自增长
+    * @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;
+    }
+
+    /**
+    * 获取 开始 事项基础表matter id
+    * @return matterIdStart
+    */
+    public Long getMatterIdStart(){
+        return this.matterIdStart;
+    }
+
+    /**
+    * 设置 开始 事项基础表matter id
+    * @param matterIdStart
+    */
+    public void setMatterIdStart(Long matterIdStart){
+        this.matterIdStart = matterIdStart;
+    }
+
+    /**
+    * 获取 结束 事项基础表matter id
+    * @return $matterIdEnd
+    */
+    public Long getMatterIdEnd(){
+        return this.matterIdEnd;
+    }
+
+    /**
+    * 设置 结束 事项基础表matter id
+    * @param matterIdEnd
+    */
+    public void setMatterIdEnd(Long matterIdEnd){
+        this.matterIdEnd = matterIdEnd;
+    }
+
+    /**
+    * 获取 增加 事项基础表matter id
+    * @return matterIdIncrement
+    */
+    public Long getMatterIdIncrement(){
+        return this.matterIdIncrement;
+    }
+
+    /**
+    * 设置 增加 事项基础表matter id
+    * @param matterIdIncrement
+    */
+    public void setMatterIdIncrement(Long matterIdIncrement){
+        this.matterIdIncrement = matterIdIncrement;
+    }
+
+    /**
+    * 获取 事项基础表matter id
+    * @return matterIdList
+    */
+    public List<Long> getMatterIdList(){
+        return this.matterIdList;
+    }
+
+    /**
+    * 设置 事项基础表matter id
+    * @param matterIdList
+    */
+    public void setMatterIdList(List<Long> matterIdList){
+        this.matterIdList = matterIdList;
+    }
+
+    /**
+    * 获取 事项编码
+    * @return matterCodeList
+    */
+    public List<String> getMatterCodeList(){
+        return this.matterCodeList;
+    }
+
+    /**
+    * 设置 事项编码
+    * @param matterCodeList
+    */
+    public void setMatterCodeList(List<String> matterCodeList){
+        this.matterCodeList = matterCodeList;
+    }
+    /**
+    * 获取 事项名称
+    * @return matterNameList
+    */
+    public List<String> getMatterNameList(){
+        return this.matterNameList;
+    }
+
+    /**
+    * 设置 事项名称
+    * @param matterNameList
+    */
+    public void setMatterNameList(List<String> matterNameList){
+        this.matterNameList = matterNameList;
+    }
+    /**
+    * 获取 收费标准
+    * @return contentList
+    */
+    public List<String> getContentList(){
+        return this.contentList;
+    }
+
+    /**
+    * 设置 收费标准
+    * @param contentList
+    */
+    public void setContentList(List<String> contentList){
+        this.contentList = contentList;
+    }
+    /**
+    * 获取 开始 事项来源，(0.政务网，1.自定义)
+    * @return sourceStart
+    */
+    public Integer getSourceStart(){
+        return this.sourceStart;
+    }
+
+    /**
+    * 设置 开始 事项来源，(0.政务网，1.自定义)
+    * @param sourceStart
+    */
+    public void setSourceStart(Integer sourceStart){
+        this.sourceStart = sourceStart;
+    }
+
+    /**
+    * 获取 结束 事项来源，(0.政务网，1.自定义)
+    * @return $sourceEnd
+    */
+    public Integer getSourceEnd(){
+        return this.sourceEnd;
+    }
+
+    /**
+    * 设置 结束 事项来源，(0.政务网，1.自定义)
+    * @param sourceEnd
+    */
+    public void setSourceEnd(Integer sourceEnd){
+        this.sourceEnd = sourceEnd;
+    }
+
+    /**
+    * 获取 增加 事项来源，(0.政务网，1.自定义)
+    * @return sourceIncrement
+    */
+    public Integer getSourceIncrement(){
+        return this.sourceIncrement;
+    }
+
+    /**
+    * 设置 增加 事项来源，(0.政务网，1.自定义)
+    * @param sourceIncrement
+    */
+    public void setSourceIncrement(Integer sourceIncrement){
+        this.sourceIncrement = sourceIncrement;
+    }
+
+    /**
+    * 获取 事项来源，(0.政务网，1.自定义)
+    * @return sourceList
+    */
+    public List<Integer> getSourceList(){
+        return this.sourceList;
+    }
+
+    /**
+    * 设置 事项来源，(0.政务网，1.自定义)
+    * @param sourceList
+    */
+    public void setSourceList(List<Integer> sourceList){
+        this.sourceList = sourceList;
+    }
+
+    /**
+    * 获取 开始 创建时间
+    * @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 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 MatterChargesQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 主键，自增长
+    * @param idStart
+    */
+    public MatterChargesQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 主键，自增长
+    * @param idEnd
+    */
+    public MatterChargesQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 主键，自增长
+    * @param idIncrement
+    */
+    public MatterChargesQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 主键，自增长
+    * @param idList
+    */
+    public MatterChargesQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+    /**
+    * 设置  事项基础表matter id
+    * @param matterId
+    */
+    public MatterChargesQuery matterId(Long matterId){
+	    setMatterId(matterId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 事项基础表matter id
+    * @param matterIdStart
+    */
+    public MatterChargesQuery matterIdStart(Long matterIdStart){
+		this.matterIdStart = matterIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 事项基础表matter id
+    * @param matterIdEnd
+    */
+    public MatterChargesQuery matterIdEnd(Long matterIdEnd){
+		this.matterIdEnd = matterIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 事项基础表matter id
+    * @param matterIdIncrement
+    */
+    public MatterChargesQuery matterIdIncrement(Long matterIdIncrement){
+		this.matterIdIncrement = matterIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 事项基础表matter id
+    * @param matterIdList
+    */
+    public MatterChargesQuery matterIdList(List<Long> matterIdList){
+        this.matterIdList = matterIdList;
+		return this;
+        }
+
+
+	/**
+    * 设置 事项编码
+    * @param matterCode
+    */
+    public MatterChargesQuery matterCode(String matterCode){
+        setMatterCode(matterCode);
+		return this;
+    }
+
+    /**
+    * 设置 事项编码
+    * @param matterCodeList
+    */
+    public MatterChargesQuery matterCodeList(List<String> matterCodeList){
+        this.matterCodeList = matterCodeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 事项名称
+    * @param matterName
+    */
+    public MatterChargesQuery matterName(String matterName){
+        setMatterName(matterName);
+		return this;
+    }
+
+    /**
+    * 设置 事项名称
+    * @param matterNameList
+    */
+    public MatterChargesQuery matterNameList(List<String> matterNameList){
+        this.matterNameList = matterNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 收费标准
+    * @param content
+    */
+    public MatterChargesQuery content(String content){
+        setContent(content);
+		return this;
+    }
+
+    /**
+    * 设置 收费标准
+    * @param contentList
+    */
+    public MatterChargesQuery contentList(List<String> contentList){
+        this.contentList = contentList;
+		return this;
+    }
+
+    /**
+    * 设置  事项来源，(0.政务网，1.自定义)
+    * @param source
+    */
+    public MatterChargesQuery source(Integer source){
+	    setSource(source);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 事项来源，(0.政务网，1.自定义)
+    * @param sourceStart
+    */
+    public MatterChargesQuery sourceStart(Integer sourceStart){
+		this.sourceStart = sourceStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 事项来源，(0.政务网，1.自定义)
+    * @param sourceEnd
+    */
+    public MatterChargesQuery sourceEnd(Integer sourceEnd){
+		this.sourceEnd = sourceEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 事项来源，(0.政务网，1.自定义)
+    * @param sourceIncrement
+    */
+    public MatterChargesQuery sourceIncrement(Integer sourceIncrement){
+		this.sourceIncrement = sourceIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 事项来源，(0.政务网，1.自定义)
+    * @param sourceList
+    */
+    public MatterChargesQuery sourceList(List<Integer> sourceList){
+        this.sourceList = sourceList;
+		return this;
+        }
+
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public MatterChargesQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public MatterChargesQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public MatterChargesQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public MatterChargesQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public MatterChargesQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<MatterChargesQuery> 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<MatterChargesQuery> 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<MatterChargesQuery> 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<MatterChargesQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/model/MatterFlowlimitEntity.java

+package com.mortals.xhx.module.matter.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.matter.model.vo.MatterFlowlimitVo;
+/**
+* 事项办理流程实体对象
+*
+* @author zxfei
+* @date 2022-11-16
+*/
+
+public class MatterFlowlimitEntity extends MatterFlowlimitVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 事项基础表id
+    */
+    private Long matterId;
+    /**
+    * 事项编码
+    */
+    private String matterCode;
+    /**
+    * 事项名称
+    */
+    private String matterName;
+    /**
+    * 办理流程
+    */
+    private String flowName;
+    /**
+    * 办理时长
+    */
+    private String flowTime;
+    /**
+    * 转外时限
+    */
+    private String flowLimit;
+    /**
+    * 办理流程说明
+    */
+    private String flowDesc;
+    /**
+    * 事项来源(0.政务网，1.自定义)
+    */
+    private Integer source;
+
+
+
+    public MatterFlowlimitEntity(){}
+    /**
+    * 获取 事项基础表id
+    * @return Long
+    */
+    public Long getMatterId(){
+        return matterId;
+    }
+    /**
+    * 设置 事项基础表id
+    * @param matterId
+    */
+    public void setMatterId(Long matterId){
+        this.matterId = matterId;
+    }
+    /**
+    * 获取 事项编码
+    * @return String
+    */
+    public String getMatterCode(){
+        return matterCode;
+    }
+    /**
+    * 设置 事项编码
+    * @param matterCode
+    */
+    public void setMatterCode(String matterCode){
+        this.matterCode = matterCode;
+    }
+    /**
+    * 获取 事项名称
+    * @return String
+    */
+    public String getMatterName(){
+        return matterName;
+    }
+    /**
+    * 设置 事项名称
+    * @param matterName
+    */
+    public void setMatterName(String matterName){
+        this.matterName = matterName;
+    }
+    /**
+    * 获取 办理流程
+    * @return String
+    */
+    public String getFlowName(){
+        return flowName;
+    }
+    /**
+    * 设置 办理流程
+    * @param flowName
+    */
+    public void setFlowName(String flowName){
+        this.flowName = flowName;
+    }
+    /**
+    * 获取 办理时长
+    * @return String
+    */
+    public String getFlowTime(){
+        return flowTime;
+    }
+    /**
+    * 设置 办理时长
+    * @param flowTime
+    */
+    public void setFlowTime(String flowTime){
+        this.flowTime = flowTime;
+    }
+    /**
+    * 获取 转外时限
+    * @return String
+    */
+    public String getFlowLimit(){
+        return flowLimit;
+    }
+    /**
+    * 设置 转外时限
+    * @param flowLimit
+    */
+    public void setFlowLimit(String flowLimit){
+        this.flowLimit = flowLimit;
+    }
+    /**
+    * 获取 办理流程说明
+    * @return String
+    */
+    public String getFlowDesc(){
+        return flowDesc;
+    }
+    /**
+    * 设置 办理流程说明
+    * @param flowDesc
+    */
+    public void setFlowDesc(String flowDesc){
+        this.flowDesc = flowDesc;
+    }
+    /**
+    * 获取 事项来源(0.政务网，1.自定义)
+    * @return Integer
+    */
+    public Integer getSource(){
+        return source;
+    }
+    /**
+    * 设置 事项来源(0.政务网，1.自定义)
+    * @param source
+    */
+    public void setSource(Integer source){
+        this.source = source;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof MatterFlowlimitEntity) {
+            MatterFlowlimitEntity tmp = (MatterFlowlimitEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",matterId:").append(getMatterId());
+        sb.append(",matterCode:").append(getMatterCode());
+        sb.append(",matterName:").append(getMatterName());
+        sb.append(",flowName:").append(getFlowName());
+        sb.append(",flowTime:").append(getFlowTime());
+        sb.append(",flowLimit:").append(getFlowLimit());
+        sb.append(",flowDesc:").append(getFlowDesc());
+        sb.append(",source:").append(getSource());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.matterId = 0L;
+
+            this.matterCode = "";
+
+            this.matterName = "";
+
+            this.flowName = "";
+
+            this.flowTime = "";
+
+            this.flowLimit = "";
+
+            this.flowDesc = "";
+
+            this.source = 0;
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/model/MatterFlowlimitQuery.java

+package com.mortals.xhx.module.matter.model;
+
+import java.util.List;
+import com.mortals.xhx.module.matter.model.MatterFlowlimitEntity;
+/**
+* 事项办理流程查询对象
+*
+* @author zxfei
+* @date 2022-11-16
+*/
+public class MatterFlowlimitQuery extends MatterFlowlimitEntity {
+    /** 开始 主键，自增长 */
+    private Long idStart;
+
+    /** 结束 主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 主键，自增长 */
+    private Long idIncrement;
+
+    /** 主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 开始 事项基础表id */
+    private Long matterIdStart;
+
+    /** 结束 事项基础表id */
+    private Long matterIdEnd;
+
+    /** 增加 事项基础表id */
+    private Long matterIdIncrement;
+
+    /** 事项基础表id列表 */
+    private List <Long> matterIdList;
+
+    /** 事项编码 */
+    private List<String> matterCodeList;
+
+    /** 事项名称 */
+    private List<String> matterNameList;
+
+    /** 办理流程 */
+    private List<String> flowNameList;
+
+    /** 办理时长 */
+    private List<String> flowTimeList;
+
+    /** 转外时限 */
+    private List<String> flowLimitList;
+
+    /** 办理流程说明 */
+    private List<String> flowDescList;
+
+    /** 开始 事项来源(0.政务网，1.自定义) */
+    private Integer sourceStart;
+
+    /** 结束 事项来源(0.政务网，1.自定义) */
+    private Integer sourceEnd;
+
+    /** 增加 事项来源(0.政务网，1.自定义) */
+    private Integer sourceIncrement;
+
+    /** 事项来源(0.政务网，1.自定义)列表 */
+    private List <Integer> sourceList;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
+    /** 开始 修改时间 */
+    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<MatterFlowlimitQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<MatterFlowlimitQuery> andConditionList;
+
+    public MatterFlowlimitQuery(){}
+
+    /**
+    * 获取 开始 主键，自增长
+    * @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;
+    }
+
+    /**
+    * 获取 开始 事项基础表id
+    * @return matterIdStart
+    */
+    public Long getMatterIdStart(){
+        return this.matterIdStart;
+    }
+
+    /**
+    * 设置 开始 事项基础表id
+    * @param matterIdStart
+    */
+    public void setMatterIdStart(Long matterIdStart){
+        this.matterIdStart = matterIdStart;
+    }
+
+    /**
+    * 获取 结束 事项基础表id
+    * @return $matterIdEnd
+    */
+    public Long getMatterIdEnd(){
+        return this.matterIdEnd;
+    }
+
+    /**
+    * 设置 结束 事项基础表id
+    * @param matterIdEnd
+    */
+    public void setMatterIdEnd(Long matterIdEnd){
+        this.matterIdEnd = matterIdEnd;
+    }
+
+    /**
+    * 获取 增加 事项基础表id
+    * @return matterIdIncrement
+    */
+    public Long getMatterIdIncrement(){
+        return this.matterIdIncrement;
+    }
+
+    /**
+    * 设置 增加 事项基础表id
+    * @param matterIdIncrement
+    */
+    public void setMatterIdIncrement(Long matterIdIncrement){
+        this.matterIdIncrement = matterIdIncrement;
+    }
+
+    /**
+    * 获取 事项基础表id
+    * @return matterIdList
+    */
+    public List<Long> getMatterIdList(){
+        return this.matterIdList;
+    }
+
+    /**
+    * 设置 事项基础表id
+    * @param matterIdList
+    */
+    public void setMatterIdList(List<Long> matterIdList){
+        this.matterIdList = matterIdList;
+    }
+
+    /**
+    * 获取 事项编码
+    * @return matterCodeList
+    */
+    public List<String> getMatterCodeList(){
+        return this.matterCodeList;
+    }
+
+    /**
+    * 设置 事项编码
+    * @param matterCodeList
+    */
+    public void setMatterCodeList(List<String> matterCodeList){
+        this.matterCodeList = matterCodeList;
+    }
+    /**
+    * 获取 事项名称
+    * @return matterNameList
+    */
+    public List<String> getMatterNameList(){
+        return this.matterNameList;
+    }
+
+    /**
+    * 设置 事项名称
+    * @param matterNameList
+    */
+    public void setMatterNameList(List<String> matterNameList){
+        this.matterNameList = matterNameList;
+    }
+    /**
+    * 获取 办理流程
+    * @return flowNameList
+    */
+    public List<String> getFlowNameList(){
+        return this.flowNameList;
+    }
+
+    /**
+    * 设置 办理流程
+    * @param flowNameList
+    */
+    public void setFlowNameList(List<String> flowNameList){
+        this.flowNameList = flowNameList;
+    }
+    /**
+    * 获取 办理时长
+    * @return flowTimeList
+    */
+    public List<String> getFlowTimeList(){
+        return this.flowTimeList;
+    }
+
+    /**
+    * 设置 办理时长
+    * @param flowTimeList
+    */
+    public void setFlowTimeList(List<String> flowTimeList){
+        this.flowTimeList = flowTimeList;
+    }
+    /**
+    * 获取 转外时限
+    * @return flowLimitList
+    */
+    public List<String> getFlowLimitList(){
+        return this.flowLimitList;
+    }
+
+    /**
+    * 设置 转外时限
+    * @param flowLimitList
+    */
+    public void setFlowLimitList(List<String> flowLimitList){
+        this.flowLimitList = flowLimitList;
+    }
+    /**
+    * 获取 办理流程说明
+    * @return flowDescList
+    */
+    public List<String> getFlowDescList(){
+        return this.flowDescList;
+    }
+
+    /**
+    * 设置 办理流程说明
+    * @param flowDescList
+    */
+    public void setFlowDescList(List<String> flowDescList){
+        this.flowDescList = flowDescList;
+    }
+    /**
+    * 获取 开始 事项来源(0.政务网，1.自定义)
+    * @return sourceStart
+    */
+    public Integer getSourceStart(){
+        return this.sourceStart;
+    }
+
+    /**
+    * 设置 开始 事项来源(0.政务网，1.自定义)
+    * @param sourceStart
+    */
+    public void setSourceStart(Integer sourceStart){
+        this.sourceStart = sourceStart;
+    }
+
+    /**
+    * 获取 结束 事项来源(0.政务网，1.自定义)
+    * @return $sourceEnd
+    */
+    public Integer getSourceEnd(){
+        return this.sourceEnd;
+    }
+
+    /**
+    * 设置 结束 事项来源(0.政务网，1.自定义)
+    * @param sourceEnd
+    */
+    public void setSourceEnd(Integer sourceEnd){
+        this.sourceEnd = sourceEnd;
+    }
+
+    /**
+    * 获取 增加 事项来源(0.政务网，1.自定义)
+    * @return sourceIncrement
+    */
+    public Integer getSourceIncrement(){
+        return this.sourceIncrement;
+    }
+
+    /**
+    * 设置 增加 事项来源(0.政务网，1.自定义)
+    * @param sourceIncrement
+    */
+    public void setSourceIncrement(Integer sourceIncrement){
+        this.sourceIncrement = sourceIncrement;
+    }
+
+    /**
+    * 获取 事项来源(0.政务网，1.自定义)
+    * @return sourceList
+    */
+    public List<Integer> getSourceList(){
+        return this.sourceList;
+    }
+
+    /**
+    * 设置 事项来源(0.政务网，1.自定义)
+    * @param sourceList
+    */
+    public void setSourceList(List<Integer> sourceList){
+        this.sourceList = sourceList;
+    }
+
+    /**
+    * 获取 开始 创建时间
+    * @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 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 MatterFlowlimitQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 主键，自增长
+    * @param idStart
+    */
+    public MatterFlowlimitQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 主键，自增长
+    * @param idEnd
+    */
+    public MatterFlowlimitQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 主键，自增长
+    * @param idIncrement
+    */
+    public MatterFlowlimitQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 主键，自增长
+    * @param idList
+    */
+    public MatterFlowlimitQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+    /**
+    * 设置  事项基础表id
+    * @param matterId
+    */
+    public MatterFlowlimitQuery matterId(Long matterId){
+	    setMatterId(matterId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 事项基础表id
+    * @param matterIdStart
+    */
+    public MatterFlowlimitQuery matterIdStart(Long matterIdStart){
+		this.matterIdStart = matterIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 事项基础表id
+    * @param matterIdEnd
+    */
+    public MatterFlowlimitQuery matterIdEnd(Long matterIdEnd){
+		this.matterIdEnd = matterIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 事项基础表id
+    * @param matterIdIncrement
+    */
+    public MatterFlowlimitQuery matterIdIncrement(Long matterIdIncrement){
+		this.matterIdIncrement = matterIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 事项基础表id
+    * @param matterIdList
+    */
+    public MatterFlowlimitQuery matterIdList(List<Long> matterIdList){
+        this.matterIdList = matterIdList;
+		return this;
+        }
+
+
+	/**
+    * 设置 事项编码
+    * @param matterCode
+    */
+    public MatterFlowlimitQuery matterCode(String matterCode){
+        setMatterCode(matterCode);
+		return this;
+    }
+
+    /**
+    * 设置 事项编码
+    * @param matterCodeList
+    */
+    public MatterFlowlimitQuery matterCodeList(List<String> matterCodeList){
+        this.matterCodeList = matterCodeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 事项名称
+    * @param matterName
+    */
+    public MatterFlowlimitQuery matterName(String matterName){
+        setMatterName(matterName);
+		return this;
+    }
+
+    /**
+    * 设置 事项名称
+    * @param matterNameList
+    */
+    public MatterFlowlimitQuery matterNameList(List<String> matterNameList){
+        this.matterNameList = matterNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 办理流程
+    * @param flowName
+    */
+    public MatterFlowlimitQuery flowName(String flowName){
+        setFlowName(flowName);
+		return this;
+    }
+
+    /**
+    * 设置 办理流程
+    * @param flowNameList
+    */
+    public MatterFlowlimitQuery flowNameList(List<String> flowNameList){
+        this.flowNameList = flowNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 办理时长
+    * @param flowTime
+    */
+    public MatterFlowlimitQuery flowTime(String flowTime){
+        setFlowTime(flowTime);
+		return this;
+    }
+
+    /**
+    * 设置 办理时长
+    * @param flowTimeList
+    */
+    public MatterFlowlimitQuery flowTimeList(List<String> flowTimeList){
+        this.flowTimeList = flowTimeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 转外时限
+    * @param flowLimit
+    */
+    public MatterFlowlimitQuery flowLimit(String flowLimit){
+        setFlowLimit(flowLimit);
+		return this;
+    }
+
+    /**
+    * 设置 转外时限
+    * @param flowLimitList
+    */
+    public MatterFlowlimitQuery flowLimitList(List<String> flowLimitList){
+        this.flowLimitList = flowLimitList;
+		return this;
+    }
+
+
+	/**
+    * 设置 办理流程说明
+    * @param flowDesc
+    */
+    public MatterFlowlimitQuery flowDesc(String flowDesc){
+        setFlowDesc(flowDesc);
+		return this;
+    }
+
+    /**
+    * 设置 办理流程说明
+    * @param flowDescList
+    */
+    public MatterFlowlimitQuery flowDescList(List<String> flowDescList){
+        this.flowDescList = flowDescList;
+		return this;
+    }
+
+    /**
+    * 设置  事项来源(0.政务网，1.自定义)
+    * @param source
+    */
+    public MatterFlowlimitQuery source(Integer source){
+	    setSource(source);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 事项来源(0.政务网，1.自定义)
+    * @param sourceStart
+    */
+    public MatterFlowlimitQuery sourceStart(Integer sourceStart){
+		this.sourceStart = sourceStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 事项来源(0.政务网，1.自定义)
+    * @param sourceEnd
+    */
+    public MatterFlowlimitQuery sourceEnd(Integer sourceEnd){
+		this.sourceEnd = sourceEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 事项来源(0.政务网，1.自定义)
+    * @param sourceIncrement
+    */
+    public MatterFlowlimitQuery sourceIncrement(Integer sourceIncrement){
+		this.sourceIncrement = sourceIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 事项来源(0.政务网，1.自定义)
+    * @param sourceList
+    */
+    public MatterFlowlimitQuery sourceList(List<Integer> sourceList){
+        this.sourceList = sourceList;
+		return this;
+        }
+
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public MatterFlowlimitQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public MatterFlowlimitQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public MatterFlowlimitQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public MatterFlowlimitQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public MatterFlowlimitQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<MatterFlowlimitQuery> 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<MatterFlowlimitQuery> 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<MatterFlowlimitQuery> 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<MatterFlowlimitQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/model/MatterIntermediaryEntity.java

+package com.mortals.xhx.module.matter.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.matter.model.vo.MatterIntermediaryVo;
+/**
+* 事项中介服务实体对象
+*
+* @author zxfei
+* @date 2022-11-16
+*/
+
+public class MatterIntermediaryEntity extends MatterIntermediaryVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 事项matter id
+    */
+    private Long matterId;
+    /**
+    * 事项编码
+    */
+    private String matterCode;
+    /**
+    * 事项名称
+    */
+    private String matterName;
+    /**
+    * 中介服务事项名称
+    */
+    private String title;
+    /**
+    * 中介服务实施机构及资质资格要求
+    */
+    private String intermediaryRequest;
+    /**
+    * 服务时限
+    */
+    private String intermediaryRequestTime;
+    /**
+    * 内容
+    */
+    private String remark;
+    /**
+    * 事项来源，(0.政务网，1.自定义)
+    */
+    private Integer source;
+
+
+
+    public MatterIntermediaryEntity(){}
+    /**
+    * 获取 事项matter id
+    * @return Long
+    */
+    public Long getMatterId(){
+        return matterId;
+    }
+    /**
+    * 设置 事项matter id
+    * @param matterId
+    */
+    public void setMatterId(Long matterId){
+        this.matterId = matterId;
+    }
+    /**
+    * 获取 事项编码
+    * @return String
+    */
+    public String getMatterCode(){
+        return matterCode;
+    }
+    /**
+    * 设置 事项编码
+    * @param matterCode
+    */
+    public void setMatterCode(String matterCode){
+        this.matterCode = matterCode;
+    }
+    /**
+    * 获取 事项名称
+    * @return String
+    */
+    public String getMatterName(){
+        return matterName;
+    }
+    /**
+    * 设置 事项名称
+    * @param matterName
+    */
+    public void setMatterName(String matterName){
+        this.matterName = matterName;
+    }
+    /**
+    * 获取 中介服务事项名称
+    * @return String
+    */
+    public String getTitle(){
+        return title;
+    }
+    /**
+    * 设置 中介服务事项名称
+    * @param title
+    */
+    public void setTitle(String title){
+        this.title = title;
+    }
+    /**
+    * 获取 中介服务实施机构及资质资格要求
+    * @return String
+    */
+    public String getIntermediaryRequest(){
+        return intermediaryRequest;
+    }
+    /**
+    * 设置 中介服务实施机构及资质资格要求
+    * @param intermediaryRequest
+    */
+    public void setIntermediaryRequest(String intermediaryRequest){
+        this.intermediaryRequest = intermediaryRequest;
+    }
+    /**
+    * 获取 服务时限
+    * @return String
+    */
+    public String getIntermediaryRequestTime(){
+        return intermediaryRequestTime;
+    }
+    /**
+    * 设置 服务时限
+    * @param intermediaryRequestTime
+    */
+    public void setIntermediaryRequestTime(String intermediaryRequestTime){
+        this.intermediaryRequestTime = intermediaryRequestTime;
+    }
+    /**
+    * 获取 内容
+    * @return String
+    */
+    public String getRemark(){
+        return remark;
+    }
+    /**
+    * 设置 内容
+    * @param remark
+    */
+    public void setRemark(String remark){
+        this.remark = remark;
+    }
+    /**
+    * 获取 事项来源，(0.政务网，1.自定义)
+    * @return Integer
+    */
+    public Integer getSource(){
+        return source;
+    }
+    /**
+    * 设置 事项来源，(0.政务网，1.自定义)
+    * @param source
+    */
+    public void setSource(Integer source){
+        this.source = source;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof MatterIntermediaryEntity) {
+            MatterIntermediaryEntity tmp = (MatterIntermediaryEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",matterId:").append(getMatterId());
+        sb.append(",matterCode:").append(getMatterCode());
+        sb.append(",matterName:").append(getMatterName());
+        sb.append(",title:").append(getTitle());
+        sb.append(",intermediaryRequest:").append(getIntermediaryRequest());
+        sb.append(",intermediaryRequestTime:").append(getIntermediaryRequestTime());
+        sb.append(",remark:").append(getRemark());
+        sb.append(",source:").append(getSource());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.matterId = 0L;
+
+            this.matterCode = "";
+
+            this.matterName = "";
+
+            this.title = "";
+
+            this.intermediaryRequest = "";
+
+            this.intermediaryRequestTime = "";
+
+            this.remark = "";
+
+            this.source = 0;
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/model/MatterIntermediaryQuery.java

+package com.mortals.xhx.module.matter.model;
+
+import java.util.List;
+import com.mortals.xhx.module.matter.model.MatterIntermediaryEntity;
+/**
+* 事项中介服务查询对象
+*
+* @author zxfei
+* @date 2022-11-16
+*/
+public class MatterIntermediaryQuery extends MatterIntermediaryEntity {
+    /** 开始 主键，自增长 */
+    private Long idStart;
+
+    /** 结束 主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 主键，自增长 */
+    private Long idIncrement;
+
+    /** 主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 开始 事项matter id */
+    private Long matterIdStart;
+
+    /** 结束 事项matter id */
+    private Long matterIdEnd;
+
+    /** 增加 事项matter id */
+    private Long matterIdIncrement;
+
+    /** 事项matter id列表 */
+    private List <Long> matterIdList;
+
+    /** 事项编码 */
+    private List<String> matterCodeList;
+
+    /** 事项名称 */
+    private List<String> matterNameList;
+
+    /** 中介服务事项名称 */
+    private List<String> titleList;
+
+    /** 中介服务实施机构及资质资格要求 */
+    private List<String> intermediaryRequestList;
+
+    /** 服务时限 */
+    private List<String> intermediaryRequestTimeList;
+
+    /** 内容 */
+    private List<String> remarkList;
+
+    /** 开始 事项来源，(0.政务网，1.自定义) */
+    private Integer sourceStart;
+
+    /** 结束 事项来源，(0.政务网，1.自定义) */
+    private Integer sourceEnd;
+
+    /** 增加 事项来源，(0.政务网，1.自定义) */
+    private Integer sourceIncrement;
+
+    /** 事项来源，(0.政务网，1.自定义)列表 */
+    private List <Integer> sourceList;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
+    /** 开始 修改时间 */
+    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<MatterIntermediaryQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<MatterIntermediaryQuery> andConditionList;
+
+    public MatterIntermediaryQuery(){}
+
+    /**
+    * 获取 开始 主键，自增长
+    * @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;
+    }
+
+    /**
+    * 获取 开始 事项matter id
+    * @return matterIdStart
+    */
+    public Long getMatterIdStart(){
+        return this.matterIdStart;
+    }
+
+    /**
+    * 设置 开始 事项matter id
+    * @param matterIdStart
+    */
+    public void setMatterIdStart(Long matterIdStart){
+        this.matterIdStart = matterIdStart;
+    }
+
+    /**
+    * 获取 结束 事项matter id
+    * @return $matterIdEnd
+    */
+    public Long getMatterIdEnd(){
+        return this.matterIdEnd;
+    }
+
+    /**
+    * 设置 结束 事项matter id
+    * @param matterIdEnd
+    */
+    public void setMatterIdEnd(Long matterIdEnd){
+        this.matterIdEnd = matterIdEnd;
+    }
+
+    /**
+    * 获取 增加 事项matter id
+    * @return matterIdIncrement
+    */
+    public Long getMatterIdIncrement(){
+        return this.matterIdIncrement;
+    }
+
+    /**
+    * 设置 增加 事项matter id
+    * @param matterIdIncrement
+    */
+    public void setMatterIdIncrement(Long matterIdIncrement){
+        this.matterIdIncrement = matterIdIncrement;
+    }
+
+    /**
+    * 获取 事项matter id
+    * @return matterIdList
+    */
+    public List<Long> getMatterIdList(){
+        return this.matterIdList;
+    }
+
+    /**
+    * 设置 事项matter id
+    * @param matterIdList
+    */
+    public void setMatterIdList(List<Long> matterIdList){
+        this.matterIdList = matterIdList;
+    }
+
+    /**
+    * 获取 事项编码
+    * @return matterCodeList
+    */
+    public List<String> getMatterCodeList(){
+        return this.matterCodeList;
+    }
+
+    /**
+    * 设置 事项编码
+    * @param matterCodeList
+    */
+    public void setMatterCodeList(List<String> matterCodeList){
+        this.matterCodeList = matterCodeList;
+    }
+    /**
+    * 获取 事项名称
+    * @return matterNameList
+    */
+    public List<String> getMatterNameList(){
+        return this.matterNameList;
+    }
+
+    /**
+    * 设置 事项名称
+    * @param matterNameList
+    */
+    public void setMatterNameList(List<String> matterNameList){
+        this.matterNameList = matterNameList;
+    }
+    /**
+    * 获取 中介服务事项名称
+    * @return titleList
+    */
+    public List<String> getTitleList(){
+        return this.titleList;
+    }
+
+    /**
+    * 设置 中介服务事项名称
+    * @param titleList
+    */
+    public void setTitleList(List<String> titleList){
+        this.titleList = titleList;
+    }
+    /**
+    * 获取 中介服务实施机构及资质资格要求
+    * @return intermediaryRequestList
+    */
+    public List<String> getIntermediaryRequestList(){
+        return this.intermediaryRequestList;
+    }
+
+    /**
+    * 设置 中介服务实施机构及资质资格要求
+    * @param intermediaryRequestList
+    */
+    public void setIntermediaryRequestList(List<String> intermediaryRequestList){
+        this.intermediaryRequestList = intermediaryRequestList;
+    }
+    /**
+    * 获取 服务时限
+    * @return intermediaryRequestTimeList
+    */
+    public List<String> getIntermediaryRequestTimeList(){
+        return this.intermediaryRequestTimeList;
+    }
+
+    /**
+    * 设置 服务时限
+    * @param intermediaryRequestTimeList
+    */
+    public void setIntermediaryRequestTimeList(List<String> intermediaryRequestTimeList){
+        this.intermediaryRequestTimeList = intermediaryRequestTimeList;
+    }
+    /**
+    * 获取 内容
+    * @return remarkList
+    */
+    public List<String> getRemarkList(){
+        return this.remarkList;
+    }
+
+    /**
+    * 设置 内容
+    * @param remarkList
+    */
+    public void setRemarkList(List<String> remarkList){
+        this.remarkList = remarkList;
+    }
+    /**
+    * 获取 开始 事项来源，(0.政务网，1.自定义)
+    * @return sourceStart
+    */
+    public Integer getSourceStart(){
+        return this.sourceStart;
+    }
+
+    /**
+    * 设置 开始 事项来源，(0.政务网，1.自定义)
+    * @param sourceStart
+    */
+    public void setSourceStart(Integer sourceStart){
+        this.sourceStart = sourceStart;
+    }
+
+    /**
+    * 获取 结束 事项来源，(0.政务网，1.自定义)
+    * @return $sourceEnd
+    */
+    public Integer getSourceEnd(){
+        return this.sourceEnd;
+    }
+
+    /**
+    * 设置 结束 事项来源，(0.政务网，1.自定义)
+    * @param sourceEnd
+    */
+    public void setSourceEnd(Integer sourceEnd){
+        this.sourceEnd = sourceEnd;
+    }
+
+    /**
+    * 获取 增加 事项来源，(0.政务网，1.自定义)
+    * @return sourceIncrement
+    */
+    public Integer getSourceIncrement(){
+        return this.sourceIncrement;
+    }
+
+    /**
+    * 设置 增加 事项来源，(0.政务网，1.自定义)
+    * @param sourceIncrement
+    */
+    public void setSourceIncrement(Integer sourceIncrement){
+        this.sourceIncrement = sourceIncrement;
+    }
+
+    /**
+    * 获取 事项来源，(0.政务网，1.自定义)
+    * @return sourceList
+    */
+    public List<Integer> getSourceList(){
+        return this.sourceList;
+    }
+
+    /**
+    * 设置 事项来源，(0.政务网，1.自定义)
+    * @param sourceList
+    */
+    public void setSourceList(List<Integer> sourceList){
+        this.sourceList = sourceList;
+    }
+
+    /**
+    * 获取 开始 创建时间
+    * @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 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 MatterIntermediaryQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 主键，自增长
+    * @param idStart
+    */
+    public MatterIntermediaryQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 主键，自增长
+    * @param idEnd
+    */
+    public MatterIntermediaryQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 主键，自增长
+    * @param idIncrement
+    */
+    public MatterIntermediaryQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 主键，自增长
+    * @param idList
+    */
+    public MatterIntermediaryQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+    /**
+    * 设置  事项matter id
+    * @param matterId
+    */
+    public MatterIntermediaryQuery matterId(Long matterId){
+	    setMatterId(matterId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 事项matter id
+    * @param matterIdStart
+    */
+    public MatterIntermediaryQuery matterIdStart(Long matterIdStart){
+		this.matterIdStart = matterIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 事项matter id
+    * @param matterIdEnd
+    */
+    public MatterIntermediaryQuery matterIdEnd(Long matterIdEnd){
+		this.matterIdEnd = matterIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 事项matter id
+    * @param matterIdIncrement
+    */
+    public MatterIntermediaryQuery matterIdIncrement(Long matterIdIncrement){
+		this.matterIdIncrement = matterIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 事项matter id
+    * @param matterIdList
+    */
+    public MatterIntermediaryQuery matterIdList(List<Long> matterIdList){
+        this.matterIdList = matterIdList;
+		return this;
+        }
+
+
+	/**
+    * 设置 事项编码
+    * @param matterCode
+    */
+    public MatterIntermediaryQuery matterCode(String matterCode){
+        setMatterCode(matterCode);
+		return this;
+    }
+
+    /**
+    * 设置 事项编码
+    * @param matterCodeList
+    */
+    public MatterIntermediaryQuery matterCodeList(List<String> matterCodeList){
+        this.matterCodeList = matterCodeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 事项名称
+    * @param matterName
+    */
+    public MatterIntermediaryQuery matterName(String matterName){
+        setMatterName(matterName);
+		return this;
+    }
+
+    /**
+    * 设置 事项名称
+    * @param matterNameList
+    */
+    public MatterIntermediaryQuery matterNameList(List<String> matterNameList){
+        this.matterNameList = matterNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 中介服务事项名称
+    * @param title
+    */
+    public MatterIntermediaryQuery title(String title){
+        setTitle(title);
+		return this;
+    }
+
+    /**
+    * 设置 中介服务事项名称
+    * @param titleList
+    */
+    public MatterIntermediaryQuery titleList(List<String> titleList){
+        this.titleList = titleList;
+		return this;
+    }
+
+
+	/**
+    * 设置 中介服务实施机构及资质资格要求
+    * @param intermediaryRequest
+    */
+    public MatterIntermediaryQuery intermediaryRequest(String intermediaryRequest){
+        setIntermediaryRequest(intermediaryRequest);
+		return this;
+    }
+
+    /**
+    * 设置 中介服务实施机构及资质资格要求
+    * @param intermediaryRequestList
+    */
+    public MatterIntermediaryQuery intermediaryRequestList(List<String> intermediaryRequestList){
+        this.intermediaryRequestList = intermediaryRequestList;
+		return this;
+    }
+
+
+	/**
+    * 设置 服务时限
+    * @param intermediaryRequestTime
+    */
+    public MatterIntermediaryQuery intermediaryRequestTime(String intermediaryRequestTime){
+        setIntermediaryRequestTime(intermediaryRequestTime);
+		return this;
+    }
+
+    /**
+    * 设置 服务时限
+    * @param intermediaryRequestTimeList
+    */
+    public MatterIntermediaryQuery intermediaryRequestTimeList(List<String> intermediaryRequestTimeList){
+        this.intermediaryRequestTimeList = intermediaryRequestTimeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 内容
+    * @param remark
+    */
+    public MatterIntermediaryQuery remark(String remark){
+        setRemark(remark);
+		return this;
+    }
+
+    /**
+    * 设置 内容
+    * @param remarkList
+    */
+    public MatterIntermediaryQuery remarkList(List<String> remarkList){
+        this.remarkList = remarkList;
+		return this;
+    }
+
+    /**
+    * 设置  事项来源，(0.政务网，1.自定义)
+    * @param source
+    */
+    public MatterIntermediaryQuery source(Integer source){
+	    setSource(source);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 事项来源，(0.政务网，1.自定义)
+    * @param sourceStart
+    */
+    public MatterIntermediaryQuery sourceStart(Integer sourceStart){
+		this.sourceStart = sourceStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 事项来源，(0.政务网，1.自定义)
+    * @param sourceEnd
+    */
+    public MatterIntermediaryQuery sourceEnd(Integer sourceEnd){
+		this.sourceEnd = sourceEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 事项来源，(0.政务网，1.自定义)
+    * @param sourceIncrement
+    */
+    public MatterIntermediaryQuery sourceIncrement(Integer sourceIncrement){
+		this.sourceIncrement = sourceIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 事项来源，(0.政务网，1.自定义)
+    * @param sourceList
+    */
+    public MatterIntermediaryQuery sourceList(List<Integer> sourceList){
+        this.sourceList = sourceList;
+		return this;
+        }
+
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public MatterIntermediaryQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public MatterIntermediaryQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public MatterIntermediaryQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public MatterIntermediaryQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public MatterIntermediaryQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<MatterIntermediaryQuery> 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<MatterIntermediaryQuery> 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<MatterIntermediaryQuery> 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<MatterIntermediaryQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/model/MatterQuestionEntity.java

+package com.mortals.xhx.module.matter.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.matter.model.vo.MatterQuestionVo;
+/**
+* 事项常见问题实体对象
+*
+* @author zxfei
+* @date 2022-11-16
+*/
+
+public class MatterQuestionEntity extends MatterQuestionVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 事项基础表matter id
+    */
+    private Long matterId;
+    /**
+    * 事项编码
+    */
+    private String matterCode;
+    /**
+    * 事项名称
+    */
+    private String matterName;
+    /**
+    * 问题
+    */
+    private String question;
+    /**
+    * 常见问题
+    */
+    private String answer;
+    /**
+    * 事项来源，(0.政务网，1.自定义)
+    */
+    private Integer source;
+
+
+
+    public MatterQuestionEntity(){}
+    /**
+    * 获取 事项基础表matter id
+    * @return Long
+    */
+    public Long getMatterId(){
+        return matterId;
+    }
+    /**
+    * 设置 事项基础表matter id
+    * @param matterId
+    */
+    public void setMatterId(Long matterId){
+        this.matterId = matterId;
+    }
+    /**
+    * 获取 事项编码
+    * @return String
+    */
+    public String getMatterCode(){
+        return matterCode;
+    }
+    /**
+    * 设置 事项编码
+    * @param matterCode
+    */
+    public void setMatterCode(String matterCode){
+        this.matterCode = matterCode;
+    }
+    /**
+    * 获取 事项名称
+    * @return String
+    */
+    public String getMatterName(){
+        return matterName;
+    }
+    /**
+    * 设置 事项名称
+    * @param matterName
+    */
+    public void setMatterName(String matterName){
+        this.matterName = matterName;
+    }
+    /**
+    * 获取 问题
+    * @return String
+    */
+    public String getQuestion(){
+        return question;
+    }
+    /**
+    * 设置 问题
+    * @param question
+    */
+    public void setQuestion(String question){
+        this.question = question;
+    }
+    /**
+    * 获取 常见问题
+    * @return String
+    */
+    public String getAnswer(){
+        return answer;
+    }
+    /**
+    * 设置 常见问题
+    * @param answer
+    */
+    public void setAnswer(String answer){
+        this.answer = answer;
+    }
+    /**
+    * 获取 事项来源，(0.政务网，1.自定义)
+    * @return Integer
+    */
+    public Integer getSource(){
+        return source;
+    }
+    /**
+    * 设置 事项来源，(0.政务网，1.自定义)
+    * @param source
+    */
+    public void setSource(Integer source){
+        this.source = source;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof MatterQuestionEntity) {
+            MatterQuestionEntity tmp = (MatterQuestionEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",matterId:").append(getMatterId());
+        sb.append(",matterCode:").append(getMatterCode());
+        sb.append(",matterName:").append(getMatterName());
+        sb.append(",question:").append(getQuestion());
+        sb.append(",answer:").append(getAnswer());
+        sb.append(",source:").append(getSource());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.matterId = 0L;
+
+            this.matterCode = "";
+
+            this.matterName = "";
+
+            this.question = "";
+
+            this.answer = "";
+
+            this.source = 0;
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/model/MatterQuestionQuery.java

+package com.mortals.xhx.module.matter.model;
+
+import java.util.List;
+import com.mortals.xhx.module.matter.model.MatterQuestionEntity;
+/**
+* 事项常见问题查询对象
+*
+* @author zxfei
+* @date 2022-11-16
+*/
+public class MatterQuestionQuery extends MatterQuestionEntity {
+    /** 开始 主键，自增长 */
+    private Long idStart;
+
+    /** 结束 主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 主键，自增长 */
+    private Long idIncrement;
+
+    /** 主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 开始 事项基础表matter id */
+    private Long matterIdStart;
+
+    /** 结束 事项基础表matter id */
+    private Long matterIdEnd;
+
+    /** 增加 事项基础表matter id */
+    private Long matterIdIncrement;
+
+    /** 事项基础表matter id列表 */
+    private List <Long> matterIdList;
+
+    /** 事项编码 */
+    private List<String> matterCodeList;
+
+    /** 事项名称 */
+    private List<String> matterNameList;
+
+    /** 问题 */
+    private List<String> questionList;
+
+    /** 常见问题 */
+    private List<String> answerList;
+
+    /** 开始 事项来源，(0.政务网，1.自定义) */
+    private Integer sourceStart;
+
+    /** 结束 事项来源，(0.政务网，1.自定义) */
+    private Integer sourceEnd;
+
+    /** 增加 事项来源，(0.政务网，1.自定义) */
+    private Integer sourceIncrement;
+
+    /** 事项来源，(0.政务网，1.自定义)列表 */
+    private List <Integer> sourceList;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
+    /** 开始 修改时间 */
+    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<MatterQuestionQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<MatterQuestionQuery> andConditionList;
+
+    public MatterQuestionQuery(){}
+
+    /**
+    * 获取 开始 主键，自增长
+    * @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;
+    }
+
+    /**
+    * 获取 开始 事项基础表matter id
+    * @return matterIdStart
+    */
+    public Long getMatterIdStart(){
+        return this.matterIdStart;
+    }
+
+    /**
+    * 设置 开始 事项基础表matter id
+    * @param matterIdStart
+    */
+    public void setMatterIdStart(Long matterIdStart){
+        this.matterIdStart = matterIdStart;
+    }
+
+    /**
+    * 获取 结束 事项基础表matter id
+    * @return $matterIdEnd
+    */
+    public Long getMatterIdEnd(){
+        return this.matterIdEnd;
+    }
+
+    /**
+    * 设置 结束 事项基础表matter id
+    * @param matterIdEnd
+    */
+    public void setMatterIdEnd(Long matterIdEnd){
+        this.matterIdEnd = matterIdEnd;
+    }
+
+    /**
+    * 获取 增加 事项基础表matter id
+    * @return matterIdIncrement
+    */
+    public Long getMatterIdIncrement(){
+        return this.matterIdIncrement;
+    }
+
+    /**
+    * 设置 增加 事项基础表matter id
+    * @param matterIdIncrement
+    */
+    public void setMatterIdIncrement(Long matterIdIncrement){
+        this.matterIdIncrement = matterIdIncrement;
+    }
+
+    /**
+    * 获取 事项基础表matter id
+    * @return matterIdList
+    */
+    public List<Long> getMatterIdList(){
+        return this.matterIdList;
+    }
+
+    /**
+    * 设置 事项基础表matter id
+    * @param matterIdList
+    */
+    public void setMatterIdList(List<Long> matterIdList){
+        this.matterIdList = matterIdList;
+    }
+
+    /**
+    * 获取 事项编码
+    * @return matterCodeList
+    */
+    public List<String> getMatterCodeList(){
+        return this.matterCodeList;
+    }
+
+    /**
+    * 设置 事项编码
+    * @param matterCodeList
+    */
+    public void setMatterCodeList(List<String> matterCodeList){
+        this.matterCodeList = matterCodeList;
+    }
+    /**
+    * 获取 事项名称
+    * @return matterNameList
+    */
+    public List<String> getMatterNameList(){
+        return this.matterNameList;
+    }
+
+    /**
+    * 设置 事项名称
+    * @param matterNameList
+    */
+    public void setMatterNameList(List<String> matterNameList){
+        this.matterNameList = matterNameList;
+    }
+    /**
+    * 获取 问题
+    * @return questionList
+    */
+    public List<String> getQuestionList(){
+        return this.questionList;
+    }
+
+    /**
+    * 设置 问题
+    * @param questionList
+    */
+    public void setQuestionList(List<String> questionList){
+        this.questionList = questionList;
+    }
+    /**
+    * 获取 常见问题
+    * @return answerList
+    */
+    public List<String> getAnswerList(){
+        return this.answerList;
+    }
+
+    /**
+    * 设置 常见问题
+    * @param answerList
+    */
+    public void setAnswerList(List<String> answerList){
+        this.answerList = answerList;
+    }
+    /**
+    * 获取 开始 事项来源，(0.政务网，1.自定义)
+    * @return sourceStart
+    */
+    public Integer getSourceStart(){
+        return this.sourceStart;
+    }
+
+    /**
+    * 设置 开始 事项来源，(0.政务网，1.自定义)
+    * @param sourceStart
+    */
+    public void setSourceStart(Integer sourceStart){
+        this.sourceStart = sourceStart;
+    }
+
+    /**
+    * 获取 结束 事项来源，(0.政务网，1.自定义)
+    * @return $sourceEnd
+    */
+    public Integer getSourceEnd(){
+        return this.sourceEnd;
+    }
+
+    /**
+    * 设置 结束 事项来源，(0.政务网，1.自定义)
+    * @param sourceEnd
+    */
+    public void setSourceEnd(Integer sourceEnd){
+        this.sourceEnd = sourceEnd;
+    }
+
+    /**
+    * 获取 增加 事项来源，(0.政务网，1.自定义)
+    * @return sourceIncrement
+    */
+    public Integer getSourceIncrement(){
+        return this.sourceIncrement;
+    }
+
+    /**
+    * 设置 增加 事项来源，(0.政务网，1.自定义)
+    * @param sourceIncrement
+    */
+    public void setSourceIncrement(Integer sourceIncrement){
+        this.sourceIncrement = sourceIncrement;
+    }
+
+    /**
+    * 获取 事项来源，(0.政务网，1.自定义)
+    * @return sourceList
+    */
+    public List<Integer> getSourceList(){
+        return this.sourceList;
+    }
+
+    /**
+    * 设置 事项来源，(0.政务网，1.自定义)
+    * @param sourceList
+    */
+    public void setSourceList(List<Integer> sourceList){
+        this.sourceList = sourceList;
+    }
+
+    /**
+    * 获取 开始 创建时间
+    * @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 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 MatterQuestionQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 主键，自增长
+    * @param idStart
+    */
+    public MatterQuestionQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 主键，自增长
+    * @param idEnd
+    */
+    public MatterQuestionQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 主键，自增长
+    * @param idIncrement
+    */
+    public MatterQuestionQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 主键，自增长
+    * @param idList
+    */
+    public MatterQuestionQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+    /**
+    * 设置  事项基础表matter id
+    * @param matterId
+    */
+    public MatterQuestionQuery matterId(Long matterId){
+	    setMatterId(matterId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 事项基础表matter id
+    * @param matterIdStart
+    */
+    public MatterQuestionQuery matterIdStart(Long matterIdStart){
+		this.matterIdStart = matterIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 事项基础表matter id
+    * @param matterIdEnd
+    */
+    public MatterQuestionQuery matterIdEnd(Long matterIdEnd){
+		this.matterIdEnd = matterIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 事项基础表matter id
+    * @param matterIdIncrement
+    */
+    public MatterQuestionQuery matterIdIncrement(Long matterIdIncrement){
+		this.matterIdIncrement = matterIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 事项基础表matter id
+    * @param matterIdList
+    */
+    public MatterQuestionQuery matterIdList(List<Long> matterIdList){
+        this.matterIdList = matterIdList;
+		return this;
+        }
+
+
+	/**
+    * 设置 事项编码
+    * @param matterCode
+    */
+    public MatterQuestionQuery matterCode(String matterCode){
+        setMatterCode(matterCode);
+		return this;
+    }
+
+    /**
+    * 设置 事项编码
+    * @param matterCodeList
+    */
+    public MatterQuestionQuery matterCodeList(List<String> matterCodeList){
+        this.matterCodeList = matterCodeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 事项名称
+    * @param matterName
+    */
+    public MatterQuestionQuery matterName(String matterName){
+        setMatterName(matterName);
+		return this;
+    }
+
+    /**
+    * 设置 事项名称
+    * @param matterNameList
+    */
+    public MatterQuestionQuery matterNameList(List<String> matterNameList){
+        this.matterNameList = matterNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 问题
+    * @param question
+    */
+    public MatterQuestionQuery question(String question){
+        setQuestion(question);
+		return this;
+    }
+
+    /**
+    * 设置 问题
+    * @param questionList
+    */
+    public MatterQuestionQuery questionList(List<String> questionList){
+        this.questionList = questionList;
+		return this;
+    }
+
+
+	/**
+    * 设置 常见问题
+    * @param answer
+    */
+    public MatterQuestionQuery answer(String answer){
+        setAnswer(answer);
+		return this;
+    }
+
+    /**
+    * 设置 常见问题
+    * @param answerList
+    */
+    public MatterQuestionQuery answerList(List<String> answerList){
+        this.answerList = answerList;
+		return this;
+    }
+
+    /**
+    * 设置  事项来源，(0.政务网，1.自定义)
+    * @param source
+    */
+    public MatterQuestionQuery source(Integer source){
+	    setSource(source);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 事项来源，(0.政务网，1.自定义)
+    * @param sourceStart
+    */
+    public MatterQuestionQuery sourceStart(Integer sourceStart){
+		this.sourceStart = sourceStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 事项来源，(0.政务网，1.自定义)
+    * @param sourceEnd
+    */
+    public MatterQuestionQuery sourceEnd(Integer sourceEnd){
+		this.sourceEnd = sourceEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 事项来源，(0.政务网，1.自定义)
+    * @param sourceIncrement
+    */
+    public MatterQuestionQuery sourceIncrement(Integer sourceIncrement){
+		this.sourceIncrement = sourceIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 事项来源，(0.政务网，1.自定义)
+    * @param sourceList
+    */
+    public MatterQuestionQuery sourceList(List<Integer> sourceList){
+        this.sourceList = sourceList;
+		return this;
+        }
+
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public MatterQuestionQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public MatterQuestionQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public MatterQuestionQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public MatterQuestionQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public MatterQuestionQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<MatterQuestionQuery> 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<MatterQuestionQuery> 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<MatterQuestionQuery> 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<MatterQuestionQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/model/MatterSetbaseEntity.java

+package com.mortals.xhx.module.matter.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.matter.model.vo.MatterSetbaseVo;
+/**
+* 事项设定依据实体对象
+*
+* @author zxfei
+* @date 2022-11-16
+*/
+
+public class MatterSetbaseEntity extends MatterSetbaseVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 事项matter id
+    */
+    private Long matterId;
+    /**
+    * 事项编码
+    */
+    private String matterCode;
+    /**
+    * 事项名称
+    */
+    private String matterName;
+    /**
+    * 法规标题
+    */
+    private String policyName;
+    /**
+    * 法规类型，(法律.法律，行政法规.行政法规，地方法规.地方法规，部门规章.部门规章，其他.其他，政府规章.政府规章，规范性文件.规范性文件)
+    */
+    private String policyType;
+    /**
+    * 条例
+    */
+    private String policyitem;
+    /**
+    * 条款内容
+    */
+    private String content;
+    /**
+    * 事项来源，(0.政务网，1.自定义)
+    */
+    private Integer source;
+
+
+
+    public MatterSetbaseEntity(){}
+    /**
+    * 获取 事项matter id
+    * @return Long
+    */
+    public Long getMatterId(){
+        return matterId;
+    }
+    /**
+    * 设置 事项matter id
+    * @param matterId
+    */
+    public void setMatterId(Long matterId){
+        this.matterId = matterId;
+    }
+    /**
+    * 获取 事项编码
+    * @return String
+    */
+    public String getMatterCode(){
+        return matterCode;
+    }
+    /**
+    * 设置 事项编码
+    * @param matterCode
+    */
+    public void setMatterCode(String matterCode){
+        this.matterCode = matterCode;
+    }
+    /**
+    * 获取 事项名称
+    * @return String
+    */
+    public String getMatterName(){
+        return matterName;
+    }
+    /**
+    * 设置 事项名称
+    * @param matterName
+    */
+    public void setMatterName(String matterName){
+        this.matterName = matterName;
+    }
+    /**
+    * 获取 法规标题
+    * @return String
+    */
+    public String getPolicyName(){
+        return policyName;
+    }
+    /**
+    * 设置 法规标题
+    * @param policyName
+    */
+    public void setPolicyName(String policyName){
+        this.policyName = policyName;
+    }
+    /**
+    * 获取 法规类型，(法律.法律，行政法规.行政法规，地方法规.地方法规，部门规章.部门规章，其他.其他，政府规章.政府规章，规范性文件.规范性文件)
+    * @return String
+    */
+    public String getPolicyType(){
+        return policyType;
+    }
+    /**
+    * 设置 法规类型，(法律.法律，行政法规.行政法规，地方法规.地方法规，部门规章.部门规章，其他.其他，政府规章.政府规章，规范性文件.规范性文件)
+    * @param policyType
+    */
+    public void setPolicyType(String policyType){
+        this.policyType = policyType;
+    }
+    /**
+    * 获取 条例
+    * @return String
+    */
+    public String getPolicyitem(){
+        return policyitem;
+    }
+    /**
+    * 设置 条例
+    * @param policyitem
+    */
+    public void setPolicyitem(String policyitem){
+        this.policyitem = policyitem;
+    }
+    /**
+    * 获取 条款内容
+    * @return String
+    */
+    public String getContent(){
+        return content;
+    }
+    /**
+    * 设置 条款内容
+    * @param content
+    */
+    public void setContent(String content){
+        this.content = content;
+    }
+    /**
+    * 获取 事项来源，(0.政务网，1.自定义)
+    * @return Integer
+    */
+    public Integer getSource(){
+        return source;
+    }
+    /**
+    * 设置 事项来源，(0.政务网，1.自定义)
+    * @param source
+    */
+    public void setSource(Integer source){
+        this.source = source;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof MatterSetbaseEntity) {
+            MatterSetbaseEntity tmp = (MatterSetbaseEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",matterId:").append(getMatterId());
+        sb.append(",matterCode:").append(getMatterCode());
+        sb.append(",matterName:").append(getMatterName());
+        sb.append(",policyName:").append(getPolicyName());
+        sb.append(",policyType:").append(getPolicyType());
+        sb.append(",policyitem:").append(getPolicyitem());
+        sb.append(",content:").append(getContent());
+        sb.append(",source:").append(getSource());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.matterId = 0L;
+
+            this.matterCode = "";
+
+            this.matterName = "";
+
+            this.policyName = "";
+
+            this.policyType = "法律";
+
+            this.policyitem = "";
+
+            this.content = "";
+
+            this.source = 0;
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/model/MatterSetbaseQuery.java

+package com.mortals.xhx.module.matter.model;
+
+import java.util.List;
+import com.mortals.xhx.module.matter.model.MatterSetbaseEntity;
+/**
+* 事项设定依据查询对象
+*
+* @author zxfei
+* @date 2022-11-16
+*/
+public class MatterSetbaseQuery extends MatterSetbaseEntity {
+    /** 开始 主键，自增长 */
+    private Long idStart;
+
+    /** 结束 主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 主键，自增长 */
+    private Long idIncrement;
+
+    /** 主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 开始 事项matter id */
+    private Long matterIdStart;
+
+    /** 结束 事项matter id */
+    private Long matterIdEnd;
+
+    /** 增加 事项matter id */
+    private Long matterIdIncrement;
+
+    /** 事项matter id列表 */
+    private List <Long> matterIdList;
+
+    /** 事项编码 */
+    private List<String> matterCodeList;
+
+    /** 事项名称 */
+    private List<String> matterNameList;
+
+    /** 法规标题 */
+    private List<String> policyNameList;
+
+    /** 法规类型，(法律.法律，行政法规.行政法规，地方法规.地方法规，部门规章.部门规章，其他.其他，政府规章.政府规章，规范性文件.规范性文件) */
+    private List<String> policyTypeList;
+
+    /** 条例 */
+    private List<String> policyitemList;
+
+    /** 条款内容 */
+    private List<String> contentList;
+
+    /** 开始 事项来源，(0.政务网，1.自定义) */
+    private Integer sourceStart;
+
+    /** 结束 事项来源，(0.政务网，1.自定义) */
+    private Integer sourceEnd;
+
+    /** 增加 事项来源，(0.政务网，1.自定义) */
+    private Integer sourceIncrement;
+
+    /** 事项来源，(0.政务网，1.自定义)列表 */
+    private List <Integer> sourceList;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
+    /** 开始 修改时间 */
+    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<MatterSetbaseQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<MatterSetbaseQuery> andConditionList;
+
+    public MatterSetbaseQuery(){}
+
+    /**
+    * 获取 开始 主键，自增长
+    * @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;
+    }
+
+    /**
+    * 获取 开始 事项matter id
+    * @return matterIdStart
+    */
+    public Long getMatterIdStart(){
+        return this.matterIdStart;
+    }
+
+    /**
+    * 设置 开始 事项matter id
+    * @param matterIdStart
+    */
+    public void setMatterIdStart(Long matterIdStart){
+        this.matterIdStart = matterIdStart;
+    }
+
+    /**
+    * 获取 结束 事项matter id
+    * @return $matterIdEnd
+    */
+    public Long getMatterIdEnd(){
+        return this.matterIdEnd;
+    }
+
+    /**
+    * 设置 结束 事项matter id
+    * @param matterIdEnd
+    */
+    public void setMatterIdEnd(Long matterIdEnd){
+        this.matterIdEnd = matterIdEnd;
+    }
+
+    /**
+    * 获取 增加 事项matter id
+    * @return matterIdIncrement
+    */
+    public Long getMatterIdIncrement(){
+        return this.matterIdIncrement;
+    }
+
+    /**
+    * 设置 增加 事项matter id
+    * @param matterIdIncrement
+    */
+    public void setMatterIdIncrement(Long matterIdIncrement){
+        this.matterIdIncrement = matterIdIncrement;
+    }
+
+    /**
+    * 获取 事项matter id
+    * @return matterIdList
+    */
+    public List<Long> getMatterIdList(){
+        return this.matterIdList;
+    }
+
+    /**
+    * 设置 事项matter id
+    * @param matterIdList
+    */
+    public void setMatterIdList(List<Long> matterIdList){
+        this.matterIdList = matterIdList;
+    }
+
+    /**
+    * 获取 事项编码
+    * @return matterCodeList
+    */
+    public List<String> getMatterCodeList(){
+        return this.matterCodeList;
+    }
+
+    /**
+    * 设置 事项编码
+    * @param matterCodeList
+    */
+    public void setMatterCodeList(List<String> matterCodeList){
+        this.matterCodeList = matterCodeList;
+    }
+    /**
+    * 获取 事项名称
+    * @return matterNameList
+    */
+    public List<String> getMatterNameList(){
+        return this.matterNameList;
+    }
+
+    /**
+    * 设置 事项名称
+    * @param matterNameList
+    */
+    public void setMatterNameList(List<String> matterNameList){
+        this.matterNameList = matterNameList;
+    }
+    /**
+    * 获取 法规标题
+    * @return policyNameList
+    */
+    public List<String> getPolicyNameList(){
+        return this.policyNameList;
+    }
+
+    /**
+    * 设置 法规标题
+    * @param policyNameList
+    */
+    public void setPolicyNameList(List<String> policyNameList){
+        this.policyNameList = policyNameList;
+    }
+    /**
+    * 获取 法规类型，(法律.法律，行政法规.行政法规，地方法规.地方法规，部门规章.部门规章，其他.其他，政府规章.政府规章，规范性文件.规范性文件)
+    * @return policyTypeList
+    */
+    public List<String> getPolicyTypeList(){
+        return this.policyTypeList;
+    }
+
+    /**
+    * 设置 法规类型，(法律.法律，行政法规.行政法规，地方法规.地方法规，部门规章.部门规章，其他.其他，政府规章.政府规章，规范性文件.规范性文件)
+    * @param policyTypeList
+    */
+    public void setPolicyTypeList(List<String> policyTypeList){
+        this.policyTypeList = policyTypeList;
+    }
+    /**
+    * 获取 条例
+    * @return policyitemList
+    */
+    public List<String> getPolicyitemList(){
+        return this.policyitemList;
+    }
+
+    /**
+    * 设置 条例
+    * @param policyitemList
+    */
+    public void setPolicyitemList(List<String> policyitemList){
+        this.policyitemList = policyitemList;
+    }
+    /**
+    * 获取 条款内容
+    * @return contentList
+    */
+    public List<String> getContentList(){
+        return this.contentList;
+    }
+
+    /**
+    * 设置 条款内容
+    * @param contentList
+    */
+    public void setContentList(List<String> contentList){
+        this.contentList = contentList;
+    }
+    /**
+    * 获取 开始 事项来源，(0.政务网，1.自定义)
+    * @return sourceStart
+    */
+    public Integer getSourceStart(){
+        return this.sourceStart;
+    }
+
+    /**
+    * 设置 开始 事项来源，(0.政务网，1.自定义)
+    * @param sourceStart
+    */
+    public void setSourceStart(Integer sourceStart){
+        this.sourceStart = sourceStart;
+    }
+
+    /**
+    * 获取 结束 事项来源，(0.政务网，1.自定义)
+    * @return $sourceEnd
+    */
+    public Integer getSourceEnd(){
+        return this.sourceEnd;
+    }
+
+    /**
+    * 设置 结束 事项来源，(0.政务网，1.自定义)
+    * @param sourceEnd
+    */
+    public void setSourceEnd(Integer sourceEnd){
+        this.sourceEnd = sourceEnd;
+    }
+
+    /**
+    * 获取 增加 事项来源，(0.政务网，1.自定义)
+    * @return sourceIncrement
+    */
+    public Integer getSourceIncrement(){
+        return this.sourceIncrement;
+    }
+
+    /**
+    * 设置 增加 事项来源，(0.政务网，1.自定义)
+    * @param sourceIncrement
+    */
+    public void setSourceIncrement(Integer sourceIncrement){
+        this.sourceIncrement = sourceIncrement;
+    }
+
+    /**
+    * 获取 事项来源，(0.政务网，1.自定义)
+    * @return sourceList
+    */
+    public List<Integer> getSourceList(){
+        return this.sourceList;
+    }
+
+    /**
+    * 设置 事项来源，(0.政务网，1.自定义)
+    * @param sourceList
+    */
+    public void setSourceList(List<Integer> sourceList){
+        this.sourceList = sourceList;
+    }
+
+    /**
+    * 获取 开始 创建时间
+    * @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 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 MatterSetbaseQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 主键，自增长
+    * @param idStart
+    */
+    public MatterSetbaseQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 主键，自增长
+    * @param idEnd
+    */
+    public MatterSetbaseQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 主键，自增长
+    * @param idIncrement
+    */
+    public MatterSetbaseQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 主键，自增长
+    * @param idList
+    */
+    public MatterSetbaseQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+    /**
+    * 设置  事项matter id
+    * @param matterId
+    */
+    public MatterSetbaseQuery matterId(Long matterId){
+	    setMatterId(matterId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 事项matter id
+    * @param matterIdStart
+    */
+    public MatterSetbaseQuery matterIdStart(Long matterIdStart){
+		this.matterIdStart = matterIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 事项matter id
+    * @param matterIdEnd
+    */
+    public MatterSetbaseQuery matterIdEnd(Long matterIdEnd){
+		this.matterIdEnd = matterIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 事项matter id
+    * @param matterIdIncrement
+    */
+    public MatterSetbaseQuery matterIdIncrement(Long matterIdIncrement){
+		this.matterIdIncrement = matterIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 事项matter id
+    * @param matterIdList
+    */
+    public MatterSetbaseQuery matterIdList(List<Long> matterIdList){
+        this.matterIdList = matterIdList;
+		return this;
+        }
+
+
+	/**
+    * 设置 事项编码
+    * @param matterCode
+    */
+    public MatterSetbaseQuery matterCode(String matterCode){
+        setMatterCode(matterCode);
+		return this;
+    }
+
+    /**
+    * 设置 事项编码
+    * @param matterCodeList
+    */
+    public MatterSetbaseQuery matterCodeList(List<String> matterCodeList){
+        this.matterCodeList = matterCodeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 事项名称
+    * @param matterName
+    */
+    public MatterSetbaseQuery matterName(String matterName){
+        setMatterName(matterName);
+		return this;
+    }
+
+    /**
+    * 设置 事项名称
+    * @param matterNameList
+    */
+    public MatterSetbaseQuery matterNameList(List<String> matterNameList){
+        this.matterNameList = matterNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 法规标题
+    * @param policyName
+    */
+    public MatterSetbaseQuery policyName(String policyName){
+        setPolicyName(policyName);
+		return this;
+    }
+
+    /**
+    * 设置 法规标题
+    * @param policyNameList
+    */
+    public MatterSetbaseQuery policyNameList(List<String> policyNameList){
+        this.policyNameList = policyNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 法规类型，(法律.法律，行政法规.行政法规，地方法规.地方法规，部门规章.部门规章，其他.其他，政府规章.政府规章，规范性文件.规范性文件)
+    * @param policyType
+    */
+    public MatterSetbaseQuery policyType(String policyType){
+        setPolicyType(policyType);
+		return this;
+    }
+
+    /**
+    * 设置 法规类型，(法律.法律，行政法规.行政法规，地方法规.地方法规，部门规章.部门规章，其他.其他，政府规章.政府规章，规范性文件.规范性文件)
+    * @param policyTypeList
+    */
+    public MatterSetbaseQuery policyTypeList(List<String> policyTypeList){
+        this.policyTypeList = policyTypeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 条例
+    * @param policyitem
+    */
+    public MatterSetbaseQuery policyitem(String policyitem){
+        setPolicyitem(policyitem);
+		return this;
+    }
+
+    /**
+    * 设置 条例
+    * @param policyitemList
+    */
+    public MatterSetbaseQuery policyitemList(List<String> policyitemList){
+        this.policyitemList = policyitemList;
+		return this;
+    }
+
+
+	/**
+    * 设置 条款内容
+    * @param content
+    */
+    public MatterSetbaseQuery content(String content){
+        setContent(content);
+		return this;
+    }
+
+    /**
+    * 设置 条款内容
+    * @param contentList
+    */
+    public MatterSetbaseQuery contentList(List<String> contentList){
+        this.contentList = contentList;
+		return this;
+    }
+
+    /**
+    * 设置  事项来源，(0.政务网，1.自定义)
+    * @param source
+    */
+    public MatterSetbaseQuery source(Integer source){
+	    setSource(source);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 事项来源，(0.政务网，1.自定义)
+    * @param sourceStart
+    */
+    public MatterSetbaseQuery sourceStart(Integer sourceStart){
+		this.sourceStart = sourceStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 事项来源，(0.政务网，1.自定义)
+    * @param sourceEnd
+    */
+    public MatterSetbaseQuery sourceEnd(Integer sourceEnd){
+		this.sourceEnd = sourceEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 事项来源，(0.政务网，1.自定义)
+    * @param sourceIncrement
+    */
+    public MatterSetbaseQuery sourceIncrement(Integer sourceIncrement){
+		this.sourceIncrement = sourceIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 事项来源，(0.政务网，1.自定义)
+    * @param sourceList
+    */
+    public MatterSetbaseQuery sourceList(List<Integer> sourceList){
+        this.sourceList = sourceList;
+		return this;
+        }
+
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public MatterSetbaseQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public MatterSetbaseQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public MatterSetbaseQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public MatterSetbaseQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public MatterSetbaseQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<MatterSetbaseQuery> 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<MatterSetbaseQuery> 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<MatterSetbaseQuery> 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<MatterSetbaseQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterAcceptVo.java

+package com.mortals.xhx.module.matter.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.matter.model.MatterAcceptEntity;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+/**
+* 事项受理条件视图对象
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+@Data
+public class MatterAcceptVo extends BaseEntityLong {
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterChargesVo.java

+package com.mortals.xhx.module.matter.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.matter.model.MatterChargesEntity;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+/**
+* 事项收费标准视图对象
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+@Data
+public class MatterChargesVo extends BaseEntityLong {
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterFlowlimitVo.java

+package com.mortals.xhx.module.matter.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.matter.model.MatterFlowlimitEntity;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+/**
+* 事项办理流程视图对象
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+@Data
+public class MatterFlowlimitVo extends BaseEntityLong {
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterIntermediaryVo.java

+package com.mortals.xhx.module.matter.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.matter.model.MatterIntermediaryEntity;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+/**
+* 事项中介服务视图对象
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+@Data
+public class MatterIntermediaryVo extends BaseEntityLong {
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterQuestionVo.java

+package com.mortals.xhx.module.matter.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.matter.model.MatterQuestionEntity;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+/**
+* 事项常见问题视图对象
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+@Data
+public class MatterQuestionVo extends BaseEntityLong {
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterSetbaseVo.java

+package com.mortals.xhx.module.matter.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.matter.model.MatterSetbaseEntity;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+/**
+* 事项设定依据视图对象
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+@Data
+public class MatterSetbaseVo extends BaseEntityLong {
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/service/MatterAcceptService.java

+package com.mortals.xhx.module.matter.service;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.matter.model.MatterAcceptEntity;
+
+
+/**
+* MatterAcceptService
+*
+* 事项受理条件 service接口
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+public interface MatterAcceptService extends ICRUDService<MatterAcceptEntity,Long>{
+
+    void deleteByMatterId(Long matterId, Context context);
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/service/MatterChargesService.java

+package com.mortals.xhx.module.matter.service;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.matter.model.MatterChargesEntity;
+/**
+* MatterChargesService
+*
+* 事项收费标准 service接口
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+public interface MatterChargesService extends ICRUDService<MatterChargesEntity,Long>{
+
+    void deleteByMatterId(Long matterId, Context context);
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/service/MatterFlowlimitService.java

+package com.mortals.xhx.module.matter.service;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.matter.model.MatterFlowlimitEntity;
+/**
+* MatterFlowlimitService
+*
+* 事项办理流程 service接口
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+public interface MatterFlowlimitService extends ICRUDService<MatterFlowlimitEntity,Long>{
+
+
+    void deleteByMatterId(Long matterId, Context context);
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/service/MatterIntermediaryService.java

+package com.mortals.xhx.module.matter.service;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.matter.model.MatterIntermediaryEntity;
+/**
+* MatterIntermediaryService
+*
+* 事项中介服务 service接口
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+public interface MatterIntermediaryService extends ICRUDService<MatterIntermediaryEntity,Long>{
+
+    void deleteByMatterId(Long matterId, Context context);
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/service/MatterQuestionService.java

+package com.mortals.xhx.module.matter.service;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.matter.model.MatterQuestionEntity;
+/**
+* MatterQuestionService
+*
+* 事项常见问题 service接口
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+public interface MatterQuestionService extends ICRUDService<MatterQuestionEntity,Long>{
+
+    void deleteByMatterId(Long matterId, Context context);
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/service/MatterService.java

@@ -34,6 +34,18 @@ public interface MatterService extends ICRUDService<MatterEntity, Long> {
      */
     Rest<String> addMatterToSite(String matterIds, Long siteId, Context context);
 
+    /**
+     * 同步政务网事项数据
+     *
+     * @param areaCode
+     * @param context
+     */
+    void syncMatter(String areaCode, Context context);
+
+    Map<String, String> getBaseInfoMap(Context context);
+
+    Map<String, String> getSqclInfoMap(Context context);
+
     /**
      * 构建事项详细相关信息
      *

single-matter/src/main/java/com/mortals/xhx/module/matter/service/MatterSetbaseService.java

+package com.mortals.xhx.module.matter.service;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.matter.model.MatterSetbaseEntity;
+/**
+* MatterSetbaseService
+*
+* 事项设定依据 service接口
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+public interface MatterSetbaseService extends ICRUDService<MatterSetbaseEntity,Long>{
+
+    void deleteByMatterId(Long matterId, Context context);
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterAcceptServiceImpl.java

+package com.mortals.xhx.module.matter.service.impl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.matter.model.MatterEntity;
+import com.mortals.xhx.module.matter.service.MatterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.xhx.module.matter.dao.MatterAcceptDao;
+import com.mortals.xhx.module.matter.model.MatterAcceptEntity;
+import com.mortals.xhx.module.matter.service.MatterAcceptService;
+import org.springframework.util.ObjectUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+* MatterAcceptService
+* 事项受理条件 service实现
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+@Service("matterAcceptService")
+public class MatterAcceptServiceImpl extends AbstractCRUDServiceImpl<MatterAcceptDao, MatterAcceptEntity, Long> implements MatterAcceptService {
+
+    @Autowired
+    private MatterService matterService;
+
+
+    @Override
+    protected void saveBefore(MatterAcceptEntity entity, Context context) throws AppException {
+
+       if(!ObjectUtils.isEmpty(entity.getMatterId())){
+           MatterEntity matterEntity = matterService.get(entity.getMatterId());
+           entity.setMatterName(matterEntity==null?"":matterEntity.getMatterName());
+       }
+        super.saveBefore(entity, context);
+    }
+
+    @Override
+    public void deleteByMatterId(Long matterId, Context context) {
+        Map<String, Object> condition = new HashMap<>();
+        condition.put("matterId", matterId);
+        this.dao.delete(condition);
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterChargesServiceImpl.java

+package com.mortals.xhx.module.matter.service.impl;
+import com.mortals.framework.model.Context;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.xhx.module.matter.dao.MatterChargesDao;
+import com.mortals.xhx.module.matter.model.MatterChargesEntity;
+import com.mortals.xhx.module.matter.service.MatterChargesService;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+* MatterChargesService
+* 事项收费标准 service实现
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+@Service("matterChargesService")
+public class MatterChargesServiceImpl extends AbstractCRUDServiceImpl<MatterChargesDao, MatterChargesEntity, Long> implements MatterChargesService {
+
+
+    @Override
+    public void deleteByMatterId(Long matterId, Context context) {
+        Map<String, Object> condition = new HashMap<>();
+        condition.put("matterId", matterId);
+        this.dao.delete(condition);
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterFlowlimitServiceImpl.java

+package com.mortals.xhx.module.matter.service.impl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.matter.model.MatterAcceptEntity;
+import com.mortals.xhx.module.matter.model.MatterEntity;
+import com.mortals.xhx.module.matter.service.MatterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.xhx.module.matter.dao.MatterFlowlimitDao;
+import com.mortals.xhx.module.matter.model.MatterFlowlimitEntity;
+import com.mortals.xhx.module.matter.service.MatterFlowlimitService;
+import org.springframework.util.ObjectUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+* MatterFlowlimitService
+* 事项办理流程 service实现
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+@Service("matterFlowlimitService")
+public class MatterFlowlimitServiceImpl extends AbstractCRUDServiceImpl<MatterFlowlimitDao, MatterFlowlimitEntity, Long> implements MatterFlowlimitService {
+
+    @Autowired
+    private MatterService matterService;
+
+
+    @Override
+    protected void saveBefore(MatterFlowlimitEntity entity, Context context) throws AppException {
+
+        if(!ObjectUtils.isEmpty(entity.getMatterId())){
+            MatterEntity matterEntity = matterService.get(entity.getMatterId());
+            entity.setMatterName(matterEntity==null?"":matterEntity.getMatterName());
+        }
+        super.saveBefore(entity, context);
+    }
+
+    @Override
+    public void deleteByMatterId(Long matterId, Context context) {
+        Map<String, Object> condition = new HashMap<>();
+        condition.put("matterId", matterId);
+        this.dao.delete(condition);
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterIntermediaryServiceImpl.java

+package com.mortals.xhx.module.matter.service.impl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.matter.model.MatterAcceptEntity;
+import com.mortals.xhx.module.matter.model.MatterEntity;
+import com.mortals.xhx.module.matter.service.MatterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.xhx.module.matter.dao.MatterIntermediaryDao;
+import com.mortals.xhx.module.matter.model.MatterIntermediaryEntity;
+import com.mortals.xhx.module.matter.service.MatterIntermediaryService;
+import org.springframework.util.ObjectUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+* MatterIntermediaryService
+* 事项中介服务 service实现
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+@Service("matterIntermediaryService")
+public class MatterIntermediaryServiceImpl extends AbstractCRUDServiceImpl<MatterIntermediaryDao, MatterIntermediaryEntity, Long> implements MatterIntermediaryService {
+
+    @Autowired
+    private MatterService matterService;
+
+    @Override
+    protected void saveBefore(MatterIntermediaryEntity entity, Context context) throws AppException {
+        if(!ObjectUtils.isEmpty(entity.getMatterId())){
+            MatterEntity matterEntity = matterService.get(entity.getMatterId());
+            entity.setMatterName(matterEntity==null?"":matterEntity.getMatterName());
+        }
+        super.saveBefore(entity, context);
+    }
+
+    @Override
+    public void deleteByMatterId(Long matterId, Context context) {
+        Map<String, Object> condition = new HashMap<>();
+        condition.put("matterId", matterId);
+        this.dao.delete(condition);
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterQuestionServiceImpl.java

+package com.mortals.xhx.module.matter.service.impl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.matter.model.MatterAcceptEntity;
+import com.mortals.xhx.module.matter.model.MatterEntity;
+import com.mortals.xhx.module.matter.service.MatterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.xhx.module.matter.dao.MatterQuestionDao;
+import com.mortals.xhx.module.matter.model.MatterQuestionEntity;
+import com.mortals.xhx.module.matter.service.MatterQuestionService;
+import org.springframework.util.ObjectUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+* MatterQuestionService
+* 事项常见问题 service实现
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+@Service("matterQuestionService")
+public class MatterQuestionServiceImpl extends AbstractCRUDServiceImpl<MatterQuestionDao, MatterQuestionEntity, Long> implements MatterQuestionService {
+
+    @Autowired
+    private MatterService matterService;
+
+
+    @Override
+    protected void saveBefore(MatterQuestionEntity entity, Context context) throws AppException {
+
+        if(!ObjectUtils.isEmpty(entity.getMatterId())){
+            MatterEntity matterEntity = matterService.get(entity.getMatterId());
+            entity.setMatterName(matterEntity==null?"":matterEntity.getMatterName());
+        }
+        super.saveBefore(entity, context);
+    }
+
+    @Override
+    public void deleteByMatterId(Long matterId, Context context) {
+        Map<String, Object> condition = new HashMap<>();
+        condition.put("matterId", matterId);
+        this.dao.delete(condition);
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java

 package com.mortals.xhx.module.matter.service.impl;
 
+import cn.hutool.core.util.PageUtil;
 import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.setting.Setting;
 import com.alibaba.fastjson.JSON;
@@ -11,6 +12,7 @@ import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.util.DataUtil;
 import com.mortals.xhx.base.framework.config.InterceptorConfig;
 import com.mortals.xhx.common.code.FiletypeEnum;
 import com.mortals.xhx.common.code.SourceEnum;
@@ -22,13 +24,14 @@ import com.mortals.xhx.module.dept.service.DeptService;
 import com.mortals.xhx.module.matter.dao.MatterDao;
 import com.mortals.xhx.module.matter.model.*;
 import com.mortals.xhx.module.matter.model.vo.MatterInfo;
-import com.mortals.xhx.module.matter.service.MatterDatumFileService;
-import com.mortals.xhx.module.matter.service.MatterDatumService;
-import com.mortals.xhx.module.matter.service.MatterExtService;
-import com.mortals.xhx.module.matter.service.MatterService;
-import com.mortals.xhx.module.site.model.SiteEntity;
-import com.mortals.xhx.module.site.model.SiteMatterEntity;
-import com.mortals.xhx.module.site.model.SiteMatterQuery;
+import com.mortals.xhx.module.matter.service.*;
+import com.mortals.xhx.module.matters.model.MattersDetailEntity;
+import com.mortals.xhx.module.matters.model.MattersDetailQuery;
+import com.mortals.xhx.module.matters.model.MattersEntity;
+import com.mortals.xhx.module.matters.model.MattersQuery;
+import com.mortals.xhx.module.matters.service.MattersDetailService;
+import com.mortals.xhx.module.matters.service.MattersService;
+import com.mortals.xhx.module.site.model.*;
 import com.mortals.xhx.module.site.service.SiteMatterService;
 import com.mortals.xhx.module.site.service.SiteService;
 import lombok.extern.slf4j.Slf4j;
@@ -57,12 +60,28 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
     @Autowired
     private SiteService siteService;
     @Autowired
+    private MattersService mattersService;
+    @Autowired
     private InterceptorConfig interceptorConfig;
     @Autowired
+    private MattersDetailService mattersDetailService;
+    @Autowired
+    private MatterFlowlimitService matterFlowlimitService;
+    @Autowired
+    private MatterAcceptService matterAcceptService;
+    @Autowired
+    private MatterSetbaseService matterSetbaseService;
+    @Autowired
+    private MatterQuestionService matterQuestionService;
+    @Autowired
+    private MatterIntermediaryService matterIntermediaryService;
+    @Autowired
     private MatterDatumService matterDatumService;
     @Autowired
     private MatterDatumFileService matterDatumFileService;
     @Autowired
+    private MatterChargesService matterChargesService;
+    @Autowired
     private DeptService deptService;
     @Autowired
     private MatterExtService matterExtService;
@@ -89,6 +108,33 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
         super.saveBefore(entity, context);
     }
 
+    /**
+     * @param entity
+     * @param context
+     * @throws AppException
+     */
+    @Override
+    protected void saveAfter(MatterEntity entity, Context context) throws AppException {
+        //主题添加自定义关联
+//        if (!ObjectUtils.isEmpty(entity.getThemeCode())) {
+//            SiteThemeEntity siteThemeEntity = siteThemeService.selectOne(new SiteThemeQuery().siteId(entity.getSiteId()).themeCode(entity.getThemeCode()));
+//            SiteThemeMatterEntity siteThemeMatterEntity = new SiteThemeMatterEntity();
+//            siteThemeMatterEntity.initAttrValue();
+//            siteThemeMatterEntity.setThemeCode(entity.getThemeCode());
+//            siteThemeMatterEntity.setSiteId(entity.getSiteId());
+//            siteThemeMatterEntity.setSource(entity.getSource());
+//            siteThemeMatterEntity.setMatterId(entity.getId());
+//            siteThemeMatterEntity.setMatterCode(entity.getMatterNo());
+//            siteThemeMatterEntity.setMatterName(entity.getMatterName());
+//            siteThemeMatterEntity.setUserType(siteThemeEntity == null ? "2" : siteThemeEntity.getUserType());
+//            siteThemeMatterEntity.setCreateTime(new Date());
+//            siteThemeMatterEntity.setCreateUserId(this.getContextUserId(context));
+//            siteThemeMatterService.save(siteThemeMatterEntity, context);
+//        }
+
+        super.saveAfter(entity, context);
+    }
+
     @Override
     protected void updateBefore(MatterEntity entity, Context context) throws AppException {
         if (SourceEnum.自定义.getValue().equals(entity.getSource())) {
@@ -252,6 +298,714 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
         return matterInfoResult;
     }
 
+
+    @Override
+    public void syncMatter(String areaCode, Context context) {
+        List<MatterEntity> list = this.find(new MatterQuery().source(SourceEnum.政务网.getValue()));
+        if (!ObjectUtils.isEmpty(list)) {
+            // TODO: 2022/3/30  查询本地数据，进行交叉更新对比
+            //暂时以删除后重新添加为准
+            //this.getDao().delete(new MatterQuery().source(SourceEnum.政务网.getValue()));
+        }
+        //读取区域数据
+        //mattersAreaService.find()
+        //读取事项基础数据
+
+        MattersQuery mattersQuery = new MattersQuery();
+        if (!ObjectUtils.isEmpty(areaCode)) {
+            //查询区域与当前区域
+        }
+
+        Integer total = mattersService.count(mattersQuery, null);
+        int totalPage = PageUtil.totalPage(total, 1000);
+        for (int i = 0; i < totalPage; i++) {
+            PageInfo pageInfo = new PageInfo();
+            pageInfo.setCurrPage(i);
+            pageInfo.setPrePageResult(1000);
+            List<MattersEntity> mattersEntities = mattersService.find(mattersQuery, pageInfo, null).getList();
+            for (MattersEntity item : mattersEntities) {
+                if ("true".equals(item.getHaveGetMatterInfo())) {
+                    MattersDetailEntity itemDetail = mattersDetailService.selectOne(new MattersDetailQuery().matterCode(item.getMatterCode()));
+                    if (!ObjectUtils.isEmpty(itemDetail)) {
+                        //解析事项详细数据
+                        MatterEntity matterEntity = new MatterEntity();
+                        matterEntity.initAttrValue();
+                        matterEntity.setMatterNo(item.getMatterCode());
+                        matterEntity.setTcode(item.getMatterCode());
+                        matterEntity.setMatterName(item.getName());
+                        matterEntity.setTname(item.getName());
+                        matterEntity.setSource(SourceEnum.政务网.getValue());
+                        matterEntity.setCreateTime(new Date());
+                        matterEntity.setCreateUserName("system");
+                        matterEntity.setCreateUserId(1L);
+                        String basicinfoJbxx = itemDetail.getBasicinfoJbxx();
+                        //解析基础数据
+                        //todo 设置基础值
+                        //基本信息属性与字段映射表
+                        Setting baseInfoSetting = interceptorConfig.getBaseInfoSetting();
+                        Setting sqclInfoSetting = interceptorConfig.getSqclInfoSetting();
+                        createBaseMatterJson(basicinfoJbxx, baseInfoSetting, matterEntity);
+
+                        matterEntity.setAreaCode(item.getAreaCode());
+                        matterEntity.setDeptCode(item.getDeptCode());
+                        matterEntity.setThemeCode(item.getThemeCode());
+                        matterEntity.setPowerCode(item.getPowerCode());
+                        matterEntity.setGroupName(item.getGroupName());
+                        matterEntity.setHaveGetMatterInfo(item.getHaveGetMatterInfo());
+                        matterEntity.setUsertypeCode(item.getUsertypeCode());
+                        matterEntity.setUrl(item.getUrl());
+                        this.save(matterEntity);
+                        //todo 材料
+                        String sqclJson = itemDetail.getMaterialsSqcl();
+                        if (!ObjectUtils.isEmpty(sqclJson) || !"{}".equals(sqclJson)) {
+                            createSqclJson(sqclJson, sqclInfoSetting, matterEntity);
+                        }
+                        //todo 受理条件
+                        String sltjJson = itemDetail.getConditionsSltj();
+                        if (!ObjectUtils.isEmpty(sltjJson) || !"{}".equals(sltjJson)) {
+                            createSltjJson(sltjJson, matterEntity);
+                        }
+
+                        //todo 收费标准
+                        String sfbzJson = itemDetail.getChargingSfbz();
+                        if (!ObjectUtils.isEmpty(sfbzJson) || !"{}".equals(sfbzJson)) {
+                            createSfbzJson(sfbzJson, matterEntity);
+                        }
+                        //todo 办理流程
+                        String bllcJson = itemDetail.getProcessBllc();
+                        if (!ObjectUtils.isEmpty(bllcJson) || !"{}".equals(bllcJson)) {
+                            createBllcJson(bllcJson, matterEntity);
+                        }
+                        //todo 常见问题
+                        String cjwtJson = itemDetail.getQuestionCjwt();
+                        if (!ObjectUtils.isEmpty(cjwtJson) || !"{}".equals(cjwtJson)) {
+                            createCjwtJson(cjwtJson, matterEntity);
+                        }
+                        //todo 设定依据
+                        String sdyjJson = itemDetail.getBasisSdyj();
+                        if (!ObjectUtils.isEmpty(sdyjJson) || !"{}".equals(sdyjJson)) {
+                            createSdyjJson(sdyjJson, matterEntity);
+                        }
+                        //todo 中介服务
+                        String zjfwJson = itemDetail.getIntermediaryZjfw();
+                        if (!ObjectUtils.isEmpty(zjfwJson) || !"{}".equals(zjfwJson)) {
+                            createZjfwJson(zjfwJson, matterEntity);
+                        }
+                    }
+                }
+            }
+            //根据事项查询事项详细等，并更新
+        }
+
+    }
+
+    public void createBaseMatterJson(String baseJson, Setting baseInfoSetting, MatterEntity matterEntity) {
+        JSONObject root = JSON.parseObject(baseJson);
+        JSONArray jsonArray = root.getJSONArray("基本信息");
+        if (!ObjectUtils.isEmpty(jsonArray)) {
+            for (int i = 0; i < jsonArray.size(); i++) {
+                JSONArray subArray = jsonArray.getJSONArray(i);
+                if (!ObjectUtils.isEmpty(subArray)) {
+                    for (int j = 0; j < subArray.size(); j++) {
+                        subArray.getJSONObject(j).entrySet().stream()
+                                .peek(m -> {
+                                    String value = baseInfoSetting.getOrDefault(m.getKey(), "");
+                                    if (!ObjectUtils.isEmpty(value) && !"无".equals(m.getValue())) {
+                                        //value 为对象配置的属性值，反射设置属性值
+                                        try {
+                                            ReflectUtil.setFieldValue(matterEntity, value, m.getValue().toString().replaceAll("、", ","));
+                                        } catch (Exception e) {
+                                            log.error(String.format("设置值异常！key:%s,value:%s", value, m.getValue()));
+                                        }
+                                    }
+                                }).count();
+                    }
+                }
+            }
+        }
+        //反射设置事项属性
+    }
+
+    public void createSqclJson(String sqclJson, Setting sqclInfoSetting, MatterEntity matterEntity) {
+        JSONObject root = null;
+        try {
+            root = JSON.parseObject(sqclJson);
+        } catch (Exception e) {
+            sqclJson = sqclJson.replaceAll("\\\\", "\\\\\\\\");
+            try {
+                root = JSON.parseObject(sqclJson);
+            } catch (Exception e1) {
+                //log.error("error json:" + sqclJson);
+                return;
+            }
+        }
+
+        if (root.isEmpty()) {
+            //log.info("root is null");
+            return;
+        }
+        JSONArray jsonArray = null;
+        try {
+            jsonArray = root.getJSONArray("申请材料");
+        } catch (Exception e) {
+            log.error("error 无申请材料");
+        }
+
+        if (ObjectUtils.isEmpty(jsonArray)) {
+            log.info("申请材料 is null");
+            return;
+        }
+
+        for (int i = 0; i < jsonArray.size(); i++) {
+            JSONObject secondJsonObject = jsonArray.getJSONObject(i);
+            MatterDatumEntity datumEntity = new MatterDatumEntity();
+            datumEntity.initAttrValue();
+            datumEntity.setMatterId(matterEntity.getId());
+            datumEntity.setMaterialName(matterEntity.getMatterName());
+            datumEntity.setSource(SourceEnum.政务网.getValue());
+            datumEntity.setCreateTime(new Date());
+            datumEntity.setCreateUser("system");
+            datumEntity.setCreateUserId(1L);
+
+            //材料详情
+            JSONArray jsonArrayThree = secondJsonObject.getJSONArray("材料详情");
+            if (!ObjectUtils.isEmpty(jsonArrayThree)) {
+                for (int j = 0; j < jsonArrayThree.size(); j++) {
+                    jsonArrayThree.getJSONObject(j).entrySet().stream().peek(m -> {
+                        String value = sqclInfoSetting.getOrDefault(m.getKey(), "");
+                        if (!ObjectUtils.isEmpty(value)) {
+                            //value 为对象配置的属性值，反射设置属性值
+                            try {
+                                ReflectUtil.setFieldValue(datumEntity, value, m.getValue().toString().replaceAll("、", ","));
+                            } catch (Exception e) {
+                                log.error(String.format("设置值异常！key:%s,value:%s", value, m.getValue()));
+                            }
+                        }
+                    }).count();
+                }
+            }
+            matterDatumService.save(datumEntity);
+            //示例样表
+            JSONArray jsonArrayone = secondJsonObject.getJSONArray("示例样表");
+            if (!ObjectUtils.isEmpty(jsonArrayone)) {
+                ArrayList<MatterDatumFileEntity> fileArrayList = new ArrayList<>();
+                for (int j = 0; j < jsonArrayone.size(); j++) {
+                    MatterDatumFileEntity fileEntity = new MatterDatumFileEntity();
+                    fileEntity.setCreateTime(new Date());
+                    fileEntity.setCreateUser("system");
+                    fileEntity.setCreateUserId(1L);
+                    fileEntity.setDatumId(datumEntity.getId());
+                    fileEntity.setMaterialName(datumEntity.getMaterialName());
+                    fileEntity.setSource(SourceEnum.政务网.getValue());
+                    fileEntity.setFiletype(FiletypeEnum.空白表格.getValue());
+                    jsonArrayone.getJSONObject(j).entrySet().stream().peek(m -> {
+                        fileEntity.setFileName(m.getKey());
+                        fileEntity.setFileUrl(m.getValue().toString());
+                    }).count();
+                    fileArrayList.add(fileEntity);
+                }
+                matterDatumFileService.save(fileArrayList);
+
+            }
+            //空白表格
+            JSONArray jsonArraytwo = secondJsonObject.getJSONArray("空白表格");
+            if (!ObjectUtils.isEmpty(jsonArraytwo)) {
+                ArrayList<MatterDatumFileEntity> fileArrayList = new ArrayList<>();
+                for (int j = 0; j < jsonArraytwo.size(); j++) {
+                    MatterDatumFileEntity fileEntity = new MatterDatumFileEntity();
+                    fileEntity.setCreateTime(new Date());
+                    fileEntity.setCreateUser("system");
+                    fileEntity.setDatumId(datumEntity.getId());
+                    fileEntity.setMaterialName(datumEntity.getMaterialName());
+                    fileEntity.setSource(SourceEnum.政务网.getValue());
+                    fileEntity.setFiletype(FiletypeEnum.空白表格.getValue());
+                    jsonArraytwo.getJSONObject(j).entrySet().stream().peek(m -> {
+                        fileEntity.setFileName(m.getKey());
+                        fileEntity.setFileUrl(m.getValue().toString());
+                    }).count();
+                    fileArrayList.add(fileEntity);
+                }
+                matterDatumFileService.save(fileArrayList);
+            }
+        }
+
+    }
+
+    public void createSltjJson(String sltjJson, MatterEntity matterEntity) {
+        if (ObjectUtils.isEmpty(sltjJson) || "{}".equals(sltjJson)) {
+            return;
+        }
+        JSONObject root = null;
+        try {
+            root = JSON.parseObject(sltjJson);
+        } catch (Exception e) {
+            sltjJson = sltjJson.replaceAll("\\\\", "\\\\\\\\");
+            try {
+                root = JSON.parseObject(sltjJson);
+            } catch (Exception e1) {
+                // log.error("error json:" + sltjJson);
+                return;
+            }
+        }
+
+        if (root.isEmpty()) {
+            //log.info("root is null");
+            return;
+        }
+
+        String value = null;
+        try {
+            value = root.getString("受理条件");
+            MatterAcceptEntity matterAcceptEntity = new MatterAcceptEntity();
+            matterAcceptEntity.initAttrValue();
+            matterAcceptEntity.setContent(value);
+            matterAcceptEntity.setMatterId(matterEntity.getId());
+            matterAcceptEntity.setMatterName(matterEntity.getMatterName());
+            matterAcceptEntity.setSource(SourceEnum.政务网.getValue());
+            matterAcceptEntity.setCreateTime(new Date());
+            matterAcceptEntity.setCreateUser("system");
+            matterAcceptEntity.setCreateUserId(1L);
+            matterAcceptService.save(matterAcceptEntity);
+        } catch (Exception e) {
+            log.error("error 受理条件", e);
+        }
+    }
+
+    public void createSfbzJson(String sfbzJson, MatterEntity matterEntity) {
+        if (ObjectUtils.isEmpty(sfbzJson) || "{}".equals(sfbzJson)) {
+            return;
+        }
+        JSONObject root = null;
+        try {
+            root = JSON.parseObject(sfbzJson);
+        } catch (Exception e) {
+            sfbzJson = sfbzJson.replaceAll("\\\\", "\\\\\\\\");
+            try {
+                root = JSON.parseObject(sfbzJson);
+            } catch (Exception e1) {
+                //log.error("error json:" + sfbzJson);
+                return;
+            }
+        }
+
+        if (root.isEmpty()) {
+            //log.info("root is null");
+            return;
+        }
+
+        String value = null;
+        try {
+            value = root.getString("收费标准");
+            MatterChargesEntity matterChargesEntity = new MatterChargesEntity();
+            matterChargesEntity.initAttrValue();
+            matterChargesEntity.setContent(value);
+            matterChargesEntity.setMatterId(matterEntity.getId());
+            matterChargesEntity.setMatterName(matterEntity.getMatterName());
+            matterChargesEntity.setSource(SourceEnum.政务网.getValue());
+            matterChargesEntity.setCreateTime(new Date());
+            matterChargesEntity.setCreateUser("system");
+            matterChargesEntity.setCreateUserId(1L);
+            matterChargesService.save(matterChargesEntity);
+        } catch (Exception e) {
+            log.error("error 收费标准", e);
+        }
+    }
+
+    public void createCjwtJson(String cjwtJson, MatterEntity matterEntity) {
+        if (ObjectUtils.isEmpty(cjwtJson) || "{}".equals(cjwtJson)) {
+            //log.info("json:" + cjwtJson);
+            return;
+        }
+        JSONObject root = null;
+        try {
+            root = JSON.parseObject(cjwtJson);
+        } catch (Exception e) {
+            cjwtJson = cjwtJson.replaceAll("\\\\", "\\\\\\\\");
+            try {
+                root = JSON.parseObject(cjwtJson);
+            } catch (Exception e1) {
+                //log.error("error json:" + cjwtJson);
+                return;
+            }
+        }
+
+        if (root.isEmpty()) {
+            //log.info("root is null");
+            return;
+        }
+        JSONArray jsonArray = null;
+        try {
+            jsonArray = root.getJSONArray("常见问题");
+        } catch (Exception e) {
+            //log.error("error 无常见问题");
+        }
+
+        if (ObjectUtils.isEmpty(jsonArray)) {
+            //log.info("常见问题 is null");
+            return;
+        }
+
+        for (int i = 0; i < jsonArray.size(); i++) {
+            JSONObject jsonObject = jsonArray.getJSONObject(i);
+            List<MatterQuestionEntity> questionEntityList = jsonObject.entrySet().stream().map(question -> {
+                MatterQuestionEntity questionEntity = new MatterQuestionEntity();
+                questionEntity.initAttrValue();
+                questionEntity.setQuestion(question.getKey());
+                questionEntity.setAnswer(question.getValue().toString());
+                questionEntity.setMatterId(matterEntity.getId());
+                questionEntity.setMatterName(matterEntity.getMatterName());
+                questionEntity.setSource(SourceEnum.政务网.getValue());
+                questionEntity.setCreateTime(new Date());
+                questionEntity.setCreateUser("system");
+                return questionEntity;
+            }).collect(Collectors.toList());
+            matterQuestionService.save(questionEntityList);
+        }
+    }
+
+    public void createBllcJson(String bllcJson, MatterEntity matterEntity) {
+        if (ObjectUtils.isEmpty(bllcJson) || "{}".equals(bllcJson)) {
+            //log.info("json:" + cjwtJson);
+            return;
+        }
+        JSONObject root = null;
+        try {
+            root = JSON.parseObject(bllcJson);
+        } catch (Exception e) {
+            bllcJson = bllcJson.replaceAll("\\\\", "\\\\\\\\");
+            try {
+                root = JSON.parseObject(bllcJson);
+            } catch (Exception e1) {
+                log.error("error json:" + bllcJson);
+                return;
+            }
+        }
+
+        if (root == null || root.isEmpty()) {
+            //log.info("root is null");
+            return;
+        }
+        JSONArray jsonArray = null;
+        try {
+            jsonArray = root.getJSONArray("办理流程");
+        } catch (Exception e) {
+            log.error("error 无办理流程");
+        }
+
+        if (ObjectUtils.isEmpty(jsonArray)) {
+            //log.info("办理流程 is null");
+            return;
+        }
+
+        List<MatterFlowlimitEntity> flowlimitEntityArrayList = new ArrayList<>();
+
+        for (int i = 0; i < jsonArray.size(); i++) {
+            MatterFlowlimitEntity matterFlowlimitEntity = new MatterFlowlimitEntity();
+            matterFlowlimitEntity.initAttrValue();
+            matterFlowlimitEntity.setMatterId(matterEntity.getId());
+            matterFlowlimitEntity.setMatterName(matterEntity.getMatterName());
+            matterFlowlimitEntity.setSource(SourceEnum.政务网.getValue());
+            matterFlowlimitEntity.setCreateTime(new Date());
+            matterFlowlimitEntity.setCreateUser("system");
+            matterFlowlimitEntity.setCreateUserId(1L);
+            JSONArray innerJsonArray = jsonArray.getJSONArray(i);
+            for (int j = 0; j < innerJsonArray.size(); j++) {
+                innerJsonArray.getJSONObject(j).entrySet().stream().peek(m -> {
+                    Boolean bool = false;
+                    if ("办理流程".equals(m.getKey().trim())) {
+                        matterFlowlimitEntity.setFlowName(m.getValue().toString());
+                        bool = true;
+                    }
+
+                    if ("办理时长".equals(m.getKey().trim())) {
+                        matterFlowlimitEntity.setFlowTime(m.getValue().toString());
+                        bool = true;
+                    }
+
+                    if ("转外时限".equals(m.getKey().trim())) {
+                        matterFlowlimitEntity.setFlowLimit(m.getValue().toString());
+                        bool = true;
+                    }
+
+                    if ("办理流程说明".equals(m.getKey().trim())) {
+                        matterFlowlimitEntity.setFlowDesc(m.getValue().toString());
+                        bool = true;
+                    }
+//                    if(!bool){
+//                        System.out.println("name:" + m.getKey());
+//                        System.out.print(" value:" + m.getValue());
+//                    }
+                }).count();
+            }
+            flowlimitEntityArrayList.add(matterFlowlimitEntity);
+        }
+        matterFlowlimitService.save(flowlimitEntityArrayList);
+
+    }
+
+    public void createSdyjJson(String sdyjJson, MatterEntity matterEntity) {
+        if (ObjectUtils.isEmpty(sdyjJson) || "{}".equals(sdyjJson)) {
+            //log.info("json:" + cjwtJson);
+            return;
+        }
+        JSONObject root = null;
+        try {
+            root = JSON.parseObject(sdyjJson);
+        } catch (Exception e) {
+            sdyjJson = sdyjJson.replaceAll("\\\\", "\\\\\\\\");
+            try {
+                root = JSON.parseObject(sdyjJson);
+            } catch (Exception e1) {
+                log.error("error json:" + sdyjJson);
+                return;
+            }
+        }
+
+        if (root.isEmpty()) {
+            log.info("root is null");
+            return;
+        }
+        JSONArray jsonArray = null;
+        try {
+            jsonArray = root.getJSONArray("设定依据");
+        } catch (Exception e) {
+            log.error("error 无设定依据");
+        }
+
+        if (ObjectUtils.isEmpty(jsonArray)) {
+            //log.info("设定依据 is null");
+            return;
+        }
+
+        List<MatterSetbaseEntity> setbaseEntityArrayList = new ArrayList<>();
+        for (int i = 0; i < jsonArray.size(); i++) {
+            MatterSetbaseEntity matterSetbaseEntity = new MatterSetbaseEntity();
+            matterSetbaseEntity.setMatterId(matterEntity.getId());
+            matterSetbaseEntity.setMatterName(matterEntity.getMatterName());
+            matterSetbaseEntity.setSource(SourceEnum.政务网.getValue());
+            matterSetbaseEntity.setCreateTime(new Date());
+            matterSetbaseEntity.setCreateUser("system");
+            matterSetbaseEntity.setCreateUserId(1L);
+            JSONArray innerJsonArray = jsonArray.getJSONArray(i);
+            for (int j = 0; j < innerJsonArray.size(); j++) {
+                innerJsonArray.getJSONObject(j).entrySet().stream().peek(m -> {
+                    if ("法律法规名称".equals(m.getKey().trim())) {
+                        matterSetbaseEntity.setPolicyName(m.getValue().toString());
+                    }
+                    if ("法规类型".equals(m.getKey().trim())) {
+                        matterSetbaseEntity.setPolicyType(m.getValue().toString());
+                    }
+
+                    if ("条例".equals(m.getKey().trim())) {
+                        matterSetbaseEntity.setPolicyitem(m.getValue().toString());
+                    }
+
+                    if ("条款内容".equals(m.getKey().trim())) {
+                        matterSetbaseEntity.setContent(m.getValue().toString());
+                    }
+
+                }).count();
+            }
+            setbaseEntityArrayList.add(matterSetbaseEntity);
+        }
+        matterSetbaseService.save(setbaseEntityArrayList);
+
+    }
+
+    public void createZjfwJson(String zjfwJson, MatterEntity matterEntity) {
+        if (ObjectUtils.isEmpty(zjfwJson) || "{}".equals(zjfwJson)) {
+            return;
+        }
+        JSONObject root = null;
+        try {
+            root = JSON.parseObject(zjfwJson);
+        } catch (Exception e) {
+            zjfwJson = zjfwJson.replaceAll("\\\\", "\\\\\\\\");
+            try {
+                root = JSON.parseObject(zjfwJson);
+            } catch (Exception e1) {
+                log.error("error json:" + zjfwJson);
+                return;
+            }
+        }
+
+        if (root.isEmpty()) {
+            log.info("root is null");
+            return;
+        }
+        JSONArray jsonArray = null;
+        try {
+            jsonArray = root.getJSONArray("中介服务");
+        } catch (Exception e) {
+            //log.error("error 中介服务:"+zjfwJson);
+        }
+
+        if (ObjectUtils.isEmpty(jsonArray)) {
+            // log.info("中介服务 is null");
+            return;
+        }
+        List<MatterIntermediaryEntity> intermediaryEntityArrayList = new ArrayList<>();
+        for (int i = 0; i < jsonArray.size(); i++) {
+            MatterIntermediaryEntity matterIntermediaryEntity = new MatterIntermediaryEntity();
+            matterIntermediaryEntity.initAttrValue();
+            matterIntermediaryEntity.setMatterId(matterEntity.getId());
+            matterIntermediaryEntity.setMatterName(matterEntity.getMatterName());
+            matterIntermediaryEntity.setSource(SourceEnum.政务网.getValue());
+            matterIntermediaryEntity.setCreateTime(new Date());
+            matterIntermediaryEntity.setCreateUser("system");
+            matterIntermediaryEntity.setCreateUserId(1L);
+
+            jsonArray.getJSONObject(i).entrySet().stream().forEach(m -> {
+                matterIntermediaryEntity.setTitle(m.getKey().trim());
+                matterIntermediaryEntity.setRemark(m.getValue().toString());
+
+                if ("中介服务实施机构及资质资格要求".equals(m.getKey().trim())) {
+                    matterIntermediaryEntity.setIntermediaryRequest(m.getValue().toString());
+                }
+
+                if ("服务时限".equals(m.getKey().trim())) {
+                    matterIntermediaryEntity.setIntermediaryRequestTime(m.getValue().toString());
+                }
+              /*  if ("中介服务事项名称".equals(m.getKey().trim())) {
+                    matterIntermediaryEntity.setTitle(m.getValue().toString());
+                }
+              */
+            });
+            intermediaryEntityArrayList.add(matterIntermediaryEntity);
+        }
+        matterIntermediaryService.save(intermediaryEntityArrayList);
+    }
+
+    @Override
+    public Map<String, String> getBaseInfoMap(Context context) {
+        Map<String, String> baseInfoMap = new HashMap<>();
+        List<MattersDetailEntity> mattersDetailEntities = mattersDetailService.find(new MattersDetailQuery());
+        for (MattersDetailEntity itemDetail : mattersDetailEntities) {
+            buildBaseJson(itemDetail.getBasicinfoJbxx(), baseInfoMap);
+        }
+        return baseInfoMap;
+    }
+
+    @Override
+    public Map<String, String> getSqclInfoMap(Context context) {
+        Map<String, String> sqclInfoMap = new HashMap<>();
+        List<MattersDetailEntity> mattersDetailEntities = mattersDetailService.find(new MattersDetailQuery());
+        for (MattersDetailEntity itemDetail : mattersDetailEntities) {
+            buildSqclJson(itemDetail.getMaterialsSqcl(), sqclInfoMap);
+        }
+        return sqclInfoMap;
+    }
+
+
+    public void buildBaseJson(String json, Map<String, String> model) {
+        //将基本信息转成map集合返回
+        JSONObject root = JSON.parseObject(json);
+        JSONArray jsonArray = root.getJSONArray("基本信息");
+        if (!ObjectUtils.isEmpty(jsonArray)) {
+            for (int i = 0; i < jsonArray.size(); i++) {
+                JSONArray subArray = jsonArray.getJSONArray(i);
+                if (!ObjectUtils.isEmpty(subArray)) {
+                    for (int j = 0; j < subArray.size(); j++) {
+                        subArray.getJSONObject(j).entrySet().stream()
+                                .filter(f -> f.getKey().length() < 12)
+                                .filter(f -> f.getKey().indexOf("许可证") == -1)
+                                .filter(f -> f.getKey().indexOf("《") == -1)
+                                .filter(f -> f.getKey().indexOf("x") == -1)
+                                .filter(f -> f.getKey().indexOf("X") == -1)
+                                .filter(f -> f.getKey().indexOf("*") == -1)
+                                .filter(f -> f.getKey().indexOf("关于") == -1)
+                                .filter(f -> f.getKey().indexOf(".") == -1)
+                                .filter(f -> DataUtil.converStr2Int(f.getKey(), 0) == 0)
+                                .filter(f -> !"下载".equals(f.getValue().toString().trim()))
+                                .filter(f -> !"查看".equals(f.getValue().toString().trim()))
+                                .peek(m -> {
+                                    // model.put(m.getKey(), m.getValue().toString());
+                                    model.put(m.getKey(), "");
+                                }).count();
+                    }
+                }
+            }
+
+        }
+    }
+
+
+    public void buildSqclJson(String sqclJson, Map<String, String> model) {
+        //将基本信息转成map集合返回
+        JSONObject root = null;
+        try {
+            root = JSON.parseObject(sqclJson);
+        } catch (Exception e) {
+            sqclJson = sqclJson.replaceAll("\\\\", "\\\\\\\\");
+            try {
+                root = JSON.parseObject(sqclJson);
+            } catch (Exception e1) {
+                log.error("error json:" + sqclJson);
+                return;
+            }
+        }
+
+        if (root.isEmpty()) {
+            log.info("root is null");
+            return;
+        }
+        JSONArray jsonArray = null;
+        try {
+            jsonArray = root.getJSONArray("申请材料");
+        } catch (Exception e) {
+            log.error("error 无申请材料");
+        }
+
+        if (ObjectUtils.isEmpty(jsonArray)) {
+            //  log.info("申请材料 is null");
+            return;
+        }
+        if (!ObjectUtils.isEmpty(jsonArray)) {
+            for (int i = 0; i < jsonArray.size(); i++) {
+                try {
+                    JSONObject subObject = jsonArray.getJSONObject(i);
+                    if (!ObjectUtils.isEmpty(subObject)) {
+                        JSONArray subsArray = subObject.getJSONArray("材料详情");
+                        if (!ObjectUtils.isEmpty(subsArray)) {
+                            for (int j = 0; j < subsArray.size(); j++) {
+                                subsArray.getJSONObject(j).entrySet().stream()
+                                        .peek(m -> {
+                                            if ("要求提供材料的依据".equals(m.getKey())
+                                                    || "备注".equals(m.getKey())
+                                                    || "来源渠道说明".equals(m.getKey())
+                                                    || "材料名称".equals(m.getKey())
+                                                    || "受理标准".equals(m.getKey())
+                                                    || "填报须知".equals(m.getKey())
+                                                    || "来源渠道".equals(m.getKey())) {
+                                                model.put(m.getKey(), "");
+                                            } else {
+                                                if (model.containsKey(m.getKey())) {
+                                                    String value = model.get(m.getKey());
+                                                    Set<String> valueSet = Arrays.asList(value.split(",")).stream().collect(Collectors.toSet());
+                                                    if (!valueSet.contains(m.getValue().toString())) {
+                                                        valueSet.add(m.getValue().toString());
+                                                    }
+                                                    model.put(m.getKey(), valueSet.stream().collect(Collectors.joining(",")));
+                                                } else {
+                                                    model.put(m.getKey(), m.getValue().toString());
+                                                }
+                                            }
+                                            //log.info(String.format("model:%s", JSON.toJSONString(model)));
+                                            // model.put(m.getKey(), m.getValue().toString());
+                                            //model.put(m.getKey(), "");
+                                        }).count();
+                            }
+                        }
+                    }
+                } catch (Exception e) {
+                    log.error("异常:" + sqclJson);
+                }
+            }
+
+        }
+    }
+
+
     @Override
     public Rest<String> buildMatterDetail(MatterEntity matterEntity, Context context) {
         //根据事项url 获取事项详细信息，构建相关详细信息
@@ -280,6 +1034,24 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
             //更新材料属性
             saveDatumInfo(matterEntity, context, dom, sqclInfoSetting);
 
+            //更新受理条件
+            saveSltjInfo(matterEntity, context, dom);
+
+            //更新办理流程
+            saveBllcInfo(matterEntity, context, dom);
+
+            //更新收费标准
+            saveSfbzInfo(matterEntity, context, dom);
+
+            //设定依据
+            saveSdyjInfo(matterEntity, context, dom);
+
+            //中介服务
+            saveZjfwInfo(matterEntity, context, dom);
+
+            //常见问题
+            saveCjwtInfo(matterEntity, context, dom);
+
             //更新事项更新标志
             matterEntity.setHaveGetMatterInfo("true");
 
@@ -291,7 +1063,100 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
     }
 
 
+    private void saveCjwtInfo(MatterEntity matterEntity, Context context, Document dom) {
+        matterQuestionService.deleteByMatterId(matterEntity.getId(), context);
+        List<Map<String, Object>> cjwtMapList = MatterDetailHtmlParseUtil.getCjwtMapByHtml(dom);
+        List<MatterQuestionEntity> questionEntityList = new ArrayList<>();
+        for (Map<String, Object> cjwtMap : cjwtMapList) {
+            List<MatterQuestionEntity> collect = cjwtMap.entrySet().stream().map(question -> {
+                MatterQuestionEntity questionEntity = new MatterQuestionEntity();
+                questionEntity.initAttrValue();
+                questionEntity.setQuestion(question.getKey());
+                questionEntity.setAnswer(question.getValue().toString());
+                questionEntity.setMatterId(matterEntity.getId());
+                questionEntity.setMatterCode(matterEntity.getMatterNo());
+                questionEntity.setMatterName(matterEntity.getMatterName());
+                questionEntity.setSource(SourceEnum.政务网.getValue());
+                questionEntity.setCreateTime(new Date());
+                questionEntity.setCreateUser("system");
+                return questionEntity;
+            }).collect(Collectors.toList());
+            questionEntityList.addAll(collect);
+        }
+        matterQuestionService.save(questionEntityList);
+    }
+
+    private void saveZjfwInfo(MatterEntity matterEntity, Context context, Document dom) {
+        matterIntermediaryService.deleteByMatterId(matterEntity.getId(), context);
+        Map<String, String> zjfwMap = MatterDetailHtmlParseUtil.getZjfwMapByHtml(dom);
+        List<MatterIntermediaryEntity> intermediaryEntityArrayList = new ArrayList<>();
+        zjfwMap.entrySet().stream().forEach(m -> {
+            MatterIntermediaryEntity matterIntermediaryEntity = new MatterIntermediaryEntity();
+            matterIntermediaryEntity.initAttrValue();
+            matterIntermediaryEntity.setMatterId(matterEntity.getId());
+            matterIntermediaryEntity.setMatterCode(matterEntity.getMatterNo());
+            matterIntermediaryEntity.setMatterName(matterEntity.getMatterName());
+            matterIntermediaryEntity.setSource(SourceEnum.政务网.getValue());
+            matterIntermediaryEntity.setCreateTime(new Date());
+            matterIntermediaryEntity.setCreateUser("system");
+            matterIntermediaryEntity.setCreateUserId(1L);
+            matterIntermediaryEntity.setTitle(m.getKey().trim());
+            matterIntermediaryEntity.setRemark(m.getValue());
+            intermediaryEntityArrayList.add(matterIntermediaryEntity);
+        });
+        matterIntermediaryService.save(intermediaryEntityArrayList);
+    }
 
+    private void saveSdyjInfo(MatterEntity matterEntity, Context context, Document dom) {
+        matterSetbaseService.deleteByMatterId(matterEntity.getId(), context);
+        List<MatterSetbaseEntity> setbaseEntityArrayList = new ArrayList<>();
+        List<Map<String, Object>> sdyjMapList = MatterDetailHtmlParseUtil.getSdyjMapByHtml(dom);
+        for (Map<String, Object> sdyjMap : sdyjMapList) {
+            MatterSetbaseEntity matterSetbaseEntity = new MatterSetbaseEntity();
+            matterSetbaseEntity.setMatterId(matterEntity.getId());
+            matterSetbaseEntity.setMatterCode(matterEntity.getMatterNo());
+            matterSetbaseEntity.setMatterName(matterEntity.getMatterName());
+            matterSetbaseEntity.setSource(SourceEnum.政务网.getValue());
+            matterSetbaseEntity.setCreateTime(new Date());
+            matterSetbaseEntity.setCreateUser("system");
+            matterSetbaseEntity.setCreateUserId(1L);
+            sdyjMap.entrySet().stream().forEach(m -> {
+                if ("法律法规名称".equals(m.getKey().trim())) {
+                    matterSetbaseEntity.setPolicyName(m.getValue().toString());
+                }
+                if ("法规类型".equals(m.getKey().trim())) {
+                    matterSetbaseEntity.setPolicyType(m.getValue().toString());
+                }
+
+                if ("条例".equals(m.getKey().trim())) {
+                    matterSetbaseEntity.setPolicyitem(m.getValue().toString());
+                }
+
+                if ("条款内容".equals(m.getKey().trim())) {
+                    matterSetbaseEntity.setContent(m.getValue().toString());
+                }
+
+            });
+            setbaseEntityArrayList.add(matterSetbaseEntity);
+        }
+        matterSetbaseService.save(setbaseEntityArrayList);
+    }
+
+    private void saveSfbzInfo(MatterEntity matterEntity, Context context, Document dom) {
+        Map<String, String> sfbzMap = MatterDetailHtmlParseUtil.getSfbzMapByHtml(dom);
+        matterChargesService.deleteByMatterId(matterEntity.getId(), context);
+        MatterChargesEntity matterChargesEntity = new MatterChargesEntity();
+        matterChargesEntity.initAttrValue();
+        matterChargesEntity.setContent(sfbzMap.getOrDefault("sfbz", ""));
+        matterChargesEntity.setMatterId(matterEntity.getId());
+        matterChargesEntity.setMatterCode(matterEntity.getMatterNo());
+        matterChargesEntity.setMatterName(matterEntity.getMatterName());
+        matterChargesEntity.setSource(SourceEnum.政务网.getValue());
+        matterChargesEntity.setCreateTime(new Date());
+        matterChargesEntity.setCreateUser("system");
+        matterChargesEntity.setCreateUserId(1L);
+        matterChargesService.save(matterChargesEntity);
+    }
 
     private void savebaseInfo(MatterEntity matterEntity, Document dom, Setting baseInfoSetting) {
         Map<String, String> baseInfoMap = MatterDetailHtmlParseUtil.getbaseInfoMapByHtml(dom);
@@ -331,6 +1196,55 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
 
     }
 
+    private void saveBllcInfo(MatterEntity matterEntity, Context context, Document dom) {
+        List<Map<String, Object>> bllcMapList = MatterDetailHtmlParseUtil.getbllcMapByHtml(dom);
+        matterFlowlimitService.deleteByMatterId(matterEntity.getId(), context);
+        List<MatterFlowlimitEntity> flowlimitEntityArrayList = new ArrayList<>();
+        for (Map<String, Object> bllcMap : bllcMapList) {
+            MatterFlowlimitEntity matterFlowlimitEntity = new MatterFlowlimitEntity();
+            matterFlowlimitEntity.initAttrValue();
+            matterFlowlimitEntity.setMatterId(matterEntity.getId());
+            matterFlowlimitEntity.setMatterCode(matterEntity.getMatterNo());
+            matterFlowlimitEntity.setMatterName(matterEntity.getMatterName());
+            matterFlowlimitEntity.setSource(SourceEnum.政务网.getValue());
+            matterFlowlimitEntity.setCreateTime(new Date());
+            matterFlowlimitEntity.setCreateUser("system");
+            matterFlowlimitEntity.setCreateUserId(1L);
+
+            bllcMap.entrySet().stream().forEach(m -> {
+                if ("办理流程".equals(m.getKey().trim())) {
+                    matterFlowlimitEntity.setFlowName(m.getValue().toString());
+                }
+                if ("办理时长".equals(m.getKey().trim())) {
+                    matterFlowlimitEntity.setFlowTime(m.getValue().toString());
+                }
+                if ("转外时限".equals(m.getKey().trim())) {
+                    matterFlowlimitEntity.setFlowLimit(m.getValue().toString());
+                }
+                if ("办理流程说明".equals(m.getKey().trim())) {
+                    matterFlowlimitEntity.setFlowDesc(m.getValue().toString());
+                }
+            });
+            flowlimitEntityArrayList.add(matterFlowlimitEntity);
+        }
+        matterFlowlimitService.save(flowlimitEntityArrayList);
+    }
+
+    private void saveSltjInfo(MatterEntity matterEntity, Context context, Document dom) {
+        matterAcceptService.deleteByMatterId(matterEntity.getId(), context);
+        Map<String, String> sltjMap = MatterDetailHtmlParseUtil.getSltjMapByHtml(dom);
+        MatterAcceptEntity matterAcceptEntity = new MatterAcceptEntity();
+        matterAcceptEntity.initAttrValue();
+        matterAcceptEntity.setContent(sltjMap.getOrDefault("sltj", ""));
+        matterAcceptEntity.setMatterId(matterEntity.getId());
+        matterAcceptEntity.setMatterCode(matterEntity.getMatterNo());
+        matterAcceptEntity.setMatterName(matterEntity.getMatterName());
+        matterAcceptEntity.setSource(SourceEnum.政务网.getValue());
+        matterAcceptEntity.setCreateTime(new Date());
+        matterAcceptEntity.setCreateUser("system");
+        matterAcceptEntity.setCreateUserId(1L);
+        matterAcceptService.save(matterAcceptEntity);
+    }
 
     private void saveDatumInfo(MatterEntity matterEntity, Context context, Document dom, Setting sqclInfoSetting) {
         Long[] datumIds = matterDatumService.find(new MatterDatumQuery().matterId(matterEntity.getId()).source(SourceEnum.政务网.getValue())).stream().map(item -> item.getId()).toArray(Long[]::new);

single-matter/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterSetbaseServiceImpl.java

+package com.mortals.xhx.module.matter.service.impl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.matter.model.MatterAcceptEntity;
+import com.mortals.xhx.module.matter.model.MatterEntity;
+import com.mortals.xhx.module.matter.service.MatterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.xhx.module.matter.dao.MatterSetbaseDao;
+import com.mortals.xhx.module.matter.model.MatterSetbaseEntity;
+import com.mortals.xhx.module.matter.service.MatterSetbaseService;
+import org.springframework.util.ObjectUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+* MatterSetbaseService
+* 事项设定依据 service实现
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+@Service("matterSetbaseService")
+public class MatterSetbaseServiceImpl extends AbstractCRUDServiceImpl<MatterSetbaseDao, MatterSetbaseEntity, Long> implements MatterSetbaseService {
+
+    @Autowired
+    private MatterService matterService;
+
+
+    @Override
+    protected void saveBefore(MatterSetbaseEntity entity, Context context) throws AppException {
+
+        if(!ObjectUtils.isEmpty(entity.getMatterId())){
+            MatterEntity matterEntity = matterService.get(entity.getMatterId());
+            entity.setMatterName(matterEntity==null?"":matterEntity.getMatterName());
+        }
+        super.saveBefore(entity, context);
+    }
+
+    @Override
+    public void deleteByMatterId(Long matterId, Context context) {
+        Map<String, Object> condition = new HashMap<>();
+        condition.put("matterId", matterId);
+        this.dao.delete(condition);
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/web/MatterAcceptController.java

+package com.mortals.xhx.module.matter.web;
+
+import com.mortals.framework.model.Context;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.matter.model.MatterAcceptEntity;
+import com.mortals.xhx.module.matter.service.MatterAcceptService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * 事项受理条件
+ *
+ * @author zxfei
+ * @date 2022-01-20
+ */
+@RestController
+@RequestMapping("matter/accept")
+public class MatterAcceptController extends BaseCRUDJsonBodyMappingController<MatterAcceptService, MatterAcceptEntity, Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public MatterAcceptController() {
+        super.setFormClass(MatterAcceptForm.class);
+        super.setModuleDesc("事项受理条件");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        this.addDict(model, "source", paramService.getParamBySecondOrganize("MatterAccept", "source"));
+        super.init(model, context);
+    }
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/web/MatterAcceptForm.java

+package com.mortals.xhx.module.matter.web;
+
+
+import com.mortals.framework.web.BaseCRUDFormLong;
+import com.mortals.xhx.module.matter.model.MatterAcceptEntity;
+import com.mortals.xhx.module.matter.model.MatterAcceptQuery;
+
+/**
+* MatterAccept
+*
+* 事项受理条件 Form
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+public class MatterAcceptForm extends BaseCRUDFormLong<MatterAcceptEntity> {
+    private MatterAcceptEntity entity = new MatterAcceptEntity();
+    private MatterAcceptQuery query = new MatterAcceptQuery();
+    public MatterAcceptForm(){
+    }
+
+    @Override
+    public MatterAcceptEntity getEntity() {
+        return entity;
+    }
+
+    public void setMatterAccept(MatterAcceptEntity entity) {
+        this.entity = entity;
+    }
+
+    @Override
+    public MatterAcceptQuery getQuery() {
+        return query;
+    }
+
+    public void setQuery(MatterAcceptQuery query) {
+        this.query = query;
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/web/MatterChargesController.java

+package com.mortals.xhx.module.matter.web;
+
+import com.mortals.framework.model.Context;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.matter.model.MatterChargesEntity;
+import com.mortals.xhx.module.matter.service.MatterChargesService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * 事项收费标准
+ *
+ * @author zxfei
+ * @date 2022-01-20
+ */
+@RestController
+@RequestMapping("matter/charges")
+public class MatterChargesController extends BaseCRUDJsonBodyMappingController<MatterChargesService, MatterChargesEntity, Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public MatterChargesController() {
+        super.setFormClass(MatterChargesForm.class);
+        super.setModuleDesc("事项收费标准");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        this.addDict(model, "source", paramService.getParamBySecondOrganize("MatterCharges", "source"));
+        super.init(model, context);
+    }
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/web/MatterChargesForm.java

+package com.mortals.xhx.module.matter.web;
+
+
+import com.mortals.framework.web.BaseCRUDFormLong;
+import com.mortals.xhx.module.matter.model.MatterChargesEntity;
+import com.mortals.xhx.module.matter.model.MatterChargesQuery;
+
+/**
+* MatterCharges
+*
+* 事项收费标准 Form
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+public class MatterChargesForm extends BaseCRUDFormLong<MatterChargesEntity> {
+    private MatterChargesEntity entity = new MatterChargesEntity();
+    private MatterChargesQuery query = new MatterChargesQuery();
+    public MatterChargesForm(){
+    }
+
+    @Override
+    public MatterChargesEntity getEntity() {
+        return entity;
+    }
+
+    public void setMatterCharges(MatterChargesEntity entity) {
+        this.entity = entity;
+    }
+
+    @Override
+    public MatterChargesQuery getQuery() {
+        return query;
+    }
+
+    public void setQuery(MatterChargesQuery query) {
+        this.query = query;
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/web/MatterFlowlimitController.java

+package com.mortals.xhx.module.matter.web;
+
+import com.mortals.framework.model.Context;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.matter.model.MatterFlowlimitEntity;
+import com.mortals.xhx.module.matter.service.MatterFlowlimitService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * 事项办理流程
+ *
+ * @author zxfei
+ * @date 2022-01-20
+ */
+@RestController
+@RequestMapping("matter/flowlimit")
+public class MatterFlowlimitController extends BaseCRUDJsonBodyMappingController<MatterFlowlimitService, MatterFlowlimitEntity, Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public MatterFlowlimitController() {
+        super.setFormClass(MatterFlowlimitForm.class);
+        super.setModuleDesc("事项办理流程");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        this.addDict(model, "source", paramService.getParamBySecondOrganize("MatterFlowlimit", "source"));
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/web/MatterFlowlimitForm.java

+package com.mortals.xhx.module.matter.web;
+
+
+import com.mortals.framework.web.BaseCRUDFormLong;
+import com.mortals.xhx.module.matter.model.MatterFlowlimitEntity;
+import com.mortals.xhx.module.matter.model.MatterFlowlimitQuery;
+
+/**
+* MatterFlowlimit
+*
+* 事项办理流程 Form
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+public class MatterFlowlimitForm extends BaseCRUDFormLong<MatterFlowlimitEntity> {
+    private MatterFlowlimitEntity entity = new MatterFlowlimitEntity();
+    private MatterFlowlimitQuery query = new MatterFlowlimitQuery();
+    public MatterFlowlimitForm(){
+    }
+
+    @Override
+    public MatterFlowlimitEntity getEntity() {
+        return entity;
+    }
+
+    public void setMatterFlowlimit(MatterFlowlimitEntity entity) {
+        this.entity = entity;
+    }
+
+    @Override
+    public MatterFlowlimitQuery getQuery() {
+        return query;
+    }
+
+    public void setQuery(MatterFlowlimitQuery query) {
+        this.query = query;
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/web/MatterIntermediaryController.java

+package com.mortals.xhx.module.matter.web;
+
+import com.mortals.framework.model.Context;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.matter.model.MatterIntermediaryEntity;
+import com.mortals.xhx.module.matter.service.MatterIntermediaryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * 事项中介服务
+ *
+ * @author zxfei
+ * @date 2022-01-20
+ */
+@RestController
+@RequestMapping("matter/intermediary")
+public class MatterIntermediaryController extends BaseCRUDJsonBodyMappingController<MatterIntermediaryService, MatterIntermediaryEntity, Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public MatterIntermediaryController() {
+        super.setFormClass(MatterIntermediaryForm.class);
+        super.setModuleDesc("事项中介服务");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        this.addDict(model, "source", paramService.getParamBySecondOrganize("MatterIntermediary", "source"));
+        super.init(model, context);
+    }
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/web/MatterIntermediaryForm.java

+package com.mortals.xhx.module.matter.web;
+
+
+import com.mortals.framework.web.BaseCRUDFormLong;
+import com.mortals.xhx.module.matter.model.MatterIntermediaryEntity;
+import com.mortals.xhx.module.matter.model.MatterIntermediaryQuery;
+
+/**
+* MatterIntermediary
+*
+* 事项中介服务 Form
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+public class MatterIntermediaryForm extends BaseCRUDFormLong<MatterIntermediaryEntity> {
+    private MatterIntermediaryEntity entity = new MatterIntermediaryEntity();
+    private MatterIntermediaryQuery query = new MatterIntermediaryQuery();
+    public MatterIntermediaryForm(){
+    }
+
+    @Override
+    public MatterIntermediaryEntity getEntity() {
+        return entity;
+    }
+
+    public void setMatterIntermediary(MatterIntermediaryEntity entity) {
+        this.entity = entity;
+    }
+
+    @Override
+    public MatterIntermediaryQuery getQuery() {
+        return query;
+    }
+
+    public void setQuery(MatterIntermediaryQuery query) {
+        this.query = query;
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/web/MatterQuestionController.java

+package com.mortals.xhx.module.matter.web;
+
+import com.mortals.framework.model.Context;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.matter.model.MatterQuestionEntity;
+import com.mortals.xhx.module.matter.service.MatterQuestionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * 事项常见问题
+ *
+ * @author zxfei
+ * @date 2022-01-20
+ */
+@RestController
+@RequestMapping("matter/question")
+public class MatterQuestionController extends BaseCRUDJsonBodyMappingController<MatterQuestionService, MatterQuestionEntity, Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public MatterQuestionController() {
+        super.setFormClass(MatterQuestionForm.class);
+        super.setModuleDesc("事项常见问题");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        this.addDict(model, "source", paramService.getParamBySecondOrganize("MatterQuestion", "source"));
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/web/MatterQuestionForm.java

+package com.mortals.xhx.module.matter.web;
+
+
+import com.mortals.framework.web.BaseCRUDFormLong;
+import com.mortals.xhx.module.matter.model.MatterQuestionEntity;
+import com.mortals.xhx.module.matter.model.MatterQuestionQuery;
+
+/**
+* MatterQuestion
+*
+* 事项常见问题 Form
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+public class MatterQuestionForm extends BaseCRUDFormLong<MatterQuestionEntity> {
+    private MatterQuestionEntity entity = new MatterQuestionEntity();
+    private MatterQuestionQuery query = new MatterQuestionQuery();
+    public MatterQuestionForm(){
+    }
+
+    @Override
+    public MatterQuestionEntity getEntity() {
+        return entity;
+    }
+
+    public void setMatterQuestion(MatterQuestionEntity entity) {
+        this.entity = entity;
+    }
+
+    @Override
+    public MatterQuestionQuery getQuery() {
+        return query;
+    }
+
+    public void setQuery(MatterQuestionQuery query) {
+        this.query = query;
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/web/MatterSetbaseController.java

+package com.mortals.xhx.module.matter.web;
+
+import com.mortals.framework.model.Context;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.matter.model.MatterSetbaseEntity;
+import com.mortals.xhx.module.matter.service.MatterSetbaseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * 事项设定依据
+ *
+ * @author zxfei
+ * @date 2022-01-20
+ */
+@RestController
+@RequestMapping("matter/setbase")
+public class MatterSetbaseController extends BaseCRUDJsonBodyMappingController<MatterSetbaseService, MatterSetbaseEntity, Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public MatterSetbaseController() {
+        super.setFormClass(MatterSetbaseForm.class);
+        super.setModuleDesc("事项设定依据");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        this.addDict(model, "policyType", paramService.getParamBySecondOrganize("MatterSetbase", "policyType"));
+        this.addDict(model, "source", paramService.getParamBySecondOrganize("MatterSetbase", "source"));
+        super.init(model, context);
+    }
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matter/web/MatterSetbaseForm.java

+package com.mortals.xhx.module.matter.web;
+
+
+import com.mortals.framework.web.BaseCRUDFormLong;
+import com.mortals.xhx.module.matter.model.MatterSetbaseEntity;
+import com.mortals.xhx.module.matter.model.MatterSetbaseQuery;
+
+/**
+* MatterSetbase
+*
+* 事项设定依据 Form
+*
+* @author zxfei
+* @date 2022-01-12
+*/
+public class MatterSetbaseForm extends BaseCRUDFormLong<MatterSetbaseEntity> {
+    private MatterSetbaseEntity entity = new MatterSetbaseEntity();
+    private MatterSetbaseQuery query = new MatterSetbaseQuery();
+    public MatterSetbaseForm(){
+    }
+
+    @Override
+    public MatterSetbaseEntity getEntity() {
+        return entity;
+    }
+
+    public void setMatterSetbase(MatterSetbaseEntity entity) {
+        this.entity = entity;
+    }
+
+    @Override
+    public MatterSetbaseQuery getQuery() {
+        return query;
+    }
+
+    public void setQuery(MatterSetbaseQuery query) {
+        this.query = query;
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/dao/MattersAreaDao.java

+package com.mortals.xhx.module.matters.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.matters.model.MattersAreaEntity;
+import java.util.List;
+/**
+* 区域Dao
+* 区域 DAO接口
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+public interface  MattersAreaDao extends ICRUDDao<MattersAreaEntity,Long>{
+
+
+}

single-matter/src/main/java/com/mortals/xhx/module/matters/dao/MattersDao.java

+package com.mortals.xhx.module.matters.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.matters.model.MattersEntity;
+import java.util.List;
+/**
+* 事项列Dao
+* 事项列 DAO接口
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+public interface  MattersDao extends ICRUDDao<MattersEntity,Long>{
+
+
+}

single-matter/src/main/java/com/mortals/xhx/module/matters/dao/MattersDeptDao.java

+package com.mortals.xhx.module.matters.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.matters.model.MattersDeptEntity;
+import java.util.List;
+/**
+* 部门Dao
+* 部门 DAO接口
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+public interface  MattersDeptDao extends ICRUDDao<MattersDeptEntity,Long>{
+
+
+}

single-matter/src/main/java/com/mortals/xhx/module/matters/dao/MattersDetailDao.java

+package com.mortals.xhx.module.matters.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.matters.model.MattersDetailEntity;
+import java.util.List;
+/**
+* 事项详情Dao
+* 事项详情 DAO接口
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+public interface  MattersDetailDao extends ICRUDDao<MattersDetailEntity,Long>{
+
+
+}

single-matter/src/main/java/com/mortals/xhx/module/matters/dao/MattersPowerDao.java

+package com.mortals.xhx.module.matters.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.matters.model.MattersPowerEntity;
+import java.util.List;
+/**
+* 行政权力Dao
+* 行政权力 DAO接口
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+public interface  MattersPowerDao extends ICRUDDao<MattersPowerEntity,Long>{
+
+
+}

single-matter/src/main/java/com/mortals/xhx/module/matters/dao/MattersThemeDao.java

+package com.mortals.xhx.module.matters.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.matters.model.MattersThemeEntity;
+import java.util.List;
+/**
+* 主题Dao
+* 主题 DAO接口
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+public interface  MattersThemeDao extends ICRUDDao<MattersThemeEntity,Long>{
+
+
+}

single-matter/src/main/java/com/mortals/xhx/module/matters/dao/MattersUsertypeDao.java

+package com.mortals.xhx.module.matters.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.matters.model.MattersUsertypeEntity;
+import java.util.List;
+/**
+* 服务类型Dao
+* 服务类型 DAO接口
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+public interface  MattersUsertypeDao extends ICRUDDao<MattersUsertypeEntity,Long>{
+
+
+}

single-matter/src/main/java/com/mortals/xhx/module/matters/dao/ibatis/MattersAreaDaoImpl.java

+package com.mortals.xhx.module.matters.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.matters.dao.MattersAreaDao;
+import com.mortals.xhx.module.matters.model.MattersAreaEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 区域DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+@Repository("mattersAreaDao")
+public class MattersAreaDaoImpl extends BaseCRUDDaoMybatis<MattersAreaEntity,Long> implements MattersAreaDao {
+
+
+
+}

single-matter/src/main/java/com/mortals/xhx/module/matters/dao/ibatis/MattersDaoImpl.java

+package com.mortals.xhx.module.matters.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.matters.dao.MattersDao;
+import com.mortals.xhx.module.matters.model.MattersEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 事项列DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+@Repository("mattersDao")
+public class MattersDaoImpl extends BaseCRUDDaoMybatis<MattersEntity,Long> implements MattersDao {
+
+
+
+}

single-matter/src/main/java/com/mortals/xhx/module/matters/dao/ibatis/MattersDeptDaoImpl.java

+package com.mortals.xhx.module.matters.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.matters.dao.MattersDeptDao;
+import com.mortals.xhx.module.matters.model.MattersDeptEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 部门DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+@Repository("mattersDeptDao")
+public class MattersDeptDaoImpl extends BaseCRUDDaoMybatis<MattersDeptEntity,Long> implements MattersDeptDao {
+
+
+
+}

single-matter/src/main/java/com/mortals/xhx/module/matters/dao/ibatis/MattersDetailDaoImpl.java

+package com.mortals.xhx.module.matters.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.matters.dao.MattersDetailDao;
+import com.mortals.xhx.module.matters.model.MattersDetailEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 事项详情DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+@Repository("mattersDetailDao")
+public class MattersDetailDaoImpl extends BaseCRUDDaoMybatis<MattersDetailEntity,Long> implements MattersDetailDao {
+
+
+
+}

single-matter/src/main/java/com/mortals/xhx/module/matters/dao/ibatis/MattersPowerDaoImpl.java

+package com.mortals.xhx.module.matters.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.matters.dao.MattersPowerDao;
+import com.mortals.xhx.module.matters.model.MattersPowerEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 行政权力DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+@Repository("mattersPowerDao")
+public class MattersPowerDaoImpl extends BaseCRUDDaoMybatis<MattersPowerEntity,Long> implements MattersPowerDao {
+
+
+
+}

single-matter/src/main/java/com/mortals/xhx/module/matters/dao/ibatis/MattersThemeDaoImpl.java

+package com.mortals.xhx.module.matters.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.matters.dao.MattersThemeDao;
+import com.mortals.xhx.module.matters.model.MattersThemeEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 主题DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+@Repository("mattersThemeDao")
+public class MattersThemeDaoImpl extends BaseCRUDDaoMybatis<MattersThemeEntity,Long> implements MattersThemeDao {
+
+
+
+}

single-matter/src/main/java/com/mortals/xhx/module/matters/dao/ibatis/MattersUsertypeDaoImpl.java

+package com.mortals.xhx.module.matters.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.matters.dao.MattersUsertypeDao;
+import com.mortals.xhx.module.matters.model.MattersUsertypeEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 服务类型DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+@Repository("mattersUsertypeDao")
+public class MattersUsertypeDaoImpl extends BaseCRUDDaoMybatis<MattersUsertypeEntity,Long> implements MattersUsertypeDao {
+
+
+
+}

single-matter/src/main/java/com/mortals/xhx/module/matters/model/MattersAreaEntity.java

+package com.mortals.xhx.module.matters.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.matters.model.vo.MattersAreaVo;
+/**
+* 区域实体对象
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+
+public class MattersAreaEntity extends MattersAreaVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 区域编码
+    */
+    private String areaCode;
+    /**
+    * 区域名称
+    */
+    private String name;
+    /**
+    * 区域等级，1省，2地市州，3区县，4街道，5社区
+    */
+    private String areaLevel;
+    /**
+    * 是否有下级区域
+    */
+    private String haveSonArea;
+    /**
+    * 是否有下级部门
+    */
+    private String haveSonDept;
+    /**
+    * 名称简称
+    */
+    private String shortName;
+    /**
+    * 访问地址
+    */
+    private String domain;
+    /**
+    * 一体化的ID号
+    */
+    private String iid;
+    /**
+    * 一体化的父id
+    */
+    private String pid;
+    /**
+    * 是否获取部门
+    */
+    private String haveGetDept;
+    /**
+    * 是否获取事项列表
+    */
+    private String haveGetMatterList;
+
+
+
+    public MattersAreaEntity(){}
+    /**
+    * 获取 区域编码
+    * @return String
+    */
+    public String getAreaCode(){
+        return areaCode;
+    }
+    /**
+    * 设置 区域编码
+    * @param areaCode
+    */
+    public void setAreaCode(String areaCode){
+        this.areaCode = areaCode;
+    }
+    /**
+    * 获取 区域名称
+    * @return String
+    */
+    public String getName(){
+        return name;
+    }
+    /**
+    * 设置 区域名称
+    * @param name
+    */
+    public void setName(String name){
+        this.name = name;
+    }
+    /**
+    * 获取 区域等级，1省，2地市州，3区县，4街道，5社区
+    * @return String
+    */
+    public String getAreaLevel(){
+        return areaLevel;
+    }
+    /**
+    * 设置 区域等级，1省，2地市州，3区县，4街道，5社区
+    * @param areaLevel
+    */
+    public void setAreaLevel(String areaLevel){
+        this.areaLevel = areaLevel;
+    }
+    /**
+    * 获取 是否有下级区域
+    * @return String
+    */
+    public String getHaveSonArea(){
+        return haveSonArea;
+    }
+    /**
+    * 设置 是否有下级区域
+    * @param haveSonArea
+    */
+    public void setHaveSonArea(String haveSonArea){
+        this.haveSonArea = haveSonArea;
+    }
+    /**
+    * 获取 是否有下级部门
+    * @return String
+    */
+    public String getHaveSonDept(){
+        return haveSonDept;
+    }
+    /**
+    * 设置 是否有下级部门
+    * @param haveSonDept
+    */
+    public void setHaveSonDept(String haveSonDept){
+        this.haveSonDept = haveSonDept;
+    }
+    /**
+    * 获取 名称简称
+    * @return String
+    */
+    public String getShortName(){
+        return shortName;
+    }
+    /**
+    * 设置 名称简称
+    * @param shortName
+    */
+    public void setShortName(String shortName){
+        this.shortName = shortName;
+    }
+    /**
+    * 获取 访问地址
+    * @return String
+    */
+    public String getDomain(){
+        return domain;
+    }
+    /**
+    * 设置 访问地址
+    * @param domain
+    */
+    public void setDomain(String domain){
+        this.domain = domain;
+    }
+    /**
+    * 获取 一体化的ID号
+    * @return String
+    */
+    public String getIid(){
+        return iid;
+    }
+    /**
+    * 设置 一体化的ID号
+    * @param iid
+    */
+    public void setIid(String iid){
+        this.iid = iid;
+    }
+    /**
+    * 获取 一体化的父id
+    * @return String
+    */
+    public String getPid(){
+        return pid;
+    }
+    /**
+    * 设置 一体化的父id
+    * @param pid
+    */
+    public void setPid(String pid){
+        this.pid = pid;
+    }
+    /**
+    * 获取 是否获取部门
+    * @return String
+    */
+    public String getHaveGetDept(){
+        return haveGetDept;
+    }
+    /**
+    * 设置 是否获取部门
+    * @param haveGetDept
+    */
+    public void setHaveGetDept(String haveGetDept){
+        this.haveGetDept = haveGetDept;
+    }
+    /**
+    * 获取 是否获取事项列表
+    * @return String
+    */
+    public String getHaveGetMatterList(){
+        return haveGetMatterList;
+    }
+    /**
+    * 设置 是否获取事项列表
+    * @param haveGetMatterList
+    */
+    public void setHaveGetMatterList(String haveGetMatterList){
+        this.haveGetMatterList = haveGetMatterList;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof MattersAreaEntity) {
+            MattersAreaEntity tmp = (MattersAreaEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",areaCode:").append(getAreaCode());
+        sb.append(",name:").append(getName());
+        sb.append(",areaLevel:").append(getAreaLevel());
+        sb.append(",haveSonArea:").append(getHaveSonArea());
+        sb.append(",haveSonDept:").append(getHaveSonDept());
+        sb.append(",shortName:").append(getShortName());
+        sb.append(",domain:").append(getDomain());
+        sb.append(",iid:").append(getIid());
+        sb.append(",pid:").append(getPid());
+        sb.append(",haveGetDept:").append(getHaveGetDept());
+        sb.append(",haveGetMatterList:").append(getHaveGetMatterList());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.areaCode = null;
+
+            this.name = null;
+
+            this.areaLevel = null;
+
+            this.haveSonArea = null;
+
+            this.haveSonDept = null;
+
+            this.shortName = null;
+
+            this.domain = null;
+
+            this.iid = null;
+
+            this.pid = null;
+
+            this.haveGetDept = null;
+
+            this.haveGetMatterList = null;
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/model/MattersAreaQuery.java

+package com.mortals.xhx.module.matters.model;
+
+import java.util.List;
+import com.mortals.xhx.module.matters.model.MattersAreaEntity;
+/**
+* 区域查询对象
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+public class MattersAreaQuery extends MattersAreaEntity {
+    /** 开始 id号 */
+    private Long idStart;
+
+    /** 结束 id号 */
+    private Long idEnd;
+
+    /** 增加 id号 */
+    private Long idIncrement;
+
+    /** id号列表 */
+    private List <Long> idList;
+
+    /** 区域编码 */
+    private List<String> areaCodeList;
+
+    /** 区域名称 */
+    private List<String> nameList;
+
+    /** 区域等级，1省，2地市州，3区县，4街道，5社区 */
+    private List<String> areaLevelList;
+
+    /** 是否有下级区域 */
+    private List<String> haveSonAreaList;
+
+    /** 是否有下级部门 */
+    private List<String> haveSonDeptList;
+
+    /** 名称简称 */
+    private List<String> shortNameList;
+
+    /** 访问地址 */
+    private List<String> domainList;
+
+    /** 一体化的ID号 */
+    private List<String> iidList;
+
+    /** 一体化的父id */
+    private List<String> pidList;
+
+    /** 是否获取部门 */
+    private List<String> haveGetDeptList;
+
+    /** 是否获取事项列表 */
+    private List<String> haveGetMatterListList;
+
+    /** 开始 修改时间 */
+    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<MattersAreaQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<MattersAreaQuery> andConditionList;
+
+    public MattersAreaQuery(){}
+
+    /**
+    * 获取 开始 id号
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 id号
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 id号
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 id号
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 id号
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 id号
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 id号
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 id号
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 区域编码
+    * @return areaCodeList
+    */
+    public List<String> getAreaCodeList(){
+        return this.areaCodeList;
+    }
+
+    /**
+    * 设置 区域编码
+    * @param areaCodeList
+    */
+    public void setAreaCodeList(List<String> areaCodeList){
+        this.areaCodeList = areaCodeList;
+    }
+    /**
+    * 获取 区域名称
+    * @return nameList
+    */
+    public List<String> getNameList(){
+        return this.nameList;
+    }
+
+    /**
+    * 设置 区域名称
+    * @param nameList
+    */
+    public void setNameList(List<String> nameList){
+        this.nameList = nameList;
+    }
+    /**
+    * 获取 区域等级，1省，2地市州，3区县，4街道，5社区
+    * @return areaLevelList
+    */
+    public List<String> getAreaLevelList(){
+        return this.areaLevelList;
+    }
+
+    /**
+    * 设置 区域等级，1省，2地市州，3区县，4街道，5社区
+    * @param areaLevelList
+    */
+    public void setAreaLevelList(List<String> areaLevelList){
+        this.areaLevelList = areaLevelList;
+    }
+    /**
+    * 获取 是否有下级区域
+    * @return haveSonAreaList
+    */
+    public List<String> getHaveSonAreaList(){
+        return this.haveSonAreaList;
+    }
+
+    /**
+    * 设置 是否有下级区域
+    * @param haveSonAreaList
+    */
+    public void setHaveSonAreaList(List<String> haveSonAreaList){
+        this.haveSonAreaList = haveSonAreaList;
+    }
+    /**
+    * 获取 是否有下级部门
+    * @return haveSonDeptList
+    */
+    public List<String> getHaveSonDeptList(){
+        return this.haveSonDeptList;
+    }
+
+    /**
+    * 设置 是否有下级部门
+    * @param haveSonDeptList
+    */
+    public void setHaveSonDeptList(List<String> haveSonDeptList){
+        this.haveSonDeptList = haveSonDeptList;
+    }
+    /**
+    * 获取 名称简称
+    * @return shortNameList
+    */
+    public List<String> getShortNameList(){
+        return this.shortNameList;
+    }
+
+    /**
+    * 设置 名称简称
+    * @param shortNameList
+    */
+    public void setShortNameList(List<String> shortNameList){
+        this.shortNameList = shortNameList;
+    }
+    /**
+    * 获取 访问地址
+    * @return domainList
+    */
+    public List<String> getDomainList(){
+        return this.domainList;
+    }
+
+    /**
+    * 设置 访问地址
+    * @param domainList
+    */
+    public void setDomainList(List<String> domainList){
+        this.domainList = domainList;
+    }
+    /**
+    * 获取 一体化的ID号
+    * @return iidList
+    */
+    public List<String> getIidList(){
+        return this.iidList;
+    }
+
+    /**
+    * 设置 一体化的ID号
+    * @param iidList
+    */
+    public void setIidList(List<String> iidList){
+        this.iidList = iidList;
+    }
+    /**
+    * 获取 一体化的父id
+    * @return pidList
+    */
+    public List<String> getPidList(){
+        return this.pidList;
+    }
+
+    /**
+    * 设置 一体化的父id
+    * @param pidList
+    */
+    public void setPidList(List<String> pidList){
+        this.pidList = pidList;
+    }
+    /**
+    * 获取 是否获取部门
+    * @return haveGetDeptList
+    */
+    public List<String> getHaveGetDeptList(){
+        return this.haveGetDeptList;
+    }
+
+    /**
+    * 设置 是否获取部门
+    * @param haveGetDeptList
+    */
+    public void setHaveGetDeptList(List<String> haveGetDeptList){
+        this.haveGetDeptList = haveGetDeptList;
+    }
+    /**
+    * 获取 是否获取事项列表
+    * @return haveGetMatterListList
+    */
+    public List<String> getHaveGetMatterListList(){
+        return this.haveGetMatterListList;
+    }
+
+    /**
+    * 设置 是否获取事项列表
+    * @param haveGetMatterListList
+    */
+    public void setHaveGetMatterListList(List<String> haveGetMatterListList){
+        this.haveGetMatterListList = haveGetMatterListList;
+    }
+    /**
+    * 获取 开始 修改时间
+    * @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;
+    }
+
+    /**
+    * 设置  id号
+    * @param id
+    */
+    public MattersAreaQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 id号
+    * @param idStart
+    */
+    public MattersAreaQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 id号
+    * @param idEnd
+    */
+    public MattersAreaQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 id号
+    * @param idIncrement
+    */
+    public MattersAreaQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 id号
+    * @param idList
+    */
+    public MattersAreaQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+
+	/**
+    * 设置 区域编码
+    * @param areaCode
+    */
+    public MattersAreaQuery areaCode(String areaCode){
+        setAreaCode(areaCode);
+		return this;
+    }
+
+    /**
+    * 设置 区域编码
+    * @param areaCodeList
+    */
+    public MattersAreaQuery areaCodeList(List<String> areaCodeList){
+        this.areaCodeList = areaCodeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 区域名称
+    * @param name
+    */
+    public MattersAreaQuery name(String name){
+        setName(name);
+		return this;
+    }
+
+    /**
+    * 设置 区域名称
+    * @param nameList
+    */
+    public MattersAreaQuery nameList(List<String> nameList){
+        this.nameList = nameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 区域等级，1省，2地市州，3区县，4街道，5社区
+    * @param areaLevel
+    */
+    public MattersAreaQuery areaLevel(String areaLevel){
+        setAreaLevel(areaLevel);
+		return this;
+    }
+
+    /**
+    * 设置 区域等级，1省，2地市州，3区县，4街道，5社区
+    * @param areaLevelList
+    */
+    public MattersAreaQuery areaLevelList(List<String> areaLevelList){
+        this.areaLevelList = areaLevelList;
+		return this;
+    }
+
+
+	/**
+    * 设置 是否有下级区域
+    * @param haveSonArea
+    */
+    public MattersAreaQuery haveSonArea(String haveSonArea){
+        setHaveSonArea(haveSonArea);
+		return this;
+    }
+
+    /**
+    * 设置 是否有下级区域
+    * @param haveSonAreaList
+    */
+    public MattersAreaQuery haveSonAreaList(List<String> haveSonAreaList){
+        this.haveSonAreaList = haveSonAreaList;
+		return this;
+    }
+
+
+	/**
+    * 设置 是否有下级部门
+    * @param haveSonDept
+    */
+    public MattersAreaQuery haveSonDept(String haveSonDept){
+        setHaveSonDept(haveSonDept);
+		return this;
+    }
+
+    /**
+    * 设置 是否有下级部门
+    * @param haveSonDeptList
+    */
+    public MattersAreaQuery haveSonDeptList(List<String> haveSonDeptList){
+        this.haveSonDeptList = haveSonDeptList;
+		return this;
+    }
+
+
+	/**
+    * 设置 名称简称
+    * @param shortName
+    */
+    public MattersAreaQuery shortName(String shortName){
+        setShortName(shortName);
+		return this;
+    }
+
+    /**
+    * 设置 名称简称
+    * @param shortNameList
+    */
+    public MattersAreaQuery shortNameList(List<String> shortNameList){
+        this.shortNameList = shortNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 访问地址
+    * @param domain
+    */
+    public MattersAreaQuery domain(String domain){
+        setDomain(domain);
+		return this;
+    }
+
+    /**
+    * 设置 访问地址
+    * @param domainList
+    */
+    public MattersAreaQuery domainList(List<String> domainList){
+        this.domainList = domainList;
+		return this;
+    }
+
+
+	/**
+    * 设置 一体化的ID号
+    * @param iid
+    */
+    public MattersAreaQuery iid(String iid){
+        setIid(iid);
+		return this;
+    }
+
+    /**
+    * 设置 一体化的ID号
+    * @param iidList
+    */
+    public MattersAreaQuery iidList(List<String> iidList){
+        this.iidList = iidList;
+		return this;
+    }
+
+
+	/**
+    * 设置 一体化的父id
+    * @param pid
+    */
+    public MattersAreaQuery pid(String pid){
+        setPid(pid);
+		return this;
+    }
+
+    /**
+    * 设置 一体化的父id
+    * @param pidList
+    */
+    public MattersAreaQuery pidList(List<String> pidList){
+        this.pidList = pidList;
+		return this;
+    }
+
+
+	/**
+    * 设置 是否获取部门
+    * @param haveGetDept
+    */
+    public MattersAreaQuery haveGetDept(String haveGetDept){
+        setHaveGetDept(haveGetDept);
+		return this;
+    }
+
+    /**
+    * 设置 是否获取部门
+    * @param haveGetDeptList
+    */
+    public MattersAreaQuery haveGetDeptList(List<String> haveGetDeptList){
+        this.haveGetDeptList = haveGetDeptList;
+		return this;
+    }
+
+
+	/**
+    * 设置 是否获取事项列表
+    * @param haveGetMatterList
+    */
+    public MattersAreaQuery haveGetMatterList(String haveGetMatterList){
+        setHaveGetMatterList(haveGetMatterList);
+		return this;
+    }
+
+    /**
+    * 设置 是否获取事项列表
+    * @param haveGetMatterListList
+    */
+    public MattersAreaQuery haveGetMatterListList(List<String> haveGetMatterListList){
+        this.haveGetMatterListList = haveGetMatterListList;
+		return this;
+    }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<MattersAreaQuery> 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<MattersAreaQuery> 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<MattersAreaQuery> 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<MattersAreaQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/model/MattersDeptEntity.java

+package com.mortals.xhx.module.matters.model;
+
+
+import com.mortals.xhx.module.matters.model.vo.MattersDeptVo;
+/**
+* 部门实体对象
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+
+public class MattersDeptEntity extends MattersDeptVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 区域编号
+    */
+    private String areaCode;
+    /**
+    * 部门编号
+    */
+    private String deptCode;
+    /**
+    * 部门名称
+    */
+    private String name;
+
+
+
+    public MattersDeptEntity(){}
+    /**
+    * 获取 区域编号
+    * @return String
+    */
+    public String getAreaCode(){
+        return areaCode;
+    }
+    /**
+    * 设置 区域编号
+    * @param areaCode
+    */
+    public void setAreaCode(String areaCode){
+        this.areaCode = areaCode;
+    }
+    /**
+    * 获取 部门编号
+    * @return String
+    */
+    public String getDeptCode(){
+        return deptCode;
+    }
+    /**
+    * 设置 部门编号
+    * @param deptCode
+    */
+    public void setDeptCode(String deptCode){
+        this.deptCode = deptCode;
+    }
+    /**
+    * 获取 部门名称
+    * @return String
+    */
+    public String getName(){
+        return name;
+    }
+    /**
+    * 设置 部门名称
+    * @param name
+    */
+    public void setName(String name){
+        this.name = name;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof MattersDeptEntity) {
+            MattersDeptEntity tmp = (MattersDeptEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",areaCode:").append(getAreaCode());
+        sb.append(",deptCode:").append(getDeptCode());
+        sb.append(",name:").append(getName());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.areaCode = null;
+
+            this.deptCode = null;
+
+            this.name = null;
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/model/MattersDeptQuery.java

+package com.mortals.xhx.module.matters.model;
+
+import java.util.List;
+import com.mortals.xhx.module.matters.model.MattersDeptEntity;
+/**
+* 部门查询对象
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+public class MattersDeptQuery extends MattersDeptEntity {
+    /** 开始 id号 */
+    private Long idStart;
+
+    /** 结束 id号 */
+    private Long idEnd;
+
+    /** 增加 id号 */
+    private Long idIncrement;
+
+    /** id号列表 */
+    private List <Long> idList;
+
+    /** 区域编号 */
+    private List<String> areaCodeList;
+
+    /** 部门编号 */
+    private List<String> deptCodeList;
+
+    /** 部门名称 */
+    private List<String> nameList;
+
+    /** 开始 更新时间 */
+    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<MattersDeptQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<MattersDeptQuery> andConditionList;
+
+    public MattersDeptQuery(){}
+
+    /**
+    * 获取 开始 id号
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 id号
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 id号
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 id号
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 id号
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 id号
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 id号
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 id号
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 区域编号
+    * @return areaCodeList
+    */
+    public List<String> getAreaCodeList(){
+        return this.areaCodeList;
+    }
+
+    /**
+    * 设置 区域编号
+    * @param areaCodeList
+    */
+    public void setAreaCodeList(List<String> areaCodeList){
+        this.areaCodeList = areaCodeList;
+    }
+    /**
+    * 获取 部门编号
+    * @return deptCodeList
+    */
+    public List<String> getDeptCodeList(){
+        return this.deptCodeList;
+    }
+
+    /**
+    * 设置 部门编号
+    * @param deptCodeList
+    */
+    public void setDeptCodeList(List<String> deptCodeList){
+        this.deptCodeList = deptCodeList;
+    }
+    /**
+    * 获取 部门名称
+    * @return nameList
+    */
+    public List<String> getNameList(){
+        return this.nameList;
+    }
+
+    /**
+    * 设置 部门名称
+    * @param nameList
+    */
+    public void setNameList(List<String> nameList){
+        this.nameList = nameList;
+    }
+    /**
+    * 获取 开始 更新时间
+    * @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;
+    }
+
+    /**
+    * 设置  id号
+    * @param id
+    */
+    public MattersDeptQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 id号
+    * @param idStart
+    */
+    public MattersDeptQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 id号
+    * @param idEnd
+    */
+    public MattersDeptQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 id号
+    * @param idIncrement
+    */
+    public MattersDeptQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 id号
+    * @param idList
+    */
+    public MattersDeptQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+
+	/**
+    * 设置 区域编号
+    * @param areaCode
+    */
+    public MattersDeptQuery areaCode(String areaCode){
+        setAreaCode(areaCode);
+		return this;
+    }
+
+    /**
+    * 设置 区域编号
+    * @param areaCodeList
+    */
+    public MattersDeptQuery areaCodeList(List<String> areaCodeList){
+        this.areaCodeList = areaCodeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 部门编号
+    * @param deptCode
+    */
+    public MattersDeptQuery deptCode(String deptCode){
+        setDeptCode(deptCode);
+		return this;
+    }
+
+    /**
+    * 设置 部门编号
+    * @param deptCodeList
+    */
+    public MattersDeptQuery deptCodeList(List<String> deptCodeList){
+        this.deptCodeList = deptCodeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 部门名称
+    * @param name
+    */
+    public MattersDeptQuery name(String name){
+        setName(name);
+		return this;
+    }
+
+    /**
+    * 设置 部门名称
+    * @param nameList
+    */
+    public MattersDeptQuery nameList(List<String> nameList){
+        this.nameList = nameList;
+		return this;
+    }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<MattersDeptQuery> 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<MattersDeptQuery> 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<MattersDeptQuery> 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<MattersDeptQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/model/MattersDetailEntity.java

+package com.mortals.xhx.module.matters.model;
+
+import com.mortals.xhx.module.matters.model.vo.MattersDetailVo;
+/**
+* 事项详情实体对象
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+
+public class MattersDetailEntity extends MattersDetailVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 事项编号
+    */
+    private String matterCode;
+    /**
+    * 在线申请
+    */
+    private String onlineurlZxsq;
+    /**
+    * 基本信息
+    */
+    private String basicinfoJbxx;
+    /**
+    * 申请材料
+    */
+    private String materialsSqcl;
+    /**
+    * 受理条件
+    */
+    private String conditionsSltj;
+    /**
+    * 办理流程
+    */
+    private String processBllc;
+    /**
+    * 收费标准
+    */
+    private String chargingSfbz;
+    /**
+    * 设定依据
+    */
+    private String basisSdyj;
+    /**
+    * 中介服务
+    */
+    private String intermediaryZjfw;
+    /**
+    * 常见问题
+    */
+    private String questionCjwt;
+
+
+
+    public MattersDetailEntity(){}
+    /**
+    * 获取 事项编号
+    * @return String
+    */
+    public String getMatterCode(){
+        return matterCode;
+    }
+    /**
+    * 设置 事项编号
+    * @param matterCode
+    */
+    public void setMatterCode(String matterCode){
+        this.matterCode = matterCode;
+    }
+    /**
+    * 获取 在线申请
+    * @return String
+    */
+    public String getOnlineurlZxsq(){
+        return onlineurlZxsq;
+    }
+    /**
+    * 设置 在线申请
+    * @param onlineurlZxsq
+    */
+    public void setOnlineurlZxsq(String onlineurlZxsq){
+        this.onlineurlZxsq = onlineurlZxsq;
+    }
+    /**
+    * 获取 基本信息
+    * @return String
+    */
+    public String getBasicinfoJbxx(){
+        return basicinfoJbxx;
+    }
+    /**
+    * 设置 基本信息
+    * @param basicinfoJbxx
+    */
+    public void setBasicinfoJbxx(String basicinfoJbxx){
+        this.basicinfoJbxx = basicinfoJbxx;
+    }
+    /**
+    * 获取 申请材料
+    * @return String
+    */
+    public String getMaterialsSqcl(){
+        return materialsSqcl;
+    }
+    /**
+    * 设置 申请材料
+    * @param materialsSqcl
+    */
+    public void setMaterialsSqcl(String materialsSqcl){
+        this.materialsSqcl = materialsSqcl;
+    }
+    /**
+    * 获取 受理条件
+    * @return String
+    */
+    public String getConditionsSltj(){
+        return conditionsSltj;
+    }
+    /**
+    * 设置 受理条件
+    * @param conditionsSltj
+    */
+    public void setConditionsSltj(String conditionsSltj){
+        this.conditionsSltj = conditionsSltj;
+    }
+    /**
+    * 获取 办理流程
+    * @return String
+    */
+    public String getProcessBllc(){
+        return processBllc;
+    }
+    /**
+    * 设置 办理流程
+    * @param processBllc
+    */
+    public void setProcessBllc(String processBllc){
+        this.processBllc = processBllc;
+    }
+    /**
+    * 获取 收费标准
+    * @return String
+    */
+    public String getChargingSfbz(){
+        return chargingSfbz;
+    }
+    /**
+    * 设置 收费标准
+    * @param chargingSfbz
+    */
+    public void setChargingSfbz(String chargingSfbz){
+        this.chargingSfbz = chargingSfbz;
+    }
+    /**
+    * 获取 设定依据
+    * @return String
+    */
+    public String getBasisSdyj(){
+        return basisSdyj;
+    }
+    /**
+    * 设置 设定依据
+    * @param basisSdyj
+    */
+    public void setBasisSdyj(String basisSdyj){
+        this.basisSdyj = basisSdyj;
+    }
+    /**
+    * 获取 中介服务
+    * @return String
+    */
+    public String getIntermediaryZjfw(){
+        return intermediaryZjfw;
+    }
+    /**
+    * 设置 中介服务
+    * @param intermediaryZjfw
+    */
+    public void setIntermediaryZjfw(String intermediaryZjfw){
+        this.intermediaryZjfw = intermediaryZjfw;
+    }
+    /**
+    * 获取 常见问题
+    * @return String
+    */
+    public String getQuestionCjwt(){
+        return questionCjwt;
+    }
+    /**
+    * 设置 常见问题
+    * @param questionCjwt
+    */
+    public void setQuestionCjwt(String questionCjwt){
+        this.questionCjwt = questionCjwt;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof MattersDetailEntity) {
+            MattersDetailEntity tmp = (MattersDetailEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",matterCode:").append(getMatterCode());
+        sb.append(",onlineurlZxsq:").append(getOnlineurlZxsq());
+        sb.append(",basicinfoJbxx:").append(getBasicinfoJbxx());
+        sb.append(",materialsSqcl:").append(getMaterialsSqcl());
+        sb.append(",conditionsSltj:").append(getConditionsSltj());
+        sb.append(",processBllc:").append(getProcessBllc());
+        sb.append(",chargingSfbz:").append(getChargingSfbz());
+        sb.append(",basisSdyj:").append(getBasisSdyj());
+        sb.append(",intermediaryZjfw:").append(getIntermediaryZjfw());
+        sb.append(",questionCjwt:").append(getQuestionCjwt());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.matterCode = null;
+
+            this.onlineurlZxsq = null;
+
+            this.basicinfoJbxx = null;
+
+            this.materialsSqcl = null;
+
+            this.conditionsSltj = null;
+
+            this.processBllc = null;
+
+            this.chargingSfbz = null;
+
+            this.basisSdyj = null;
+
+            this.intermediaryZjfw = null;
+
+            this.questionCjwt = null;
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/model/MattersDetailQuery.java

+package com.mortals.xhx.module.matters.model;
+
+import java.util.List;
+import com.mortals.xhx.module.matters.model.MattersDetailEntity;
+/**
+* 事项详情查询对象
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+public class MattersDetailQuery extends MattersDetailEntity {
+    /** 开始 id号 */
+    private Long idStart;
+
+    /** 结束 id号 */
+    private Long idEnd;
+
+    /** 增加 id号 */
+    private Long idIncrement;
+
+    /** id号列表 */
+    private List <Long> idList;
+
+    /** 事项编号 */
+    private List<String> matterCodeList;
+
+    /** 在线申请 */
+    private List<String> onlineurlZxsqList;
+
+    /** 基本信息 */
+    private List<String> basicinfoJbxxList;
+
+    /** 申请材料 */
+    private List<String> materialsSqclList;
+
+    /** 受理条件 */
+    private List<String> conditionsSltjList;
+
+    /** 办理流程 */
+    private List<String> processBllcList;
+
+    /** 收费标准 */
+    private List<String> chargingSfbzList;
+
+    /** 设定依据 */
+    private List<String> basisSdyjList;
+
+    /** 中介服务 */
+    private List<String> intermediaryZjfwList;
+
+    /** 常见问题 */
+    private List<String> questionCjwtList;
+
+    /** 开始 修改时间 */
+    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<MattersDetailQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<MattersDetailQuery> andConditionList;
+
+    public MattersDetailQuery(){}
+
+    /**
+    * 获取 开始 id号
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 id号
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 id号
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 id号
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 id号
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 id号
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 id号
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 id号
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 事项编号
+    * @return matterCodeList
+    */
+    public List<String> getMatterCodeList(){
+        return this.matterCodeList;
+    }
+
+    /**
+    * 设置 事项编号
+    * @param matterCodeList
+    */
+    public void setMatterCodeList(List<String> matterCodeList){
+        this.matterCodeList = matterCodeList;
+    }
+    /**
+    * 获取 在线申请
+    * @return onlineurlZxsqList
+    */
+    public List<String> getOnlineurlZxsqList(){
+        return this.onlineurlZxsqList;
+    }
+
+    /**
+    * 设置 在线申请
+    * @param onlineurlZxsqList
+    */
+    public void setOnlineurlZxsqList(List<String> onlineurlZxsqList){
+        this.onlineurlZxsqList = onlineurlZxsqList;
+    }
+    /**
+    * 获取 基本信息
+    * @return basicinfoJbxxList
+    */
+    public List<String> getBasicinfoJbxxList(){
+        return this.basicinfoJbxxList;
+    }
+
+    /**
+    * 设置 基本信息
+    * @param basicinfoJbxxList
+    */
+    public void setBasicinfoJbxxList(List<String> basicinfoJbxxList){
+        this.basicinfoJbxxList = basicinfoJbxxList;
+    }
+    /**
+    * 获取 申请材料
+    * @return materialsSqclList
+    */
+    public List<String> getMaterialsSqclList(){
+        return this.materialsSqclList;
+    }
+
+    /**
+    * 设置 申请材料
+    * @param materialsSqclList
+    */
+    public void setMaterialsSqclList(List<String> materialsSqclList){
+        this.materialsSqclList = materialsSqclList;
+    }
+    /**
+    * 获取 受理条件
+    * @return conditionsSltjList
+    */
+    public List<String> getConditionsSltjList(){
+        return this.conditionsSltjList;
+    }
+
+    /**
+    * 设置 受理条件
+    * @param conditionsSltjList
+    */
+    public void setConditionsSltjList(List<String> conditionsSltjList){
+        this.conditionsSltjList = conditionsSltjList;
+    }
+    /**
+    * 获取 办理流程
+    * @return processBllcList
+    */
+    public List<String> getProcessBllcList(){
+        return this.processBllcList;
+    }
+
+    /**
+    * 设置 办理流程
+    * @param processBllcList
+    */
+    public void setProcessBllcList(List<String> processBllcList){
+        this.processBllcList = processBllcList;
+    }
+    /**
+    * 获取 收费标准
+    * @return chargingSfbzList
+    */
+    public List<String> getChargingSfbzList(){
+        return this.chargingSfbzList;
+    }
+
+    /**
+    * 设置 收费标准
+    * @param chargingSfbzList
+    */
+    public void setChargingSfbzList(List<String> chargingSfbzList){
+        this.chargingSfbzList = chargingSfbzList;
+    }
+    /**
+    * 获取 设定依据
+    * @return basisSdyjList
+    */
+    public List<String> getBasisSdyjList(){
+        return this.basisSdyjList;
+    }
+
+    /**
+    * 设置 设定依据
+    * @param basisSdyjList
+    */
+    public void setBasisSdyjList(List<String> basisSdyjList){
+        this.basisSdyjList = basisSdyjList;
+    }
+    /**
+    * 获取 中介服务
+    * @return intermediaryZjfwList
+    */
+    public List<String> getIntermediaryZjfwList(){
+        return this.intermediaryZjfwList;
+    }
+
+    /**
+    * 设置 中介服务
+    * @param intermediaryZjfwList
+    */
+    public void setIntermediaryZjfwList(List<String> intermediaryZjfwList){
+        this.intermediaryZjfwList = intermediaryZjfwList;
+    }
+    /**
+    * 获取 常见问题
+    * @return questionCjwtList
+    */
+    public List<String> getQuestionCjwtList(){
+        return this.questionCjwtList;
+    }
+
+    /**
+    * 设置 常见问题
+    * @param questionCjwtList
+    */
+    public void setQuestionCjwtList(List<String> questionCjwtList){
+        this.questionCjwtList = questionCjwtList;
+    }
+    /**
+    * 获取 开始 修改时间
+    * @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;
+    }
+
+    /**
+    * 设置  id号
+    * @param id
+    */
+    public MattersDetailQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 id号
+    * @param idStart
+    */
+    public MattersDetailQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 id号
+    * @param idEnd
+    */
+    public MattersDetailQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 id号
+    * @param idIncrement
+    */
+    public MattersDetailQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 id号
+    * @param idList
+    */
+    public MattersDetailQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+
+	/**
+    * 设置 事项编号
+    * @param matterCode
+    */
+    public MattersDetailQuery matterCode(String matterCode){
+        setMatterCode(matterCode);
+		return this;
+    }
+
+    /**
+    * 设置 事项编号
+    * @param matterCodeList
+    */
+    public MattersDetailQuery matterCodeList(List<String> matterCodeList){
+        this.matterCodeList = matterCodeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 在线申请
+    * @param onlineurlZxsq
+    */
+    public MattersDetailQuery onlineurlZxsq(String onlineurlZxsq){
+        setOnlineurlZxsq(onlineurlZxsq);
+		return this;
+    }
+
+    /**
+    * 设置 在线申请
+    * @param onlineurlZxsqList
+    */
+    public MattersDetailQuery onlineurlZxsqList(List<String> onlineurlZxsqList){
+        this.onlineurlZxsqList = onlineurlZxsqList;
+		return this;
+    }
+
+
+	/**
+    * 设置 基本信息
+    * @param basicinfoJbxx
+    */
+    public MattersDetailQuery basicinfoJbxx(String basicinfoJbxx){
+        setBasicinfoJbxx(basicinfoJbxx);
+		return this;
+    }
+
+    /**
+    * 设置 基本信息
+    * @param basicinfoJbxxList
+    */
+    public MattersDetailQuery basicinfoJbxxList(List<String> basicinfoJbxxList){
+        this.basicinfoJbxxList = basicinfoJbxxList;
+		return this;
+    }
+
+
+	/**
+    * 设置 申请材料
+    * @param materialsSqcl
+    */
+    public MattersDetailQuery materialsSqcl(String materialsSqcl){
+        setMaterialsSqcl(materialsSqcl);
+		return this;
+    }
+
+    /**
+    * 设置 申请材料
+    * @param materialsSqclList
+    */
+    public MattersDetailQuery materialsSqclList(List<String> materialsSqclList){
+        this.materialsSqclList = materialsSqclList;
+		return this;
+    }
+
+
+	/**
+    * 设置 受理条件
+    * @param conditionsSltj
+    */
+    public MattersDetailQuery conditionsSltj(String conditionsSltj){
+        setConditionsSltj(conditionsSltj);
+		return this;
+    }
+
+    /**
+    * 设置 受理条件
+    * @param conditionsSltjList
+    */
+    public MattersDetailQuery conditionsSltjList(List<String> conditionsSltjList){
+        this.conditionsSltjList = conditionsSltjList;
+		return this;
+    }
+
+
+	/**
+    * 设置 办理流程
+    * @param processBllc
+    */
+    public MattersDetailQuery processBllc(String processBllc){
+        setProcessBllc(processBllc);
+		return this;
+    }
+
+    /**
+    * 设置 办理流程
+    * @param processBllcList
+    */
+    public MattersDetailQuery processBllcList(List<String> processBllcList){
+        this.processBllcList = processBllcList;
+		return this;
+    }
+
+
+	/**
+    * 设置 收费标准
+    * @param chargingSfbz
+    */
+    public MattersDetailQuery chargingSfbz(String chargingSfbz){
+        setChargingSfbz(chargingSfbz);
+		return this;
+    }
+
+    /**
+    * 设置 收费标准
+    * @param chargingSfbzList
+    */
+    public MattersDetailQuery chargingSfbzList(List<String> chargingSfbzList){
+        this.chargingSfbzList = chargingSfbzList;
+		return this;
+    }
+
+
+	/**
+    * 设置 设定依据
+    * @param basisSdyj
+    */
+    public MattersDetailQuery basisSdyj(String basisSdyj){
+        setBasisSdyj(basisSdyj);
+		return this;
+    }
+
+    /**
+    * 设置 设定依据
+    * @param basisSdyjList
+    */
+    public MattersDetailQuery basisSdyjList(List<String> basisSdyjList){
+        this.basisSdyjList = basisSdyjList;
+		return this;
+    }
+
+
+	/**
+    * 设置 中介服务
+    * @param intermediaryZjfw
+    */
+    public MattersDetailQuery intermediaryZjfw(String intermediaryZjfw){
+        setIntermediaryZjfw(intermediaryZjfw);
+		return this;
+    }
+
+    /**
+    * 设置 中介服务
+    * @param intermediaryZjfwList
+    */
+    public MattersDetailQuery intermediaryZjfwList(List<String> intermediaryZjfwList){
+        this.intermediaryZjfwList = intermediaryZjfwList;
+		return this;
+    }
+
+
+	/**
+    * 设置 常见问题
+    * @param questionCjwt
+    */
+    public MattersDetailQuery questionCjwt(String questionCjwt){
+        setQuestionCjwt(questionCjwt);
+		return this;
+    }
+
+    /**
+    * 设置 常见问题
+    * @param questionCjwtList
+    */
+    public MattersDetailQuery questionCjwtList(List<String> questionCjwtList){
+        this.questionCjwtList = questionCjwtList;
+		return this;
+    }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<MattersDetailQuery> 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<MattersDetailQuery> 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<MattersDetailQuery> 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<MattersDetailQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/model/MattersEntity.java

+package com.mortals.xhx.module.matters.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.matters.model.vo.MattersVo;
+/**
+* 事项列实体对象
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+
+public class MattersEntity extends MattersVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 区域编码
+    */
+    private String areaCode;
+    /**
+    * 部门编号
+    */
+    private String deptCode;
+    /**
+    * 行政权力编号
+    */
+    private String powerCode;
+    /**
+    * 主题编号
+    */
+    private String themeCode;
+    /**
+    * 服务类型编号
+    */
+    private String usertypeCode;
+    /**
+    * 事项编号
+    */
+    private String matterCode;
+    /**
+    * 事项名称
+    */
+    private String name;
+    /**
+    * 事项组名
+    */
+    private String groupName;
+    /**
+    * 事项详情链接
+    */
+    private String url;
+    /**
+    * 是否获取事项详情
+    */
+    private String haveGetMatterInfo;
+
+
+
+    public MattersEntity(){}
+    /**
+    * 获取 区域编码
+    * @return String
+    */
+    public String getAreaCode(){
+        return areaCode;
+    }
+    /**
+    * 设置 区域编码
+    * @param areaCode
+    */
+    public void setAreaCode(String areaCode){
+        this.areaCode = areaCode;
+    }
+    /**
+    * 获取 部门编号
+    * @return String
+    */
+    public String getDeptCode(){
+        return deptCode;
+    }
+    /**
+    * 设置 部门编号
+    * @param deptCode
+    */
+    public void setDeptCode(String deptCode){
+        this.deptCode = deptCode;
+    }
+    /**
+    * 获取 行政权力编号
+    * @return String
+    */
+    public String getPowerCode(){
+        return powerCode;
+    }
+    /**
+    * 设置 行政权力编号
+    * @param powerCode
+    */
+    public void setPowerCode(String powerCode){
+        this.powerCode = powerCode;
+    }
+    /**
+    * 获取 主题编号
+    * @return String
+    */
+    public String getThemeCode(){
+        return themeCode;
+    }
+    /**
+    * 设置 主题编号
+    * @param themeCode
+    */
+    public void setThemeCode(String themeCode){
+        this.themeCode = themeCode;
+    }
+    /**
+    * 获取 服务类型编号
+    * @return String
+    */
+    public String getUsertypeCode(){
+        return usertypeCode;
+    }
+    /**
+    * 设置 服务类型编号
+    * @param usertypeCode
+    */
+    public void setUsertypeCode(String usertypeCode){
+        this.usertypeCode = usertypeCode;
+    }
+    /**
+    * 获取 事项编号
+    * @return String
+    */
+    public String getMatterCode(){
+        return matterCode;
+    }
+    /**
+    * 设置 事项编号
+    * @param matterCode
+    */
+    public void setMatterCode(String matterCode){
+        this.matterCode = matterCode;
+    }
+    /**
+    * 获取 事项名称
+    * @return String
+    */
+    public String getName(){
+        return name;
+    }
+    /**
+    * 设置 事项名称
+    * @param name
+    */
+    public void setName(String name){
+        this.name = name;
+    }
+    /**
+    * 获取 事项组名
+    * @return String
+    */
+    public String getGroupName(){
+        return groupName;
+    }
+    /**
+    * 设置 事项组名
+    * @param groupName
+    */
+    public void setGroupName(String groupName){
+        this.groupName = groupName;
+    }
+    /**
+    * 获取 事项详情链接
+    * @return String
+    */
+    public String getUrl(){
+        return url;
+    }
+    /**
+    * 设置 事项详情链接
+    * @param url
+    */
+    public void setUrl(String url){
+        this.url = url;
+    }
+    /**
+    * 获取 是否获取事项详情
+    * @return String
+    */
+    public String getHaveGetMatterInfo(){
+        return haveGetMatterInfo;
+    }
+    /**
+    * 设置 是否获取事项详情
+    * @param haveGetMatterInfo
+    */
+    public void setHaveGetMatterInfo(String haveGetMatterInfo){
+        this.haveGetMatterInfo = haveGetMatterInfo;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof MattersEntity) {
+            MattersEntity tmp = (MattersEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",areaCode:").append(getAreaCode());
+        sb.append(",deptCode:").append(getDeptCode());
+        sb.append(",powerCode:").append(getPowerCode());
+        sb.append(",themeCode:").append(getThemeCode());
+        sb.append(",usertypeCode:").append(getUsertypeCode());
+        sb.append(",matterCode:").append(getMatterCode());
+        sb.append(",name:").append(getName());
+        sb.append(",groupName:").append(getGroupName());
+        sb.append(",url:").append(getUrl());
+        sb.append(",haveGetMatterInfo:").append(getHaveGetMatterInfo());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.areaCode = null;
+
+            this.deptCode = null;
+
+            this.powerCode = null;
+
+            this.themeCode = null;
+
+            this.usertypeCode = null;
+
+            this.matterCode = null;
+
+            this.name = null;
+
+            this.groupName = null;
+
+            this.url = null;
+
+            this.haveGetMatterInfo = null;
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/model/MattersPowerEntity.java

+package com.mortals.xhx.module.matters.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.matters.model.vo.MattersPowerVo;
+/**
+* 行政权力实体对象
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+
+public class MattersPowerEntity extends MattersPowerVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 行政权力编号
+    */
+    private String powerCode;
+    /**
+    * 行政权力名称
+    */
+    private String name;
+
+
+
+    public MattersPowerEntity(){}
+    /**
+    * 获取 行政权力编号
+    * @return String
+    */
+    public String getPowerCode(){
+        return powerCode;
+    }
+    /**
+    * 设置 行政权力编号
+    * @param powerCode
+    */
+    public void setPowerCode(String powerCode){
+        this.powerCode = powerCode;
+    }
+    /**
+    * 获取 行政权力名称
+    * @return String
+    */
+    public String getName(){
+        return name;
+    }
+    /**
+    * 设置 行政权力名称
+    * @param name
+    */
+    public void setName(String name){
+        this.name = name;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof MattersPowerEntity) {
+            MattersPowerEntity tmp = (MattersPowerEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",powerCode:").append(getPowerCode());
+        sb.append(",name:").append(getName());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.powerCode = null;
+
+            this.name = null;
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/model/MattersPowerQuery.java

+package com.mortals.xhx.module.matters.model;
+
+import java.util.List;
+import com.mortals.xhx.module.matters.model.MattersPowerEntity;
+/**
+* 行政权力查询对象
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+public class MattersPowerQuery extends MattersPowerEntity {
+    /** 开始 id号 */
+    private Long idStart;
+
+    /** 结束 id号 */
+    private Long idEnd;
+
+    /** 增加 id号 */
+    private Long idIncrement;
+
+    /** id号列表 */
+    private List <Long> idList;
+
+    /** 行政权力编号 */
+    private List<String> powerCodeList;
+
+    /** 行政权力名称 */
+    private List<String> nameList;
+
+    /** 开始 更新时间 */
+    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<MattersPowerQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<MattersPowerQuery> andConditionList;
+
+    public MattersPowerQuery(){}
+
+    /**
+    * 获取 开始 id号
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 id号
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 id号
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 id号
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 id号
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 id号
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 id号
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 id号
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 行政权力编号
+    * @return powerCodeList
+    */
+    public List<String> getPowerCodeList(){
+        return this.powerCodeList;
+    }
+
+    /**
+    * 设置 行政权力编号
+    * @param powerCodeList
+    */
+    public void setPowerCodeList(List<String> powerCodeList){
+        this.powerCodeList = powerCodeList;
+    }
+    /**
+    * 获取 行政权力名称
+    * @return nameList
+    */
+    public List<String> getNameList(){
+        return this.nameList;
+    }
+
+    /**
+    * 设置 行政权力名称
+    * @param nameList
+    */
+    public void setNameList(List<String> nameList){
+        this.nameList = nameList;
+    }
+    /**
+    * 获取 开始 更新时间
+    * @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;
+    }
+
+    /**
+    * 设置  id号
+    * @param id
+    */
+    public MattersPowerQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 id号
+    * @param idStart
+    */
+    public MattersPowerQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 id号
+    * @param idEnd
+    */
+    public MattersPowerQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 id号
+    * @param idIncrement
+    */
+    public MattersPowerQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 id号
+    * @param idList
+    */
+    public MattersPowerQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+
+	/**
+    * 设置 行政权力编号
+    * @param powerCode
+    */
+    public MattersPowerQuery powerCode(String powerCode){
+        setPowerCode(powerCode);
+		return this;
+    }
+
+    /**
+    * 设置 行政权力编号
+    * @param powerCodeList
+    */
+    public MattersPowerQuery powerCodeList(List<String> powerCodeList){
+        this.powerCodeList = powerCodeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 行政权力名称
+    * @param name
+    */
+    public MattersPowerQuery name(String name){
+        setName(name);
+		return this;
+    }
+
+    /**
+    * 设置 行政权力名称
+    * @param nameList
+    */
+    public MattersPowerQuery nameList(List<String> nameList){
+        this.nameList = nameList;
+		return this;
+    }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<MattersPowerQuery> 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<MattersPowerQuery> 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<MattersPowerQuery> 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<MattersPowerQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/model/MattersQuery.java

+package com.mortals.xhx.module.matters.model;
+
+import java.util.List;
+import com.mortals.xhx.module.matters.model.MattersEntity;
+/**
+* 事项列查询对象
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+public class MattersQuery extends MattersEntity {
+    /** 开始 id号 */
+    private Long idStart;
+
+    /** 结束 id号 */
+    private Long idEnd;
+
+    /** 增加 id号 */
+    private Long idIncrement;
+
+    /** id号列表 */
+    private List <Long> idList;
+
+    /** 区域编码 */
+    private List<String> areaCodeList;
+
+    /** 部门编号 */
+    private List<String> deptCodeList;
+
+    /** 行政权力编号 */
+    private List<String> powerCodeList;
+
+    /** 主题编号 */
+    private List<String> themeCodeList;
+
+    /** 服务类型编号 */
+    private List<String> usertypeCodeList;
+
+    /** 事项编号 */
+    private List<String> matterCodeList;
+
+    /** 事项名称 */
+    private List<String> nameList;
+
+    /** 事项组名 */
+    private List<String> groupNameList;
+
+    /** 事项详情链接 */
+    private List<String> urlList;
+
+    /** 是否获取事项详情 */
+    private List<String> haveGetMatterInfoList;
+
+    /** 开始 修改时间 */
+    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<MattersQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<MattersQuery> andConditionList;
+
+    public MattersQuery(){}
+
+    /**
+    * 获取 开始 id号
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 id号
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 id号
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 id号
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 id号
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 id号
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 id号
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 id号
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 区域编码
+    * @return areaCodeList
+    */
+    public List<String> getAreaCodeList(){
+        return this.areaCodeList;
+    }
+
+    /**
+    * 设置 区域编码
+    * @param areaCodeList
+    */
+    public void setAreaCodeList(List<String> areaCodeList){
+        this.areaCodeList = areaCodeList;
+    }
+    /**
+    * 获取 部门编号
+    * @return deptCodeList
+    */
+    public List<String> getDeptCodeList(){
+        return this.deptCodeList;
+    }
+
+    /**
+    * 设置 部门编号
+    * @param deptCodeList
+    */
+    public void setDeptCodeList(List<String> deptCodeList){
+        this.deptCodeList = deptCodeList;
+    }
+    /**
+    * 获取 行政权力编号
+    * @return powerCodeList
+    */
+    public List<String> getPowerCodeList(){
+        return this.powerCodeList;
+    }
+
+    /**
+    * 设置 行政权力编号
+    * @param powerCodeList
+    */
+    public void setPowerCodeList(List<String> powerCodeList){
+        this.powerCodeList = powerCodeList;
+    }
+    /**
+    * 获取 主题编号
+    * @return themeCodeList
+    */
+    public List<String> getThemeCodeList(){
+        return this.themeCodeList;
+    }
+
+    /**
+    * 设置 主题编号
+    * @param themeCodeList
+    */
+    public void setThemeCodeList(List<String> themeCodeList){
+        this.themeCodeList = themeCodeList;
+    }
+    /**
+    * 获取 服务类型编号
+    * @return usertypeCodeList
+    */
+    public List<String> getUsertypeCodeList(){
+        return this.usertypeCodeList;
+    }
+
+    /**
+    * 设置 服务类型编号
+    * @param usertypeCodeList
+    */
+    public void setUsertypeCodeList(List<String> usertypeCodeList){
+        this.usertypeCodeList = usertypeCodeList;
+    }
+    /**
+    * 获取 事项编号
+    * @return matterCodeList
+    */
+    public List<String> getMatterCodeList(){
+        return this.matterCodeList;
+    }
+
+    /**
+    * 设置 事项编号
+    * @param matterCodeList
+    */
+    public void setMatterCodeList(List<String> matterCodeList){
+        this.matterCodeList = matterCodeList;
+    }
+    /**
+    * 获取 事项名称
+    * @return nameList
+    */
+    public List<String> getNameList(){
+        return this.nameList;
+    }
+
+    /**
+    * 设置 事项名称
+    * @param nameList
+    */
+    public void setNameList(List<String> nameList){
+        this.nameList = nameList;
+    }
+    /**
+    * 获取 事项组名
+    * @return groupNameList
+    */
+    public List<String> getGroupNameList(){
+        return this.groupNameList;
+    }
+
+    /**
+    * 设置 事项组名
+    * @param groupNameList
+    */
+    public void setGroupNameList(List<String> groupNameList){
+        this.groupNameList = groupNameList;
+    }
+    /**
+    * 获取 事项详情链接
+    * @return urlList
+    */
+    public List<String> getUrlList(){
+        return this.urlList;
+    }
+
+    /**
+    * 设置 事项详情链接
+    * @param urlList
+    */
+    public void setUrlList(List<String> urlList){
+        this.urlList = urlList;
+    }
+    /**
+    * 获取 是否获取事项详情
+    * @return haveGetMatterInfoList
+    */
+    public List<String> getHaveGetMatterInfoList(){
+        return this.haveGetMatterInfoList;
+    }
+
+    /**
+    * 设置 是否获取事项详情
+    * @param haveGetMatterInfoList
+    */
+    public void setHaveGetMatterInfoList(List<String> haveGetMatterInfoList){
+        this.haveGetMatterInfoList = haveGetMatterInfoList;
+    }
+    /**
+    * 获取 开始 修改时间
+    * @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;
+    }
+
+    /**
+    * 设置  id号
+    * @param id
+    */
+    public MattersQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 id号
+    * @param idStart
+    */
+    public MattersQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 id号
+    * @param idEnd
+    */
+    public MattersQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 id号
+    * @param idIncrement
+    */
+    public MattersQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 id号
+    * @param idList
+    */
+    public MattersQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+
+	/**
+    * 设置 区域编码
+    * @param areaCode
+    */
+    public MattersQuery areaCode(String areaCode){
+        setAreaCode(areaCode);
+		return this;
+    }
+
+    /**
+    * 设置 区域编码
+    * @param areaCodeList
+    */
+    public MattersQuery areaCodeList(List<String> areaCodeList){
+        this.areaCodeList = areaCodeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 部门编号
+    * @param deptCode
+    */
+    public MattersQuery deptCode(String deptCode){
+        setDeptCode(deptCode);
+		return this;
+    }
+
+    /**
+    * 设置 部门编号
+    * @param deptCodeList
+    */
+    public MattersQuery deptCodeList(List<String> deptCodeList){
+        this.deptCodeList = deptCodeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 行政权力编号
+    * @param powerCode
+    */
+    public MattersQuery powerCode(String powerCode){
+        setPowerCode(powerCode);
+		return this;
+    }
+
+    /**
+    * 设置 行政权力编号
+    * @param powerCodeList
+    */
+    public MattersQuery powerCodeList(List<String> powerCodeList){
+        this.powerCodeList = powerCodeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 主题编号
+    * @param themeCode
+    */
+    public MattersQuery themeCode(String themeCode){
+        setThemeCode(themeCode);
+		return this;
+    }
+
+    /**
+    * 设置 主题编号
+    * @param themeCodeList
+    */
+    public MattersQuery themeCodeList(List<String> themeCodeList){
+        this.themeCodeList = themeCodeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 服务类型编号
+    * @param usertypeCode
+    */
+    public MattersQuery usertypeCode(String usertypeCode){
+        setUsertypeCode(usertypeCode);
+		return this;
+    }
+
+    /**
+    * 设置 服务类型编号
+    * @param usertypeCodeList
+    */
+    public MattersQuery usertypeCodeList(List<String> usertypeCodeList){
+        this.usertypeCodeList = usertypeCodeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 事项编号
+    * @param matterCode
+    */
+    public MattersQuery matterCode(String matterCode){
+        setMatterCode(matterCode);
+		return this;
+    }
+
+    /**
+    * 设置 事项编号
+    * @param matterCodeList
+    */
+    public MattersQuery matterCodeList(List<String> matterCodeList){
+        this.matterCodeList = matterCodeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 事项名称
+    * @param name
+    */
+    public MattersQuery name(String name){
+        setName(name);
+		return this;
+    }
+
+    /**
+    * 设置 事项名称
+    * @param nameList
+    */
+    public MattersQuery nameList(List<String> nameList){
+        this.nameList = nameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 事项组名
+    * @param groupName
+    */
+    public MattersQuery groupName(String groupName){
+        setGroupName(groupName);
+		return this;
+    }
+
+    /**
+    * 设置 事项组名
+    * @param groupNameList
+    */
+    public MattersQuery groupNameList(List<String> groupNameList){
+        this.groupNameList = groupNameList;
+		return this;
+    }
+
+
+	/**
+    * 设置 事项详情链接
+    * @param url
+    */
+    public MattersQuery url(String url){
+        setUrl(url);
+		return this;
+    }
+
+    /**
+    * 设置 事项详情链接
+    * @param urlList
+    */
+    public MattersQuery urlList(List<String> urlList){
+        this.urlList = urlList;
+		return this;
+    }
+
+
+	/**
+    * 设置 是否获取事项详情
+    * @param haveGetMatterInfo
+    */
+    public MattersQuery haveGetMatterInfo(String haveGetMatterInfo){
+        setHaveGetMatterInfo(haveGetMatterInfo);
+		return this;
+    }
+
+    /**
+    * 设置 是否获取事项详情
+    * @param haveGetMatterInfoList
+    */
+    public MattersQuery haveGetMatterInfoList(List<String> haveGetMatterInfoList){
+        this.haveGetMatterInfoList = haveGetMatterInfoList;
+		return this;
+    }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<MattersQuery> 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<MattersQuery> 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<MattersQuery> 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<MattersQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/model/MattersThemeEntity.java

+package com.mortals.xhx.module.matters.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.matters.model.vo.MattersThemeVo;
+/**
+* 主题实体对象
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+
+public class MattersThemeEntity extends MattersThemeVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 服务类型编号
+    */
+    private String usertypeCode;
+    /**
+    * 主题编号
+    */
+    private String themeCode;
+    /**
+    * 主题名称
+    */
+    private String name;
+
+
+
+    public MattersThemeEntity(){}
+    /**
+    * 获取 服务类型编号
+    * @return String
+    */
+    public String getUsertypeCode(){
+        return usertypeCode;
+    }
+    /**
+    * 设置 服务类型编号
+    * @param usertypeCode
+    */
+    public void setUsertypeCode(String usertypeCode){
+        this.usertypeCode = usertypeCode;
+    }
+    /**
+    * 获取 主题编号
+    * @return String
+    */
+    public String getThemeCode(){
+        return themeCode;
+    }
+    /**
+    * 设置 主题编号
+    * @param themeCode
+    */
+    public void setThemeCode(String themeCode){
+        this.themeCode = themeCode;
+    }
+    /**
+    * 获取 主题名称
+    * @return String
+    */
+    public String getName(){
+        return name;
+    }
+    /**
+    * 设置 主题名称
+    * @param name
+    */
+    public void setName(String name){
+        this.name = name;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof MattersThemeEntity) {
+            MattersThemeEntity tmp = (MattersThemeEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",usertypeCode:").append(getUsertypeCode());
+        sb.append(",themeCode:").append(getThemeCode());
+        sb.append(",name:").append(getName());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.usertypeCode = null;
+
+            this.themeCode = null;
+
+            this.name = null;
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/model/MattersThemeQuery.java

+package com.mortals.xhx.module.matters.model;
+
+import java.util.List;
+import com.mortals.xhx.module.matters.model.MattersThemeEntity;
+/**
+* 主题查询对象
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+public class MattersThemeQuery extends MattersThemeEntity {
+    /** 开始 id号 */
+    private Long idStart;
+
+    /** 结束 id号 */
+    private Long idEnd;
+
+    /** 增加 id号 */
+    private Long idIncrement;
+
+    /** id号列表 */
+    private List <Long> idList;
+
+    /** 服务类型编号 */
+    private List<String> usertypeCodeList;
+
+    /** 主题编号 */
+    private List<String> themeCodeList;
+
+    /** 主题名称 */
+    private List<String> nameList;
+
+    /** 开始 更新时间 */
+    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<MattersThemeQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<MattersThemeQuery> andConditionList;
+
+    public MattersThemeQuery(){}
+
+    /**
+    * 获取 开始 id号
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 id号
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 id号
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 id号
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 id号
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 id号
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 id号
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 id号
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 服务类型编号
+    * @return usertypeCodeList
+    */
+    public List<String> getUsertypeCodeList(){
+        return this.usertypeCodeList;
+    }
+
+    /**
+    * 设置 服务类型编号
+    * @param usertypeCodeList
+    */
+    public void setUsertypeCodeList(List<String> usertypeCodeList){
+        this.usertypeCodeList = usertypeCodeList;
+    }
+    /**
+    * 获取 主题编号
+    * @return themeCodeList
+    */
+    public List<String> getThemeCodeList(){
+        return this.themeCodeList;
+    }
+
+    /**
+    * 设置 主题编号
+    * @param themeCodeList
+    */
+    public void setThemeCodeList(List<String> themeCodeList){
+        this.themeCodeList = themeCodeList;
+    }
+    /**
+    * 获取 主题名称
+    * @return nameList
+    */
+    public List<String> getNameList(){
+        return this.nameList;
+    }
+
+    /**
+    * 设置 主题名称
+    * @param nameList
+    */
+    public void setNameList(List<String> nameList){
+        this.nameList = nameList;
+    }
+    /**
+    * 获取 开始 更新时间
+    * @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;
+    }
+
+    /**
+    * 设置  id号
+    * @param id
+    */
+    public MattersThemeQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 id号
+    * @param idStart
+    */
+    public MattersThemeQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 id号
+    * @param idEnd
+    */
+    public MattersThemeQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 id号
+    * @param idIncrement
+    */
+    public MattersThemeQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 id号
+    * @param idList
+    */
+    public MattersThemeQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+
+	/**
+    * 设置 服务类型编号
+    * @param usertypeCode
+    */
+    public MattersThemeQuery usertypeCode(String usertypeCode){
+        setUsertypeCode(usertypeCode);
+		return this;
+    }
+
+    /**
+    * 设置 服务类型编号
+    * @param usertypeCodeList
+    */
+    public MattersThemeQuery usertypeCodeList(List<String> usertypeCodeList){
+        this.usertypeCodeList = usertypeCodeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 主题编号
+    * @param themeCode
+    */
+    public MattersThemeQuery themeCode(String themeCode){
+        setThemeCode(themeCode);
+		return this;
+    }
+
+    /**
+    * 设置 主题编号
+    * @param themeCodeList
+    */
+    public MattersThemeQuery themeCodeList(List<String> themeCodeList){
+        this.themeCodeList = themeCodeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 主题名称
+    * @param name
+    */
+    public MattersThemeQuery name(String name){
+        setName(name);
+		return this;
+    }
+
+    /**
+    * 设置 主题名称
+    * @param nameList
+    */
+    public MattersThemeQuery nameList(List<String> nameList){
+        this.nameList = nameList;
+		return this;
+    }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<MattersThemeQuery> 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<MattersThemeQuery> 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<MattersThemeQuery> 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<MattersThemeQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/model/MattersUsertypeEntity.java

+package com.mortals.xhx.module.matters.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.matters.model.vo.MattersUsertypeVo;
+/**
+* 服务类型实体对象
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+
+public class MattersUsertypeEntity extends MattersUsertypeVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 服务类型编号
+    */
+    private String usertypeCode;
+    /**
+    * 服务类型名称
+    */
+    private String name;
+
+
+
+    public MattersUsertypeEntity(){}
+    /**
+    * 获取 服务类型编号
+    * @return String
+    */
+    public String getUsertypeCode(){
+        return usertypeCode;
+    }
+    /**
+    * 设置 服务类型编号
+    * @param usertypeCode
+    */
+    public void setUsertypeCode(String usertypeCode){
+        this.usertypeCode = usertypeCode;
+    }
+    /**
+    * 获取 服务类型名称
+    * @return String
+    */
+    public String getName(){
+        return name;
+    }
+    /**
+    * 设置 服务类型名称
+    * @param name
+    */
+    public void setName(String name){
+        this.name = name;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof MattersUsertypeEntity) {
+            MattersUsertypeEntity tmp = (MattersUsertypeEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",usertypeCode:").append(getUsertypeCode());
+        sb.append(",name:").append(getName());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.usertypeCode = null;
+
+            this.name = null;
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/model/MattersUsertypeQuery.java

+package com.mortals.xhx.module.matters.model;
+
+import java.util.List;
+import com.mortals.xhx.module.matters.model.MattersUsertypeEntity;
+/**
+* 服务类型查询对象
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+public class MattersUsertypeQuery extends MattersUsertypeEntity {
+    /** 开始 id号 */
+    private Long idStart;
+
+    /** 结束 id号 */
+    private Long idEnd;
+
+    /** 增加 id号 */
+    private Long idIncrement;
+
+    /** id号列表 */
+    private List <Long> idList;
+
+    /** 服务类型编号 */
+    private List<String> usertypeCodeList;
+
+    /** 服务类型名称 */
+    private List<String> nameList;
+
+    /** 开始 更新时间 */
+    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<MattersUsertypeQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<MattersUsertypeQuery> andConditionList;
+
+    public MattersUsertypeQuery(){}
+
+    /**
+    * 获取 开始 id号
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 id号
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 id号
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 id号
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 id号
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 id号
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 id号
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 id号
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 服务类型编号
+    * @return usertypeCodeList
+    */
+    public List<String> getUsertypeCodeList(){
+        return this.usertypeCodeList;
+    }
+
+    /**
+    * 设置 服务类型编号
+    * @param usertypeCodeList
+    */
+    public void setUsertypeCodeList(List<String> usertypeCodeList){
+        this.usertypeCodeList = usertypeCodeList;
+    }
+    /**
+    * 获取 服务类型名称
+    * @return nameList
+    */
+    public List<String> getNameList(){
+        return this.nameList;
+    }
+
+    /**
+    * 设置 服务类型名称
+    * @param nameList
+    */
+    public void setNameList(List<String> nameList){
+        this.nameList = nameList;
+    }
+    /**
+    * 获取 开始 更新时间
+    * @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;
+    }
+
+    /**
+    * 设置  id号
+    * @param id
+    */
+    public MattersUsertypeQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 id号
+    * @param idStart
+    */
+    public MattersUsertypeQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 id号
+    * @param idEnd
+    */
+    public MattersUsertypeQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 id号
+    * @param idIncrement
+    */
+    public MattersUsertypeQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 id号
+    * @param idList
+    */
+    public MattersUsertypeQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+
+	/**
+    * 设置 服务类型编号
+    * @param usertypeCode
+    */
+    public MattersUsertypeQuery usertypeCode(String usertypeCode){
+        setUsertypeCode(usertypeCode);
+		return this;
+    }
+
+    /**
+    * 设置 服务类型编号
+    * @param usertypeCodeList
+    */
+    public MattersUsertypeQuery usertypeCodeList(List<String> usertypeCodeList){
+        this.usertypeCodeList = usertypeCodeList;
+		return this;
+    }
+
+
+	/**
+    * 设置 服务类型名称
+    * @param name
+    */
+    public MattersUsertypeQuery name(String name){
+        setName(name);
+		return this;
+    }
+
+    /**
+    * 设置 服务类型名称
+    * @param nameList
+    */
+    public MattersUsertypeQuery nameList(List<String> nameList){
+        this.nameList = nameList;
+		return this;
+    }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<MattersUsertypeQuery> 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<MattersUsertypeQuery> 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<MattersUsertypeQuery> 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<MattersUsertypeQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/model/vo/MattersAreaVo.java

+package com.mortals.xhx.module.matters.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.matters.model.MattersAreaEntity;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+/**
+* 区域视图对象
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+@Data
+public class MattersAreaVo extends BaseEntityLong {
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/model/vo/MattersDeptVo.java

+package com.mortals.xhx.module.matters.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.matters.model.MattersDeptEntity;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+/**
+* 部门视图对象
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+@Data
+public class MattersDeptVo extends BaseEntityLong {
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/model/vo/MattersDetailVo.java

+package com.mortals.xhx.module.matters.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.matters.model.MattersDetailEntity;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+/**
+* 事项详情视图对象
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+@Data
+public class MattersDetailVo extends BaseEntityLong {
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/model/vo/MattersPowerVo.java

+package com.mortals.xhx.module.matters.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.matters.model.MattersPowerEntity;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+/**
+* 行政权力视图对象
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+@Data
+public class MattersPowerVo extends BaseEntityLong {
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/model/vo/MattersThemeVo.java

+package com.mortals.xhx.module.matters.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.matters.model.MattersThemeEntity;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+/**
+* 主题视图对象
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+@Data
+public class MattersThemeVo extends BaseEntityLong {
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/model/vo/MattersUsertypeVo.java

+package com.mortals.xhx.module.matters.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.matters.model.MattersUsertypeEntity;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+/**
+* 服务类型视图对象
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+@Data
+public class MattersUsertypeVo extends BaseEntityLong {
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/model/vo/MattersVo.java

+package com.mortals.xhx.module.matters.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.matters.model.MattersEntity;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+/**
+* 事项列视图对象
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+@Data
+public class MattersVo extends BaseEntityLong {
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/service/MattersAreaService.java

+package com.mortals.xhx.module.matters.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.matters.model.MattersAreaEntity;
+/**
+* MattersAreaService
+*
+* 区域 service接口
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+public interface MattersAreaService extends ICRUDService<MattersAreaEntity,Long>{
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/service/MattersDeptService.java

+package com.mortals.xhx.module.matters.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.matters.model.MattersDeptEntity;
+/**
+* MattersDeptService
+*
+* 部门 service接口
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+public interface MattersDeptService extends ICRUDService<MattersDeptEntity,Long>{
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/service/MattersDetailService.java

+package com.mortals.xhx.module.matters.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.matters.model.MattersDetailEntity;
+/**
+* MattersDetailService
+*
+* 事项详情 service接口
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+public interface MattersDetailService extends ICRUDService<MattersDetailEntity,Long>{
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/service/MattersPowerService.java

+package com.mortals.xhx.module.matters.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.matters.model.MattersPowerEntity;
+/**
+* MattersPowerService
+*
+* 行政权力 service接口
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+public interface MattersPowerService extends ICRUDService<MattersPowerEntity,Long>{
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/service/MattersService.java

+package com.mortals.xhx.module.matters.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.matters.model.MattersEntity;
+/**
+* MattersService
+*
+* 事项列 service接口
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+public interface MattersService extends ICRUDService<MattersEntity,Long>{
+
+
+
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/service/MattersThemeService.java

+package com.mortals.xhx.module.matters.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.matters.model.MattersThemeEntity;
+/**
+* MattersThemeService
+*
+* 主题 service接口
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+public interface MattersThemeService extends ICRUDService<MattersThemeEntity,Long>{
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/service/MattersUsertypeService.java

+package com.mortals.xhx.module.matters.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.matters.model.MattersUsertypeEntity;
+/**
+* MattersUsertypeService
+*
+* 服务类型 service接口
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+public interface MattersUsertypeService extends ICRUDService<MattersUsertypeEntity,Long>{
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/service/impl/MattersAreaServiceImpl.java

+package com.mortals.xhx.module.matters.service.impl;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.xhx.module.matters.dao.MattersAreaDao;
+import com.mortals.xhx.module.matters.model.MattersAreaEntity;
+import com.mortals.xhx.module.matters.service.MattersAreaService;
+/**
+* MattersAreaService
+* 区域 service实现
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+@Service("mattersAreaService")
+public class MattersAreaServiceImpl extends AbstractCRUDServiceImpl<MattersAreaDao, MattersAreaEntity, Long> implements MattersAreaService {
+    
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/service/impl/MattersDeptServiceImpl.java

+package com.mortals.xhx.module.matters.service.impl;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.xhx.module.matters.dao.MattersDeptDao;
+import com.mortals.xhx.module.matters.model.MattersDeptEntity;
+import com.mortals.xhx.module.matters.service.MattersDeptService;
+/**
+* MattersDeptService
+* 部门 service实现
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+@Service("mattersDeptService")
+public class MattersDeptServiceImpl extends AbstractCRUDServiceImpl<MattersDeptDao, MattersDeptEntity, Long> implements MattersDeptService {
+    
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/service/impl/MattersDetailServiceImpl.java

+package com.mortals.xhx.module.matters.service.impl;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.xhx.module.matters.dao.MattersDetailDao;
+import com.mortals.xhx.module.matters.model.MattersDetailEntity;
+import com.mortals.xhx.module.matters.service.MattersDetailService;
+/**
+* MattersDetailService
+* 事项详情 service实现
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+@Service("mattersDetailService")
+public class MattersDetailServiceImpl extends AbstractCRUDServiceImpl<MattersDetailDao, MattersDetailEntity, Long> implements MattersDetailService {
+    
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/service/impl/MattersPowerServiceImpl.java

+package com.mortals.xhx.module.matters.service.impl;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.xhx.module.matters.dao.MattersPowerDao;
+import com.mortals.xhx.module.matters.model.MattersPowerEntity;
+import com.mortals.xhx.module.matters.service.MattersPowerService;
+/**
+* MattersPowerService
+* 行政权力 service实现
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+@Service("mattersPowerService")
+public class MattersPowerServiceImpl extends AbstractCRUDServiceImpl<MattersPowerDao, MattersPowerEntity, Long> implements MattersPowerService {
+    
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/service/impl/MattersServiceImpl.java

+package com.mortals.xhx.module.matters.service.impl;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.xhx.module.matters.dao.MattersDao;
+import com.mortals.xhx.module.matters.model.MattersEntity;
+import com.mortals.xhx.module.matters.service.MattersService;
+/**
+* MattersService
+* 事项列 service实现
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+@Service("mattersService")
+public class MattersServiceImpl extends AbstractCRUDServiceImpl<MattersDao, MattersEntity, Long> implements MattersService {
+    
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/service/impl/MattersThemeServiceImpl.java

+package com.mortals.xhx.module.matters.service.impl;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.xhx.module.matters.dao.MattersThemeDao;
+import com.mortals.xhx.module.matters.model.MattersThemeEntity;
+import com.mortals.xhx.module.matters.service.MattersThemeService;
+/**
+* MattersThemeService
+* 主题 service实现
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+@Service("mattersThemeService")
+public class MattersThemeServiceImpl extends AbstractCRUDServiceImpl<MattersThemeDao, MattersThemeEntity, Long> implements MattersThemeService {
+    
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/service/impl/MattersUsertypeServiceImpl.java

+package com.mortals.xhx.module.matters.service.impl;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.xhx.module.matters.dao.MattersUsertypeDao;
+import com.mortals.xhx.module.matters.model.MattersUsertypeEntity;
+import com.mortals.xhx.module.matters.service.MattersUsertypeService;
+/**
+* MattersUsertypeService
+* 服务类型 service实现
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+@Service("mattersUsertypeService")
+public class MattersUsertypeServiceImpl extends AbstractCRUDServiceImpl<MattersUsertypeDao, MattersUsertypeEntity, Long> implements MattersUsertypeService {
+    
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/web/MattersAreaForm.java

+package com.mortals.xhx.module.matters.web;
+
+
+import com.mortals.framework.web.BaseCRUDFormLong;
+import com.mortals.xhx.module.matters.model.MattersAreaEntity;
+import com.mortals.xhx.module.matters.model.MattersAreaQuery;
+
+/**
+* MattersArea
+*
+* 区域 Form
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+public class MattersAreaForm extends BaseCRUDFormLong<MattersAreaEntity> {
+    private MattersAreaEntity entity = new MattersAreaEntity();
+    private MattersAreaQuery query = new MattersAreaQuery();
+    public MattersAreaForm(){
+    }
+
+    @Override
+    public MattersAreaEntity getEntity() {
+        return entity;
+    }
+
+    public void setMattersArea(MattersAreaEntity entity) {
+        this.entity = entity;
+    }
+
+    @Override
+    public MattersAreaQuery getQuery() {
+        return query;
+    }
+
+    public void setQuery(MattersAreaQuery query) {
+        this.query = query;
+    }
+}
\ No newline at end of file

knowledge-base/src/main/java/com/mortals/xhx/module/matters/web/MattersAreaController.java → single-matter/src/main/java/com/mortals/xhx/module/matters/web/MattersController.java

 package com.mortals.xhx.module.matters.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.BaseCRUDJsonMappingController;
-import com.mortals.xhx.module.matters.model.MattersAreaEntity;
-import com.mortals.xhx.module.matters.model.MattersAreaQuery;
-import com.mortals.xhx.module.matters.service.MattersAreaService;
+import com.mortals.xhx.module.matters.model.MattersEntity;
+import com.mortals.xhx.module.matters.model.MattersQuery;
+import com.mortals.xhx.module.matters.service.MattersService;
 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 2022-03-30
- */
+*
+* 事项列
+*
+* @author zxfei
+* @date 2022-03-30
+*/
 @RestController
-@RequestMapping("matters/area")
-public class MattersAreaController extends BaseCRUDJsonBodyMappingController<MattersAreaService, MattersAreaEntity, Long> {
+@RequestMapping("matters")
+public class MattersController extends BaseCRUDJsonMappingController<MattersService,MattersForm,MattersEntity,Long> {
 
     @Autowired
     private ParamService paramService;
 
-    public MattersAreaController() {
-        super.setFormClass(MattersAreaForm.class);
-        super.setModuleDesc("区域");
+    public MattersController(){
+        super.setFormClass(MattersForm.class);
+        super.setModuleDesc( "事项列");
     }
 
     @Override
-    protected void init( Map<String, Object> model, Context context) {
-        super.init(model, context);
+    protected void init(HttpServletRequest request, HttpServletResponse response, MattersForm form, Map<String, Object> model, Context context) {
+        super.init(request, response, form, model, context);
     }
 
 }
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/web/MattersDeptController.java

+package com.mortals.xhx.module.matters.web;
+
+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.BaseCRUDJsonMappingController;
+import com.mortals.xhx.module.matters.model.MattersDeptEntity;
+import com.mortals.xhx.module.matters.model.MattersDeptQuery;
+import com.mortals.xhx.module.matters.service.MattersDeptService;
+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 2022-03-30
+*/
+@RestController
+@RequestMapping("matters/dept")
+public class MattersDeptController extends BaseCRUDJsonMappingController<MattersDeptService,MattersDeptForm,MattersDeptEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public MattersDeptController(){
+        super.setFormClass(MattersDeptForm.class);
+        super.setModuleDesc( "部门");
+    }
+
+    @Override
+    protected void init(HttpServletRequest request, HttpServletResponse response, MattersDeptForm form, Map<String, Object> model, Context context) {
+        super.init(request, response, form, model, context);
+    }
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/web/MattersDeptForm.java

+package com.mortals.xhx.module.matters.web;
+
+
+import com.mortals.framework.web.BaseCRUDFormLong;
+import com.mortals.xhx.module.matters.model.MattersDeptEntity;
+import com.mortals.xhx.module.matters.model.MattersDeptQuery;
+
+/**
+* MattersDept
+*
+* 部门 Form
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+public class MattersDeptForm extends BaseCRUDFormLong<MattersDeptEntity> {
+    private MattersDeptEntity entity = new MattersDeptEntity();
+    private MattersDeptQuery query = new MattersDeptQuery();
+    public MattersDeptForm(){
+    }
+
+    @Override
+    public MattersDeptEntity getEntity() {
+        return entity;
+    }
+
+    public void setMattersDept(MattersDeptEntity entity) {
+        this.entity = entity;
+    }
+
+    @Override
+    public MattersDeptQuery getQuery() {
+        return query;
+    }
+
+    public void setQuery(MattersDeptQuery query) {
+        this.query = query;
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/web/MattersDetailController.java

+package com.mortals.xhx.module.matters.web;
+
+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.BaseCRUDJsonMappingController;
+import com.mortals.xhx.module.matters.model.MattersDetailEntity;
+import com.mortals.xhx.module.matters.model.MattersDetailQuery;
+import com.mortals.xhx.module.matters.service.MattersDetailService;
+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 2022-03-30
+*/
+@RestController
+@RequestMapping("matters/detail")
+public class MattersDetailController extends BaseCRUDJsonMappingController<MattersDetailService,MattersDetailForm,MattersDetailEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public MattersDetailController(){
+        super.setFormClass(MattersDetailForm.class);
+        super.setModuleDesc( "事项详情");
+    }
+
+    @Override
+    protected void init(HttpServletRequest request, HttpServletResponse response, MattersDetailForm form, Map<String, Object> model, Context context) {
+        super.init(request, response, form, model, context);
+    }
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/web/MattersDetailForm.java

+package com.mortals.xhx.module.matters.web;
+
+
+import com.mortals.framework.web.BaseCRUDFormLong;
+import com.mortals.xhx.module.matters.model.MattersDetailEntity;
+import com.mortals.xhx.module.matters.model.MattersDetailQuery;
+
+/**
+* MattersDetail
+*
+* 事项详情 Form
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+public class MattersDetailForm extends BaseCRUDFormLong<MattersDetailEntity> {
+    private MattersDetailEntity entity = new MattersDetailEntity();
+    private MattersDetailQuery query = new MattersDetailQuery();
+    public MattersDetailForm(){
+    }
+
+    @Override
+    public MattersDetailEntity getEntity() {
+        return entity;
+    }
+
+    public void setMattersDetail(MattersDetailEntity entity) {
+        this.entity = entity;
+    }
+
+    @Override
+    public MattersDetailQuery getQuery() {
+        return query;
+    }
+
+    public void setQuery(MattersDetailQuery query) {
+        this.query = query;
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/web/MattersForm.java

+package com.mortals.xhx.module.matters.web;
+
+
+import com.mortals.framework.web.BaseCRUDFormLong;
+import com.mortals.xhx.module.matters.model.MattersEntity;
+import com.mortals.xhx.module.matters.model.MattersQuery;
+
+/**
+* Matters
+*
+* 事项列 Form
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+public class MattersForm extends BaseCRUDFormLong<MattersEntity> {
+    private MattersEntity entity = new MattersEntity();
+    private MattersQuery query = new MattersQuery();
+    public MattersForm(){
+    }
+
+    @Override
+    public MattersEntity getEntity() {
+        return entity;
+    }
+
+    public void setMatters(MattersEntity entity) {
+        this.entity = entity;
+    }
+
+    @Override
+    public MattersQuery getQuery() {
+        return query;
+    }
+
+    public void setQuery(MattersQuery query) {
+        this.query = query;
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/web/MattersPowerController.java

+package com.mortals.xhx.module.matters.web;
+
+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.BaseCRUDJsonMappingController;
+import com.mortals.xhx.module.matters.model.MattersPowerEntity;
+import com.mortals.xhx.module.matters.model.MattersPowerQuery;
+import com.mortals.xhx.module.matters.service.MattersPowerService;
+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 2022-03-30
+*/
+@RestController
+@RequestMapping("matters/power")
+public class MattersPowerController extends BaseCRUDJsonMappingController<MattersPowerService,MattersPowerForm,MattersPowerEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public MattersPowerController(){
+        super.setFormClass(MattersPowerForm.class);
+        super.setModuleDesc( "行政权力");
+    }
+
+    @Override
+    protected void init(HttpServletRequest request, HttpServletResponse response, MattersPowerForm form, Map<String, Object> model, Context context) {
+        super.init(request, response, form, model, context);
+    }
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/web/MattersPowerForm.java

+package com.mortals.xhx.module.matters.web;
+
+
+import com.mortals.framework.web.BaseCRUDFormLong;
+import com.mortals.xhx.module.matters.model.MattersPowerEntity;
+import com.mortals.xhx.module.matters.model.MattersPowerQuery;
+
+/**
+* MattersPower
+*
+* 行政权力 Form
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+public class MattersPowerForm extends BaseCRUDFormLong<MattersPowerEntity> {
+    private MattersPowerEntity entity = new MattersPowerEntity();
+    private MattersPowerQuery query = new MattersPowerQuery();
+    public MattersPowerForm(){
+    }
+
+    @Override
+    public MattersPowerEntity getEntity() {
+        return entity;
+    }
+
+    public void setMattersPower(MattersPowerEntity entity) {
+        this.entity = entity;
+    }
+
+    @Override
+    public MattersPowerQuery getQuery() {
+        return query;
+    }
+
+    public void setQuery(MattersPowerQuery query) {
+        this.query = query;
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/web/MattersThemeController.java

+package com.mortals.xhx.module.matters.web;
+
+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.BaseCRUDJsonMappingController;
+import com.mortals.xhx.module.matters.model.MattersThemeEntity;
+import com.mortals.xhx.module.matters.model.MattersThemeQuery;
+import com.mortals.xhx.module.matters.service.MattersThemeService;
+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 2022-03-30
+*/
+@RestController
+@RequestMapping("matters/theme")
+public class MattersThemeController extends BaseCRUDJsonMappingController<MattersThemeService,MattersThemeForm,MattersThemeEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public MattersThemeController(){
+        super.setFormClass(MattersThemeForm.class);
+        super.setModuleDesc( "主题");
+    }
+
+    @Override
+    protected void init(HttpServletRequest request, HttpServletResponse response, MattersThemeForm form, Map<String, Object> model, Context context) {
+        super.init(request, response, form, model, context);
+    }
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/web/MattersThemeForm.java

+package com.mortals.xhx.module.matters.web;
+
+
+import com.mortals.framework.web.BaseCRUDFormLong;
+import com.mortals.xhx.module.matters.model.MattersThemeEntity;
+import com.mortals.xhx.module.matters.model.MattersThemeQuery;
+
+/**
+* MattersTheme
+*
+* 主题 Form
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+public class MattersThemeForm extends BaseCRUDFormLong<MattersThemeEntity> {
+    private MattersThemeEntity entity = new MattersThemeEntity();
+    private MattersThemeQuery query = new MattersThemeQuery();
+    public MattersThemeForm(){
+    }
+
+    @Override
+    public MattersThemeEntity getEntity() {
+        return entity;
+    }
+
+    public void setMattersTheme(MattersThemeEntity entity) {
+        this.entity = entity;
+    }
+
+    @Override
+    public MattersThemeQuery getQuery() {
+        return query;
+    }
+
+    public void setQuery(MattersThemeQuery query) {
+        this.query = query;
+    }
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/web/MattersUsertypeController.java

+package com.mortals.xhx.module.matters.web;
+
+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.BaseCRUDJsonMappingController;
+import com.mortals.xhx.module.matters.model.MattersUsertypeEntity;
+import com.mortals.xhx.module.matters.model.MattersUsertypeQuery;
+import com.mortals.xhx.module.matters.service.MattersUsertypeService;
+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 2022-03-30
+*/
+@RestController
+@RequestMapping("matters/usertype")
+public class MattersUsertypeController extends BaseCRUDJsonMappingController<MattersUsertypeService,MattersUsertypeForm,MattersUsertypeEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public MattersUsertypeController(){
+        super.setFormClass(MattersUsertypeForm.class);
+        super.setModuleDesc( "服务类型");
+    }
+
+    @Override
+    protected void init(HttpServletRequest request, HttpServletResponse response, MattersUsertypeForm form, Map<String, Object> model, Context context) {
+        super.init(request, response, form, model, context);
+    }
+
+}
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/matters/web/MattersUsertypeForm.java

+package com.mortals.xhx.module.matters.web;
+
+
+import com.mortals.framework.web.BaseCRUDFormLong;
+import com.mortals.xhx.module.matters.model.MattersUsertypeEntity;
+import com.mortals.xhx.module.matters.model.MattersUsertypeQuery;
+
+/**
+* MattersUsertype
+*
+* 服务类型 Form
+*
+* @author zxfei
+* @date 2022-03-30
+*/
+public class MattersUsertypeForm extends BaseCRUDFormLong<MattersUsertypeEntity> {
+    private MattersUsertypeEntity entity = new MattersUsertypeEntity();
+    private MattersUsertypeQuery query = new MattersUsertypeQuery();
+    public MattersUsertypeForm(){
+    }
+
+    @Override
+    public MattersUsertypeEntity getEntity() {
+        return entity;
+    }
+
+    public void setMattersUsertype(MattersUsertypeEntity entity) {
+        this.entity = entity;
+    }
+
+    @Override
+    public MattersUsertypeQuery getQuery() {
+        return query;
+    }
+
+    public void setQuery(MattersUsertypeQuery query) {
+        this.query = query;
+    }
+}
\ No newline at end of file

single-matter/src/main/resources/sqlmap/module/matter/MatterAcceptMapper.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.matter.dao.ibatis.MatterAcceptDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="MatterAcceptEntity" id="MatterAcceptEntity-Map">
+            <id  property="id" column="id" />
+            <result property="matterId" column="matterId" />
+            <result property="matterCode" column="matterCode" />
+            <result property="matterName" column="matterName" />
+            <result property="content" column="content" />
+            <result property="source" column="source" />
+            <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('matterId') or colPickMode == 1 and data.containsKey('matterId')))">
+                    a.matterId,
+                </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('matterName') or colPickMode == 1 and data.containsKey('matterName')))">
+                    a.matterName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('content') or colPickMode == 1 and data.containsKey('content')))">
+                    a.content,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('source') or colPickMode == 1 and data.containsKey('source')))">
+                    a.source,
+                </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="MatterAcceptEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_sys_matter_accept
+        (matterId,matterCode,matterName,content,source,createTime,createUserId,updateTime)
+        VALUES
+        (#{matterId},#{matterCode},#{matterName},#{content},#{source},#{createTime},#{createUserId},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_sys_matter_accept
+        (matterId,matterCode,matterName,content,source,createTime,createUserId,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.matterId},#{item.matterCode},#{item.matterName},#{item.content},#{item.source},#{item.createTime},#{item.createUserId},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_sys_matter_accept as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('matterId')) or (colPickMode==1 and !data.containsKey('matterId'))">
+                a.matterId=#{data.matterId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('matterIdIncrement')) or (colPickMode==1 and !data.containsKey('matterIdIncrement'))">
+                a.matterId=ifnull(a.matterId,0) + #{data.matterIdIncrement},
+            </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('matterName')) or (colPickMode==1 and !data.containsKey('matterName'))">
+                a.matterName=#{data.matterName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('content')) or (colPickMode==1 and !data.containsKey('content'))">
+                a.content=#{data.content},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('source')) or (colPickMode==1 and !data.containsKey('source'))">
+                a.source=#{data.source},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('sourceIncrement')) or (colPickMode==1 and !data.containsKey('sourceIncrement'))">
+                a.source=ifnull(a.source,0) + #{data.sourceIncrement},
+            </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_matter_accept as a
+        <trim prefix="set" suffixOverrides=",">
+                        <trim prefix="matterId=(case" suffix="ELSE matterId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('matterId')) or (colPickMode==1 and !item.containsKey('matterId'))">
+                                        when a.id=#{item.id} then #{item.matterId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('matterIdIncrement')) or (colPickMode==1 and !item.containsKey('matterIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.matterId,0) + #{item.matterIdIncrement}
+                                    </when>
+                                </choose>
+                            </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="matterName=(case" suffix="ELSE matterName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('matterName')) or (colPickMode==1 and !item.containsKey('matterName'))">
+                            when a.id=#{item.id} then #{item.matterName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="content=(case" suffix="ELSE content end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('content')) or (colPickMode==1 and !item.containsKey('content'))">
+                            when a.id=#{item.id} then #{item.content}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="source=(case" suffix="ELSE source end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('source')) or (colPickMode==1 and !item.containsKey('source'))">
+                                        when a.id=#{item.id} then #{item.source}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('sourceIncrement')) or (colPickMode==1 and !item.containsKey('sourceIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.source,0) + #{item.sourceIncrement}
+                                    </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=")">
+            #{item.id}
+        </foreach>
+    </update>
+    <!-- 根据主健查询 -->
+    <select id="getByKey" parameterType="paramDto" resultMap="MatterAcceptEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_matter_accept as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_sys_matter_accept as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_sys_matter_accept where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_sys_matter_accept as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="MatterAcceptEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_matter_accept 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_matter_accept 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')">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" 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('matterId')">
+                <if test="conditionParamRef.matterId != null ">
+                    ${_conditionType_} a.matterId = #{${_conditionParam_}.matterId}
+                </if>
+                <if test="conditionParamRef.matterId == null">
+                    ${_conditionType_} a.matterId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('matterIdList')">
+                ${_conditionType_} a.matterId in
+                <foreach collection="conditionParamRef.matterIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('matterIdStart') and conditionParamRef.matterIdStart != null">
+                ${_conditionType_} a.matterId <![CDATA[ >= ]]> #{${_conditionParam_}.matterIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('matterIdEnd') and conditionParamRef.matterIdEnd != null">
+                ${_conditionType_} a.matterId <![CDATA[ <= ]]> #{${_conditionParam_}.matterIdEnd}
+            </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')">
+                ${_conditionType_} a.matterCode in
+                <foreach collection="conditionParamRef.matterCodeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('matterName')">
+                <if test="conditionParamRef.matterName != null and conditionParamRef.matterName != ''">
+                    ${_conditionType_} a.matterName like #{${_conditionParam_}.matterName}
+                </if>
+                <if test="conditionParamRef.matterName == null">
+                    ${_conditionType_} a.matterName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('matterNameList')">
+                ${_conditionType_} a.matterName in
+                <foreach collection="conditionParamRef.matterNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('content')">
+                <if test="conditionParamRef.content != null and conditionParamRef.content != ''">
+                    ${_conditionType_} a.content like #{${_conditionParam_}.content}
+                </if>
+                <if test="conditionParamRef.content == null">
+                    ${_conditionType_} a.content is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('contentList')">
+                ${_conditionType_} a.content in
+                <foreach collection="conditionParamRef.contentList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('source')">
+                <if test="conditionParamRef.source != null ">
+                    ${_conditionType_} a.source = #{${_conditionParam_}.source}
+                </if>
+                <if test="conditionParamRef.source == null">
+                    ${_conditionType_} a.source is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('sourceList')">
+                ${_conditionType_} a.source in
+                <foreach collection="conditionParamRef.sourceList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('sourceStart') and conditionParamRef.sourceStart != null">
+                ${_conditionType_} a.source <![CDATA[ >= ]]> #{${_conditionParam_}.sourceStart}
+            </if>
+            <if test="conditionParamRef.containsKey('sourceEnd') and conditionParamRef.sourceEnd != null">
+                ${_conditionType_} a.source <![CDATA[ <= ]]> #{${_conditionParam_}.sourceEnd}
+            </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')">
+                ${_conditionType_} a.createUserId in
+                <foreach collection="conditionParamRef.createUserIdList" 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('matterId')">
+                        a.matterId
+                        <if test='orderCol.matterId != null and "DESC".equalsIgnoreCase(orderCol.matterId)'>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('matterName')">
+                        a.matterName
+                        <if test='orderCol.matterName != null and "DESC".equalsIgnoreCase(orderCol.matterName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('content')">
+                        a.content
+                        <if test='orderCol.content != null and "DESC".equalsIgnoreCase(orderCol.content)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('source')">
+                        a.source
+                        <if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>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

single-matter/src/main/resources/sqlmap/module/matter/MatterChargesMapper.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.matter.dao.ibatis.MatterChargesDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="MatterChargesEntity" id="MatterChargesEntity-Map">
+            <id  property="id" column="id" />
+            <result property="matterId" column="matterId" />
+            <result property="matterCode" column="matterCode" />
+            <result property="matterName" column="matterName" />
+            <result property="content" column="content" />
+            <result property="source" column="source" />
+            <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('matterId') or colPickMode == 1 and data.containsKey('matterId')))">
+                    a.matterId,
+                </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('matterName') or colPickMode == 1 and data.containsKey('matterName')))">
+                    a.matterName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('content') or colPickMode == 1 and data.containsKey('content')))">
+                    a.content,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('source') or colPickMode == 1 and data.containsKey('source')))">
+                    a.source,
+                </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="MatterChargesEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_sys_matter_charges
+        (matterId,matterCode,matterName,content,source,createTime,createUserId,updateTime)
+        VALUES
+        (#{matterId},#{matterCode},#{matterName},#{content},#{source},#{createTime},#{createUserId},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_sys_matter_charges
+        (matterId,matterCode,matterName,content,source,createTime,createUserId,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.matterId},#{item.matterCode},#{item.matterName},#{item.content},#{item.source},#{item.createTime},#{item.createUserId},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_sys_matter_charges as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('matterId')) or (colPickMode==1 and !data.containsKey('matterId'))">
+                a.matterId=#{data.matterId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('matterIdIncrement')) or (colPickMode==1 and !data.containsKey('matterIdIncrement'))">
+                a.matterId=ifnull(a.matterId,0) + #{data.matterIdIncrement},
+            </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('matterName')) or (colPickMode==1 and !data.containsKey('matterName'))">
+                a.matterName=#{data.matterName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('content')) or (colPickMode==1 and !data.containsKey('content'))">
+                a.content=#{data.content},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('source')) or (colPickMode==1 and !data.containsKey('source'))">
+                a.source=#{data.source},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('sourceIncrement')) or (colPickMode==1 and !data.containsKey('sourceIncrement'))">
+                a.source=ifnull(a.source,0) + #{data.sourceIncrement},
+            </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_matter_charges as a
+        <trim prefix="set" suffixOverrides=",">
+                        <trim prefix="matterId=(case" suffix="ELSE matterId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('matterId')) or (colPickMode==1 and !item.containsKey('matterId'))">
+                                        when a.id=#{item.id} then #{item.matterId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('matterIdIncrement')) or (colPickMode==1 and !item.containsKey('matterIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.matterId,0) + #{item.matterIdIncrement}
+                                    </when>
+                                </choose>
+                            </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="matterName=(case" suffix="ELSE matterName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('matterName')) or (colPickMode==1 and !item.containsKey('matterName'))">
+                            when a.id=#{item.id} then #{item.matterName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="content=(case" suffix="ELSE content end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('content')) or (colPickMode==1 and !item.containsKey('content'))">
+                            when a.id=#{item.id} then #{item.content}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="source=(case" suffix="ELSE source end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('source')) or (colPickMode==1 and !item.containsKey('source'))">
+                                        when a.id=#{item.id} then #{item.source}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('sourceIncrement')) or (colPickMode==1 and !item.containsKey('sourceIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.source,0) + #{item.sourceIncrement}
+                                    </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=")">
+            #{item.id}
+        </foreach>
+    </update>
+    <!-- 根据主健查询 -->
+    <select id="getByKey" parameterType="paramDto" resultMap="MatterChargesEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_matter_charges as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_sys_matter_charges as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_sys_matter_charges where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_sys_matter_charges as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="MatterChargesEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_matter_charges 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_matter_charges 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')">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" 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('matterId')">
+                <if test="conditionParamRef.matterId != null ">
+                    ${_conditionType_} a.matterId = #{${_conditionParam_}.matterId}
+                </if>
+                <if test="conditionParamRef.matterId == null">
+                    ${_conditionType_} a.matterId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('matterIdList')">
+                ${_conditionType_} a.matterId in
+                <foreach collection="conditionParamRef.matterIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('matterIdStart') and conditionParamRef.matterIdStart != null">
+                ${_conditionType_} a.matterId <![CDATA[ >= ]]> #{${_conditionParam_}.matterIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('matterIdEnd') and conditionParamRef.matterIdEnd != null">
+                ${_conditionType_} a.matterId <![CDATA[ <= ]]> #{${_conditionParam_}.matterIdEnd}
+            </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')">
+                ${_conditionType_} a.matterCode in
+                <foreach collection="conditionParamRef.matterCodeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('matterName')">
+                <if test="conditionParamRef.matterName != null and conditionParamRef.matterName != ''">
+                    ${_conditionType_} a.matterName like #{${_conditionParam_}.matterName}
+                </if>
+                <if test="conditionParamRef.matterName == null">
+                    ${_conditionType_} a.matterName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('matterNameList')">
+                ${_conditionType_} a.matterName in
+                <foreach collection="conditionParamRef.matterNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('content')">
+                <if test="conditionParamRef.content != null and conditionParamRef.content != ''">
+                    ${_conditionType_} a.content like #{${_conditionParam_}.content}
+                </if>
+                <if test="conditionParamRef.content == null">
+                    ${_conditionType_} a.content is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('contentList')">
+                ${_conditionType_} a.content in
+                <foreach collection="conditionParamRef.contentList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('source')">
+                <if test="conditionParamRef.source != null ">
+                    ${_conditionType_} a.source = #{${_conditionParam_}.source}
+                </if>
+                <if test="conditionParamRef.source == null">
+                    ${_conditionType_} a.source is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('sourceList')">
+                ${_conditionType_} a.source in
+                <foreach collection="conditionParamRef.sourceList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('sourceStart') and conditionParamRef.sourceStart != null">
+                ${_conditionType_} a.source <![CDATA[ >= ]]> #{${_conditionParam_}.sourceStart}
+            </if>
+            <if test="conditionParamRef.containsKey('sourceEnd') and conditionParamRef.sourceEnd != null">
+                ${_conditionType_} a.source <![CDATA[ <= ]]> #{${_conditionParam_}.sourceEnd}
+            </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')">
+                ${_conditionType_} a.createUserId in
+                <foreach collection="conditionParamRef.createUserIdList" 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('matterId')">
+                        a.matterId
+                        <if test='orderCol.matterId != null and "DESC".equalsIgnoreCase(orderCol.matterId)'>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('matterName')">
+                        a.matterName
+                        <if test='orderCol.matterName != null and "DESC".equalsIgnoreCase(orderCol.matterName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('content')">
+                        a.content
+                        <if test='orderCol.content != null and "DESC".equalsIgnoreCase(orderCol.content)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('source')">
+                        a.source
+                        <if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>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

single-matter/src/main/resources/sqlmap/module/matter/MatterFlowlimitMapper.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.matter.dao.ibatis.MatterFlowlimitDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="MatterFlowlimitEntity" id="MatterFlowlimitEntity-Map">
+            <id  property="id" column="id" />
+            <result property="matterId" column="matterId" />
+            <result property="matterCode" column="matterCode" />
+            <result property="matterName" column="matterName" />
+            <result property="flowName" column="flowName" />
+            <result property="flowTime" column="flowTime" />
+            <result property="flowLimit" column="flowLimit" />
+            <result property="flowDesc" column="flowDesc" />
+            <result property="source" column="source" />
+            <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('matterId') or colPickMode == 1 and data.containsKey('matterId')))">
+                    a.matterId,
+                </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('matterName') or colPickMode == 1 and data.containsKey('matterName')))">
+                    a.matterName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('flowName') or colPickMode == 1 and data.containsKey('flowName')))">
+                    a.flowName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('flowTime') or colPickMode == 1 and data.containsKey('flowTime')))">
+                    a.flowTime,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('flowLimit') or colPickMode == 1 and data.containsKey('flowLimit')))">
+                    a.flowLimit,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('flowDesc') or colPickMode == 1 and data.containsKey('flowDesc')))">
+                    a.flowDesc,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('source') or colPickMode == 1 and data.containsKey('source')))">
+                    a.source,
+                </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="MatterFlowlimitEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_sys_matter_flowlimit
+        (matterId,matterCode,matterName,flowName,flowTime,flowLimit,flowDesc,source,createTime,createUserId,updateTime)
+        VALUES
+        (#{matterId},#{matterCode},#{matterName},#{flowName},#{flowTime},#{flowLimit},#{flowDesc},#{source},#{createTime},#{createUserId},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_sys_matter_flowlimit
+        (matterId,matterCode,matterName,flowName,flowTime,flowLimit,flowDesc,source,createTime,createUserId,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.matterId},#{item.matterCode},#{item.matterName},#{item.flowName},#{item.flowTime},#{item.flowLimit},#{item.flowDesc},#{item.source},#{item.createTime},#{item.createUserId},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_sys_matter_flowlimit as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('matterId')) or (colPickMode==1 and !data.containsKey('matterId'))">
+                a.matterId=#{data.matterId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('matterIdIncrement')) or (colPickMode==1 and !data.containsKey('matterIdIncrement'))">
+                a.matterId=ifnull(a.matterId,0) + #{data.matterIdIncrement},
+            </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('matterName')) or (colPickMode==1 and !data.containsKey('matterName'))">
+                a.matterName=#{data.matterName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('flowName')) or (colPickMode==1 and !data.containsKey('flowName'))">
+                a.flowName=#{data.flowName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('flowTime')) or (colPickMode==1 and !data.containsKey('flowTime'))">
+                a.flowTime=#{data.flowTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('flowLimit')) or (colPickMode==1 and !data.containsKey('flowLimit'))">
+                a.flowLimit=#{data.flowLimit},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('flowDesc')) or (colPickMode==1 and !data.containsKey('flowDesc'))">
+                a.flowDesc=#{data.flowDesc},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('source')) or (colPickMode==1 and !data.containsKey('source'))">
+                a.source=#{data.source},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('sourceIncrement')) or (colPickMode==1 and !data.containsKey('sourceIncrement'))">
+                a.source=ifnull(a.source,0) + #{data.sourceIncrement},
+            </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_matter_flowlimit as a
+        <trim prefix="set" suffixOverrides=",">
+                        <trim prefix="matterId=(case" suffix="ELSE matterId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('matterId')) or (colPickMode==1 and !item.containsKey('matterId'))">
+                                        when a.id=#{item.id} then #{item.matterId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('matterIdIncrement')) or (colPickMode==1 and !item.containsKey('matterIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.matterId,0) + #{item.matterIdIncrement}
+                                    </when>
+                                </choose>
+                            </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="matterName=(case" suffix="ELSE matterName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('matterName')) or (colPickMode==1 and !item.containsKey('matterName'))">
+                            when a.id=#{item.id} then #{item.matterName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="flowName=(case" suffix="ELSE flowName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('flowName')) or (colPickMode==1 and !item.containsKey('flowName'))">
+                            when a.id=#{item.id} then #{item.flowName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="flowTime=(case" suffix="ELSE flowTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('flowTime')) or (colPickMode==1 and !item.containsKey('flowTime'))">
+                            when a.id=#{item.id} then #{item.flowTime}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="flowLimit=(case" suffix="ELSE flowLimit end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('flowLimit')) or (colPickMode==1 and !item.containsKey('flowLimit'))">
+                            when a.id=#{item.id} then #{item.flowLimit}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="flowDesc=(case" suffix="ELSE flowDesc end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('flowDesc')) or (colPickMode==1 and !item.containsKey('flowDesc'))">
+                            when a.id=#{item.id} then #{item.flowDesc}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="source=(case" suffix="ELSE source end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('source')) or (colPickMode==1 and !item.containsKey('source'))">
+                                        when a.id=#{item.id} then #{item.source}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('sourceIncrement')) or (colPickMode==1 and !item.containsKey('sourceIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.source,0) + #{item.sourceIncrement}
+                                    </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=")">
+            #{item.id}
+        </foreach>
+    </update>
+    <!-- 根据主健查询 -->
+    <select id="getByKey" parameterType="paramDto" resultMap="MatterFlowlimitEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_matter_flowlimit as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_sys_matter_flowlimit as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_sys_matter_flowlimit where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_sys_matter_flowlimit as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="MatterFlowlimitEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_matter_flowlimit 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_matter_flowlimit 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')">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" 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('matterId')">
+                <if test="conditionParamRef.matterId != null ">
+                    ${_conditionType_} a.matterId = #{${_conditionParam_}.matterId}
+                </if>
+                <if test="conditionParamRef.matterId == null">
+                    ${_conditionType_} a.matterId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('matterIdList')">
+                ${_conditionType_} a.matterId in
+                <foreach collection="conditionParamRef.matterIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('matterIdStart') and conditionParamRef.matterIdStart != null">
+                ${_conditionType_} a.matterId <![CDATA[ >= ]]> #{${_conditionParam_}.matterIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('matterIdEnd') and conditionParamRef.matterIdEnd != null">
+                ${_conditionType_} a.matterId <![CDATA[ <= ]]> #{${_conditionParam_}.matterIdEnd}
+            </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')">
+                ${_conditionType_} a.matterCode in
+                <foreach collection="conditionParamRef.matterCodeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('matterName')">
+                <if test="conditionParamRef.matterName != null and conditionParamRef.matterName != ''">
+                    ${_conditionType_} a.matterName like #{${_conditionParam_}.matterName}
+                </if>
+                <if test="conditionParamRef.matterName == null">
+                    ${_conditionType_} a.matterName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('matterNameList')">
+                ${_conditionType_} a.matterName in
+                <foreach collection="conditionParamRef.matterNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('flowName')">
+                <if test="conditionParamRef.flowName != null and conditionParamRef.flowName != ''">
+                    ${_conditionType_} a.flowName like #{${_conditionParam_}.flowName}
+                </if>
+                <if test="conditionParamRef.flowName == null">
+                    ${_conditionType_} a.flowName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('flowNameList')">
+                ${_conditionType_} a.flowName in
+                <foreach collection="conditionParamRef.flowNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('flowTime')">
+                <if test="conditionParamRef.flowTime != null and conditionParamRef.flowTime != ''">
+                    ${_conditionType_} a.flowTime like #{${_conditionParam_}.flowTime}
+                </if>
+                <if test="conditionParamRef.flowTime == null">
+                    ${_conditionType_} a.flowTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('flowTimeList')">
+                ${_conditionType_} a.flowTime in
+                <foreach collection="conditionParamRef.flowTimeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('flowLimit')">
+                <if test="conditionParamRef.flowLimit != null and conditionParamRef.flowLimit != ''">
+                    ${_conditionType_} a.flowLimit like #{${_conditionParam_}.flowLimit}
+                </if>
+                <if test="conditionParamRef.flowLimit == null">
+                    ${_conditionType_} a.flowLimit is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('flowLimitList')">
+                ${_conditionType_} a.flowLimit in
+                <foreach collection="conditionParamRef.flowLimitList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('flowDesc')">
+                <if test="conditionParamRef.flowDesc != null and conditionParamRef.flowDesc != ''">
+                    ${_conditionType_} a.flowDesc like #{${_conditionParam_}.flowDesc}
+                </if>
+                <if test="conditionParamRef.flowDesc == null">
+                    ${_conditionType_} a.flowDesc is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('flowDescList')">
+                ${_conditionType_} a.flowDesc in
+                <foreach collection="conditionParamRef.flowDescList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('source')">
+                <if test="conditionParamRef.source != null ">
+                    ${_conditionType_} a.source = #{${_conditionParam_}.source}
+                </if>
+                <if test="conditionParamRef.source == null">
+                    ${_conditionType_} a.source is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('sourceList')">
+                ${_conditionType_} a.source in
+                <foreach collection="conditionParamRef.sourceList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('sourceStart') and conditionParamRef.sourceStart != null">
+                ${_conditionType_} a.source <![CDATA[ >= ]]> #{${_conditionParam_}.sourceStart}
+            </if>
+            <if test="conditionParamRef.containsKey('sourceEnd') and conditionParamRef.sourceEnd != null">
+                ${_conditionType_} a.source <![CDATA[ <= ]]> #{${_conditionParam_}.sourceEnd}
+            </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')">
+                ${_conditionType_} a.createUserId in
+                <foreach collection="conditionParamRef.createUserIdList" 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('matterId')">
+                        a.matterId
+                        <if test='orderCol.matterId != null and "DESC".equalsIgnoreCase(orderCol.matterId)'>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('matterName')">
+                        a.matterName
+                        <if test='orderCol.matterName != null and "DESC".equalsIgnoreCase(orderCol.matterName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('flowName')">
+                        a.flowName
+                        <if test='orderCol.flowName != null and "DESC".equalsIgnoreCase(orderCol.flowName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('flowTime')">
+                        a.flowTime
+                        <if test='orderCol.flowTime != null and "DESC".equalsIgnoreCase(orderCol.flowTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('flowLimit')">
+                        a.flowLimit
+                        <if test='orderCol.flowLimit != null and "DESC".equalsIgnoreCase(orderCol.flowLimit)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('flowDesc')">
+                        a.flowDesc
+                        <if test='orderCol.flowDesc != null and "DESC".equalsIgnoreCase(orderCol.flowDesc)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('source')">
+                        a.source
+                        <if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>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

single-matter/src/main/resources/sqlmap/module/matter/MatterIntermediaryMapper.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.matter.dao.ibatis.MatterIntermediaryDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="MatterIntermediaryEntity" id="MatterIntermediaryEntity-Map">
+            <id  property="id" column="id" />
+            <result property="matterId" column="matterId" />
+            <result property="matterCode" column="matterCode" />
+            <result property="matterName" column="matterName" />
+            <result property="title" column="title" />
+            <result property="intermediaryRequest" column="intermediaryRequest" />
+            <result property="intermediaryRequestTime" column="intermediaryRequestTime" />
+            <result property="remark" column="remark" />
+            <result property="source" column="source" />
+            <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('matterId') or colPickMode == 1 and data.containsKey('matterId')))">
+                    a.matterId,
+                </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('matterName') or colPickMode == 1 and data.containsKey('matterName')))">
+                    a.matterName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('title') or colPickMode == 1 and data.containsKey('title')))">
+                    a.title,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('intermediaryRequest') or colPickMode == 1 and data.containsKey('intermediaryRequest')))">
+                    a.intermediaryRequest,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('intermediaryRequestTime') or colPickMode == 1 and data.containsKey('intermediaryRequestTime')))">
+                    a.intermediaryRequestTime,
+                </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('source') or colPickMode == 1 and data.containsKey('source')))">
+                    a.source,
+                </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="MatterIntermediaryEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_sys_matter_intermediary
+        (matterId,matterCode,matterName,title,intermediaryRequest,intermediaryRequestTime,remark,source,createTime,createUserId,updateTime)
+        VALUES
+        (#{matterId},#{matterCode},#{matterName},#{title},#{intermediaryRequest},#{intermediaryRequestTime},#{remark},#{source},#{createTime},#{createUserId},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_sys_matter_intermediary
+        (matterId,matterCode,matterName,title,intermediaryRequest,intermediaryRequestTime,remark,source,createTime,createUserId,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.matterId},#{item.matterCode},#{item.matterName},#{item.title},#{item.intermediaryRequest},#{item.intermediaryRequestTime},#{item.remark},#{item.source},#{item.createTime},#{item.createUserId},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_sys_matter_intermediary as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('matterId')) or (colPickMode==1 and !data.containsKey('matterId'))">
+                a.matterId=#{data.matterId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('matterIdIncrement')) or (colPickMode==1 and !data.containsKey('matterIdIncrement'))">
+                a.matterId=ifnull(a.matterId,0) + #{data.matterIdIncrement},
+            </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('matterName')) or (colPickMode==1 and !data.containsKey('matterName'))">
+                a.matterName=#{data.matterName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('title')) or (colPickMode==1 and !data.containsKey('title'))">
+                a.title=#{data.title},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('intermediaryRequest')) or (colPickMode==1 and !data.containsKey('intermediaryRequest'))">
+                a.intermediaryRequest=#{data.intermediaryRequest},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('intermediaryRequestTime')) or (colPickMode==1 and !data.containsKey('intermediaryRequestTime'))">
+                a.intermediaryRequestTime=#{data.intermediaryRequestTime},
+            </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('source')) or (colPickMode==1 and !data.containsKey('source'))">
+                a.source=#{data.source},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('sourceIncrement')) or (colPickMode==1 and !data.containsKey('sourceIncrement'))">
+                a.source=ifnull(a.source,0) + #{data.sourceIncrement},
+            </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_matter_intermediary as a
+        <trim prefix="set" suffixOverrides=",">
+                        <trim prefix="matterId=(case" suffix="ELSE matterId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('matterId')) or (colPickMode==1 and !item.containsKey('matterId'))">
+                                        when a.id=#{item.id} then #{item.matterId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('matterIdIncrement')) or (colPickMode==1 and !item.containsKey('matterIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.matterId,0) + #{item.matterIdIncrement}
+                                    </when>
+                                </choose>
+                            </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="matterName=(case" suffix="ELSE matterName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('matterName')) or (colPickMode==1 and !item.containsKey('matterName'))">
+                            when a.id=#{item.id} then #{item.matterName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="title=(case" suffix="ELSE title end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('title')) or (colPickMode==1 and !item.containsKey('title'))">
+                            when a.id=#{item.id} then #{item.title}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="intermediaryRequest=(case" suffix="ELSE intermediaryRequest end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('intermediaryRequest')) or (colPickMode==1 and !item.containsKey('intermediaryRequest'))">
+                            when a.id=#{item.id} then #{item.intermediaryRequest}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="intermediaryRequestTime=(case" suffix="ELSE intermediaryRequestTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('intermediaryRequestTime')) or (colPickMode==1 and !item.containsKey('intermediaryRequestTime'))">
+                            when a.id=#{item.id} then #{item.intermediaryRequestTime}
+                        </if>
+                    </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="source=(case" suffix="ELSE source end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('source')) or (colPickMode==1 and !item.containsKey('source'))">
+                                        when a.id=#{item.id} then #{item.source}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('sourceIncrement')) or (colPickMode==1 and !item.containsKey('sourceIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.source,0) + #{item.sourceIncrement}
+                                    </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=")">
+            #{item.id}
+        </foreach>
+    </update>
+    <!-- 根据主健查询 -->
+    <select id="getByKey" parameterType="paramDto" resultMap="MatterIntermediaryEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_matter_intermediary as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_sys_matter_intermediary as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_sys_matter_intermediary where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_sys_matter_intermediary as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="MatterIntermediaryEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_matter_intermediary 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_matter_intermediary 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')">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" 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('matterId')">
+                <if test="conditionParamRef.matterId != null ">
+                    ${_conditionType_} a.matterId = #{${_conditionParam_}.matterId}
+                </if>
+                <if test="conditionParamRef.matterId == null">
+                    ${_conditionType_} a.matterId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('matterIdList')">
+                ${_conditionType_} a.matterId in
+                <foreach collection="conditionParamRef.matterIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('matterIdStart') and conditionParamRef.matterIdStart != null">
+                ${_conditionType_} a.matterId <![CDATA[ >= ]]> #{${_conditionParam_}.matterIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('matterIdEnd') and conditionParamRef.matterIdEnd != null">
+                ${_conditionType_} a.matterId <![CDATA[ <= ]]> #{${_conditionParam_}.matterIdEnd}
+            </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')">
+                ${_conditionType_} a.matterCode in
+                <foreach collection="conditionParamRef.matterCodeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('matterName')">
+                <if test="conditionParamRef.matterName != null and conditionParamRef.matterName != ''">
+                    ${_conditionType_} a.matterName like #{${_conditionParam_}.matterName}
+                </if>
+                <if test="conditionParamRef.matterName == null">
+                    ${_conditionType_} a.matterName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('matterNameList')">
+                ${_conditionType_} a.matterName in
+                <foreach collection="conditionParamRef.matterNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('title')">
+                <if test="conditionParamRef.title != null and conditionParamRef.title != ''">
+                    ${_conditionType_} a.title like #{${_conditionParam_}.title}
+                </if>
+                <if test="conditionParamRef.title == null">
+                    ${_conditionType_} a.title is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('titleList')">
+                ${_conditionType_} a.title in
+                <foreach collection="conditionParamRef.titleList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('intermediaryRequest')">
+                <if test="conditionParamRef.intermediaryRequest != null and conditionParamRef.intermediaryRequest != ''">
+                    ${_conditionType_} a.intermediaryRequest like #{${_conditionParam_}.intermediaryRequest}
+                </if>
+                <if test="conditionParamRef.intermediaryRequest == null">
+                    ${_conditionType_} a.intermediaryRequest is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('intermediaryRequestList')">
+                ${_conditionType_} a.intermediaryRequest in
+                <foreach collection="conditionParamRef.intermediaryRequestList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('intermediaryRequestTime')">
+                <if test="conditionParamRef.intermediaryRequestTime != null and conditionParamRef.intermediaryRequestTime != ''">
+                    ${_conditionType_} a.intermediaryRequestTime like #{${_conditionParam_}.intermediaryRequestTime}
+                </if>
+                <if test="conditionParamRef.intermediaryRequestTime == null">
+                    ${_conditionType_} a.intermediaryRequestTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('intermediaryRequestTimeList')">
+                ${_conditionType_} a.intermediaryRequestTime in
+                <foreach collection="conditionParamRef.intermediaryRequestTimeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </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')">
+                ${_conditionType_} a.remark in
+                <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('source')">
+                <if test="conditionParamRef.source != null ">
+                    ${_conditionType_} a.source = #{${_conditionParam_}.source}
+                </if>
+                <if test="conditionParamRef.source == null">
+                    ${_conditionType_} a.source is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('sourceList')">
+                ${_conditionType_} a.source in
+                <foreach collection="conditionParamRef.sourceList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('sourceStart') and conditionParamRef.sourceStart != null">
+                ${_conditionType_} a.source <![CDATA[ >= ]]> #{${_conditionParam_}.sourceStart}
+            </if>
+            <if test="conditionParamRef.containsKey('sourceEnd') and conditionParamRef.sourceEnd != null">
+                ${_conditionType_} a.source <![CDATA[ <= ]]> #{${_conditionParam_}.sourceEnd}
+            </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')">
+                ${_conditionType_} a.createUserId in
+                <foreach collection="conditionParamRef.createUserIdList" 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('matterId')">
+                        a.matterId
+                        <if test='orderCol.matterId != null and "DESC".equalsIgnoreCase(orderCol.matterId)'>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('matterName')">
+                        a.matterName
+                        <if test='orderCol.matterName != null and "DESC".equalsIgnoreCase(orderCol.matterName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('title')">
+                        a.title
+                        <if test='orderCol.title != null and "DESC".equalsIgnoreCase(orderCol.title)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('intermediaryRequest')">
+                        a.intermediaryRequest
+                        <if test='orderCol.intermediaryRequest != null and "DESC".equalsIgnoreCase(orderCol.intermediaryRequest)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('intermediaryRequestTime')">
+                        a.intermediaryRequestTime
+                        <if test='orderCol.intermediaryRequestTime != null and "DESC".equalsIgnoreCase(orderCol.intermediaryRequestTime)'>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('source')">
+                        a.source
+                        <if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>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

single-matter/src/main/resources/sqlmap/module/matter/MatterQuestionMapper.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.matter.dao.ibatis.MatterQuestionDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="MatterQuestionEntity" id="MatterQuestionEntity-Map">
+            <id  property="id" column="id" />
+            <result property="matterId" column="matterId" />
+            <result property="matterCode" column="matterCode" />
+            <result property="matterName" column="matterName" />
+            <result property="question" column="question" />
+            <result property="answer" column="answer" />
+            <result property="source" column="source" />
+            <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('matterId') or colPickMode == 1 and data.containsKey('matterId')))">
+                    a.matterId,
+                </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('matterName') or colPickMode == 1 and data.containsKey('matterName')))">
+                    a.matterName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('question') or colPickMode == 1 and data.containsKey('question')))">
+                    a.question,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('answer') or colPickMode == 1 and data.containsKey('answer')))">
+                    a.answer,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('source') or colPickMode == 1 and data.containsKey('source')))">
+                    a.source,
+                </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="MatterQuestionEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_sys_matter_question
+        (matterId,matterCode,matterName,question,answer,source,createTime,createUserId,updateTime)
+        VALUES
+        (#{matterId},#{matterCode},#{matterName},#{question},#{answer},#{source},#{createTime},#{createUserId},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_sys_matter_question
+        (matterId,matterCode,matterName,question,answer,source,createTime,createUserId,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.matterId},#{item.matterCode},#{item.matterName},#{item.question},#{item.answer},#{item.source},#{item.createTime},#{item.createUserId},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_sys_matter_question as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('matterId')) or (colPickMode==1 and !data.containsKey('matterId'))">
+                a.matterId=#{data.matterId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('matterIdIncrement')) or (colPickMode==1 and !data.containsKey('matterIdIncrement'))">
+                a.matterId=ifnull(a.matterId,0) + #{data.matterIdIncrement},
+            </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('matterName')) or (colPickMode==1 and !data.containsKey('matterName'))">
+                a.matterName=#{data.matterName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('question')) or (colPickMode==1 and !data.containsKey('question'))">
+                a.question=#{data.question},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('answer')) or (colPickMode==1 and !data.containsKey('answer'))">
+                a.answer=#{data.answer},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('source')) or (colPickMode==1 and !data.containsKey('source'))">
+                a.source=#{data.source},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('sourceIncrement')) or (colPickMode==1 and !data.containsKey('sourceIncrement'))">
+                a.source=ifnull(a.source,0) + #{data.sourceIncrement},
+            </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_matter_question as a
+        <trim prefix="set" suffixOverrides=",">
+                        <trim prefix="matterId=(case" suffix="ELSE matterId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('matterId')) or (colPickMode==1 and !item.containsKey('matterId'))">
+                                        when a.id=#{item.id} then #{item.matterId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('matterIdIncrement')) or (colPickMode==1 and !item.containsKey('matterIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.matterId,0) + #{item.matterIdIncrement}
+                                    </when>
+                                </choose>
+                            </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="matterName=(case" suffix="ELSE matterName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('matterName')) or (colPickMode==1 and !item.containsKey('matterName'))">
+                            when a.id=#{item.id} then #{item.matterName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="question=(case" suffix="ELSE question end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('question')) or (colPickMode==1 and !item.containsKey('question'))">
+                            when a.id=#{item.id} then #{item.question}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="answer=(case" suffix="ELSE answer end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('answer')) or (colPickMode==1 and !item.containsKey('answer'))">
+                            when a.id=#{item.id} then #{item.answer}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="source=(case" suffix="ELSE source end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('source')) or (colPickMode==1 and !item.containsKey('source'))">
+                                        when a.id=#{item.id} then #{item.source}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('sourceIncrement')) or (colPickMode==1 and !item.containsKey('sourceIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.source,0) + #{item.sourceIncrement}
+                                    </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=")">
+            #{item.id}
+        </foreach>
+    </update>
+    <!-- 根据主健查询 -->
+    <select id="getByKey" parameterType="paramDto" resultMap="MatterQuestionEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_matter_question as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_sys_matter_question as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_sys_matter_question where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_sys_matter_question as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="MatterQuestionEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_matter_question 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_matter_question 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')">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" 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('matterId')">
+                <if test="conditionParamRef.matterId != null ">
+                    ${_conditionType_} a.matterId = #{${_conditionParam_}.matterId}
+                </if>
+                <if test="conditionParamRef.matterId == null">
+                    ${_conditionType_} a.matterId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('matterIdList')">
+                ${_conditionType_} a.matterId in
+                <foreach collection="conditionParamRef.matterIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('matterIdStart') and conditionParamRef.matterIdStart != null">
+                ${_conditionType_} a.matterId <![CDATA[ >= ]]> #{${_conditionParam_}.matterIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('matterIdEnd') and conditionParamRef.matterIdEnd != null">
+                ${_conditionType_} a.matterId <![CDATA[ <= ]]> #{${_conditionParam_}.matterIdEnd}
+            </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')">
+                ${_conditionType_} a.matterCode in
+                <foreach collection="conditionParamRef.matterCodeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('matterName')">
+                <if test="conditionParamRef.matterName != null and conditionParamRef.matterName != ''">
+                    ${_conditionType_} a.matterName like #{${_conditionParam_}.matterName}
+                </if>
+                <if test="conditionParamRef.matterName == null">
+                    ${_conditionType_} a.matterName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('matterNameList')">
+                ${_conditionType_} a.matterName in
+                <foreach collection="conditionParamRef.matterNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('question')">
+                <if test="conditionParamRef.question != null and conditionParamRef.question != ''">
+                    ${_conditionType_} a.question like #{${_conditionParam_}.question}
+                </if>
+                <if test="conditionParamRef.question == null">
+                    ${_conditionType_} a.question is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('questionList')">
+                ${_conditionType_} a.question in
+                <foreach collection="conditionParamRef.questionList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('answer')">
+                <if test="conditionParamRef.answer != null and conditionParamRef.answer != ''">
+                    ${_conditionType_} a.answer like #{${_conditionParam_}.answer}
+                </if>
+                <if test="conditionParamRef.answer == null">
+                    ${_conditionType_} a.answer is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('answerList')">
+                ${_conditionType_} a.answer in
+                <foreach collection="conditionParamRef.answerList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('source')">
+                <if test="conditionParamRef.source != null ">
+                    ${_conditionType_} a.source = #{${_conditionParam_}.source}
+                </if>
+                <if test="conditionParamRef.source == null">
+                    ${_conditionType_} a.source is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('sourceList')">
+                ${_conditionType_} a.source in
+                <foreach collection="conditionParamRef.sourceList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('sourceStart') and conditionParamRef.sourceStart != null">
+                ${_conditionType_} a.source <![CDATA[ >= ]]> #{${_conditionParam_}.sourceStart}
+            </if>
+            <if test="conditionParamRef.containsKey('sourceEnd') and conditionParamRef.sourceEnd != null">
+                ${_conditionType_} a.source <![CDATA[ <= ]]> #{${_conditionParam_}.sourceEnd}
+            </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')">
+                ${_conditionType_} a.createUserId in
+                <foreach collection="conditionParamRef.createUserIdList" 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('matterId')">
+                        a.matterId
+                        <if test='orderCol.matterId != null and "DESC".equalsIgnoreCase(orderCol.matterId)'>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('matterName')">
+                        a.matterName
+                        <if test='orderCol.matterName != null and "DESC".equalsIgnoreCase(orderCol.matterName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('question')">
+                        a.question
+                        <if test='orderCol.question != null and "DESC".equalsIgnoreCase(orderCol.question)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('answer')">
+                        a.answer
+                        <if test='orderCol.answer != null and "DESC".equalsIgnoreCase(orderCol.answer)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('source')">
+                        a.source
+                        <if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>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

single-matter/src/main/resources/sqlmap/module/matter/MatterSetbaseMapper.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.matter.dao.ibatis.MatterSetbaseDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="MatterSetbaseEntity" id="MatterSetbaseEntity-Map">
+            <id  property="id" column="id" />
+            <result property="matterId" column="matterId" />
+            <result property="matterCode" column="matterCode" />
+            <result property="matterName" column="matterName" />
+            <result property="policyName" column="policyName" />
+            <result property="policyType" column="policyType" />
+            <result property="policyitem" column="policyitem" />
+            <result property="content" column="content" />
+            <result property="source" column="source" />
+            <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('matterId') or colPickMode == 1 and data.containsKey('matterId')))">
+                    a.matterId,
+                </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('matterName') or colPickMode == 1 and data.containsKey('matterName')))">
+                    a.matterName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('policyName') or colPickMode == 1 and data.containsKey('policyName')))">
+                    a.policyName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('policyType') or colPickMode == 1 and data.containsKey('policyType')))">
+                    a.policyType,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('policyitem') or colPickMode == 1 and data.containsKey('policyitem')))">
+                    a.policyitem,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('content') or colPickMode == 1 and data.containsKey('content')))">
+                    a.content,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('source') or colPickMode == 1 and data.containsKey('source')))">
+                    a.source,
+                </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="MatterSetbaseEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_sys_matter_setbase
+        (matterId,matterCode,matterName,policyName,policyType,policyitem,content,source,createTime,createUserId,updateTime)
+        VALUES
+        (#{matterId},#{matterCode},#{matterName},#{policyName},#{policyType},#{policyitem},#{content},#{source},#{createTime},#{createUserId},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_sys_matter_setbase
+        (matterId,matterCode,matterName,policyName,policyType,policyitem,content,source,createTime,createUserId,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.matterId},#{item.matterCode},#{item.matterName},#{item.policyName},#{item.policyType},#{item.policyitem},#{item.content},#{item.source},#{item.createTime},#{item.createUserId},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_sys_matter_setbase as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('matterId')) or (colPickMode==1 and !data.containsKey('matterId'))">
+                a.matterId=#{data.matterId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('matterIdIncrement')) or (colPickMode==1 and !data.containsKey('matterIdIncrement'))">
+                a.matterId=ifnull(a.matterId,0) + #{data.matterIdIncrement},
+            </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('matterName')) or (colPickMode==1 and !data.containsKey('matterName'))">
+                a.matterName=#{data.matterName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('policyName')) or (colPickMode==1 and !data.containsKey('policyName'))">
+                a.policyName=#{data.policyName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('policyType')) or (colPickMode==1 and !data.containsKey('policyType'))">
+                a.policyType=#{data.policyType},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('policyitem')) or (colPickMode==1 and !data.containsKey('policyitem'))">
+                a.policyitem=#{data.policyitem},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('content')) or (colPickMode==1 and !data.containsKey('content'))">
+                a.content=#{data.content},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('source')) or (colPickMode==1 and !data.containsKey('source'))">
+                a.source=#{data.source},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('sourceIncrement')) or (colPickMode==1 and !data.containsKey('sourceIncrement'))">
+                a.source=ifnull(a.source,0) + #{data.sourceIncrement},
+            </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_matter_setbase as a
+        <trim prefix="set" suffixOverrides=",">
+                        <trim prefix="matterId=(case" suffix="ELSE matterId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('matterId')) or (colPickMode==1 and !item.containsKey('matterId'))">
+                                        when a.id=#{item.id} then #{item.matterId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('matterIdIncrement')) or (colPickMode==1 and !item.containsKey('matterIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.matterId,0) + #{item.matterIdIncrement}
+                                    </when>
+                                </choose>
+                            </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="matterName=(case" suffix="ELSE matterName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('matterName')) or (colPickMode==1 and !item.containsKey('matterName'))">
+                            when a.id=#{item.id} then #{item.matterName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="policyName=(case" suffix="ELSE policyName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('policyName')) or (colPickMode==1 and !item.containsKey('policyName'))">
+                            when a.id=#{item.id} then #{item.policyName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="policyType=(case" suffix="ELSE policyType end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('policyType')) or (colPickMode==1 and !item.containsKey('policyType'))">
+                            when a.id=#{item.id} then #{item.policyType}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="policyitem=(case" suffix="ELSE policyitem end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('policyitem')) or (colPickMode==1 and !item.containsKey('policyitem'))">
+                            when a.id=#{item.id} then #{item.policyitem}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="content=(case" suffix="ELSE content end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('content')) or (colPickMode==1 and !item.containsKey('content'))">
+                            when a.id=#{item.id} then #{item.content}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="source=(case" suffix="ELSE source end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('source')) or (colPickMode==1 and !item.containsKey('source'))">
+                                        when a.id=#{item.id} then #{item.source}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('sourceIncrement')) or (colPickMode==1 and !item.containsKey('sourceIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.source,0) + #{item.sourceIncrement}
+                                    </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=")">
+            #{item.id}
+        </foreach>
+    </update>
+    <!-- 根据主健查询 -->
+    <select id="getByKey" parameterType="paramDto" resultMap="MatterSetbaseEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_matter_setbase as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_sys_matter_setbase as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_sys_matter_setbase where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_sys_matter_setbase as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="MatterSetbaseEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_sys_matter_setbase 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_matter_setbase 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')">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" 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('matterId')">
+                <if test="conditionParamRef.matterId != null ">
+                    ${_conditionType_} a.matterId = #{${_conditionParam_}.matterId}
+                </if>
+                <if test="conditionParamRef.matterId == null">
+                    ${_conditionType_} a.matterId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('matterIdList')">
+                ${_conditionType_} a.matterId in
+                <foreach collection="conditionParamRef.matterIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('matterIdStart') and conditionParamRef.matterIdStart != null">
+                ${_conditionType_} a.matterId <![CDATA[ >= ]]> #{${_conditionParam_}.matterIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('matterIdEnd') and conditionParamRef.matterIdEnd != null">
+                ${_conditionType_} a.matterId <![CDATA[ <= ]]> #{${_conditionParam_}.matterIdEnd}
+            </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')">
+                ${_conditionType_} a.matterCode in
+                <foreach collection="conditionParamRef.matterCodeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('matterName')">
+                <if test="conditionParamRef.matterName != null and conditionParamRef.matterName != ''">
+                    ${_conditionType_} a.matterName like #{${_conditionParam_}.matterName}
+                </if>
+                <if test="conditionParamRef.matterName == null">
+                    ${_conditionType_} a.matterName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('matterNameList')">
+                ${_conditionType_} a.matterName in
+                <foreach collection="conditionParamRef.matterNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('policyName')">
+                <if test="conditionParamRef.policyName != null and conditionParamRef.policyName != ''">
+                    ${_conditionType_} a.policyName like #{${_conditionParam_}.policyName}
+                </if>
+                <if test="conditionParamRef.policyName == null">
+                    ${_conditionType_} a.policyName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('policyNameList')">
+                ${_conditionType_} a.policyName in
+                <foreach collection="conditionParamRef.policyNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('policyType')">
+                <if test="conditionParamRef.policyType != null and conditionParamRef.policyType != ''">
+                    ${_conditionType_} a.policyType like #{${_conditionParam_}.policyType}
+                </if>
+                <if test="conditionParamRef.policyType == null">
+                    ${_conditionType_} a.policyType is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('policyTypeList')">
+                ${_conditionType_} a.policyType in
+                <foreach collection="conditionParamRef.policyTypeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('policyitem')">
+                <if test="conditionParamRef.policyitem != null and conditionParamRef.policyitem != ''">
+                    ${_conditionType_} a.policyitem like #{${_conditionParam_}.policyitem}
+                </if>
+                <if test="conditionParamRef.policyitem == null">
+                    ${_conditionType_} a.policyitem is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('policyitemList')">
+                ${_conditionType_} a.policyitem in
+                <foreach collection="conditionParamRef.policyitemList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('content')">
+                <if test="conditionParamRef.content != null and conditionParamRef.content != ''">
+                    ${_conditionType_} a.content like #{${_conditionParam_}.content}
+                </if>
+                <if test="conditionParamRef.content == null">
+                    ${_conditionType_} a.content is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('contentList')">
+                ${_conditionType_} a.content in
+                <foreach collection="conditionParamRef.contentList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('source')">
+                <if test="conditionParamRef.source != null ">
+                    ${_conditionType_} a.source = #{${_conditionParam_}.source}
+                </if>
+                <if test="conditionParamRef.source == null">
+                    ${_conditionType_} a.source is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('sourceList')">
+                ${_conditionType_} a.source in
+                <foreach collection="conditionParamRef.sourceList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('sourceStart') and conditionParamRef.sourceStart != null">
+                ${_conditionType_} a.source <![CDATA[ >= ]]> #{${_conditionParam_}.sourceStart}
+            </if>
+            <if test="conditionParamRef.containsKey('sourceEnd') and conditionParamRef.sourceEnd != null">
+                ${_conditionType_} a.source <![CDATA[ <= ]]> #{${_conditionParam_}.sourceEnd}
+            </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')">
+                ${_conditionType_} a.createUserId in
+                <foreach collection="conditionParamRef.createUserIdList" 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('matterId')">
+                        a.matterId
+                        <if test='orderCol.matterId != null and "DESC".equalsIgnoreCase(orderCol.matterId)'>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('matterName')">
+                        a.matterName
+                        <if test='orderCol.matterName != null and "DESC".equalsIgnoreCase(orderCol.matterName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('policyName')">
+                        a.policyName
+                        <if test='orderCol.policyName != null and "DESC".equalsIgnoreCase(orderCol.policyName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('policyType')">
+                        a.policyType
+                        <if test='orderCol.policyType != null and "DESC".equalsIgnoreCase(orderCol.policyType)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('policyitem')">
+                        a.policyitem
+                        <if test='orderCol.policyitem != null and "DESC".equalsIgnoreCase(orderCol.policyitem)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('content')">
+                        a.content
+                        <if test='orderCol.content != null and "DESC".equalsIgnoreCase(orderCol.content)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('source')">
+                        a.source
+                        <if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>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

single-matter/src/main/resources/sqlmap/module/matters/MattersAreaMapper.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.matters.dao.ibatis.MattersAreaDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="MattersAreaEntity" id="MattersAreaEntity-Map">
+            <id  property="id" column="id" />
+            <result property="areaCode" column="areaCode" />
+            <result property="name" column="name" />
+            <result property="areaLevel" column="areaLevel" />
+            <result property="haveSonArea" column="haveSonArea" />
+            <result property="haveSonDept" column="haveSonDept" />
+            <result property="shortName" column="shortName" />
+            <result property="domain" column="domain" />
+            <result property="iid" column="iid" />
+            <result property="pid" column="pid" />
+            <result property="haveGetDept" column="haveGetDept" />
+            <result property="haveGetMatterList" column="haveGetMatterList" />
+            <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('areaCode') or colPickMode == 1 and data.containsKey('areaCode')))">
+                    a.areaCode,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))">
+                    a.name,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('areaLevel') or colPickMode == 1 and data.containsKey('areaLevel')))">
+                    a.areaLevel,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('haveSonArea') or colPickMode == 1 and data.containsKey('haveSonArea')))">
+                    a.haveSonArea,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('haveSonDept') or colPickMode == 1 and data.containsKey('haveSonDept')))">
+                    a.haveSonDept,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('shortName') or colPickMode == 1 and data.containsKey('shortName')))">
+                    a.shortName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('domain') or colPickMode == 1 and data.containsKey('domain')))">
+                    a.domain,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('iid') or colPickMode == 1 and data.containsKey('iid')))">
+                    a.iid,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('pid') or colPickMode == 1 and data.containsKey('pid')))">
+                    a.pid,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('haveGetDept') or colPickMode == 1 and data.containsKey('haveGetDept')))">
+                    a.haveGetDept,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('haveGetMatterList') or colPickMode == 1 and data.containsKey('haveGetMatterList')))">
+                    a.haveGetMatterList,
+                </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="MattersAreaEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_iot_matters_area
+        (areaCode,name,areaLevel,haveSonArea,haveSonDept,shortName,domain,iid,pid,haveGetDept,haveGetMatterList,updateTime)
+        VALUES
+        (#{areaCode},#{name},#{areaLevel},#{haveSonArea},#{haveSonDept},#{shortName},#{domain},#{iid},#{pid},#{haveGetDept},#{haveGetMatterList},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_iot_matters_area
+        (areaCode,name,areaLevel,haveSonArea,haveSonDept,shortName,domain,iid,pid,haveGetDept,haveGetMatterList,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.areaCode},#{item.name},#{item.areaLevel},#{item.haveSonArea},#{item.haveSonDept},#{item.shortName},#{item.domain},#{item.iid},#{item.pid},#{item.haveGetDept},#{item.haveGetMatterList},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_iot_matters_area as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('areaCode')) or (colPickMode==1 and !data.containsKey('areaCode'))">
+                a.areaCode=#{data.areaCode},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('name')) or (colPickMode==1 and !data.containsKey('name'))">
+                a.name=#{data.name},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('areaLevel')) or (colPickMode==1 and !data.containsKey('areaLevel'))">
+                a.areaLevel=#{data.areaLevel},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('haveSonArea')) or (colPickMode==1 and !data.containsKey('haveSonArea'))">
+                a.haveSonArea=#{data.haveSonArea},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('haveSonDept')) or (colPickMode==1 and !data.containsKey('haveSonDept'))">
+                a.haveSonDept=#{data.haveSonDept},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('shortName')) or (colPickMode==1 and !data.containsKey('shortName'))">
+                a.shortName=#{data.shortName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('domain')) or (colPickMode==1 and !data.containsKey('domain'))">
+                a.domain=#{data.domain},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('iid')) or (colPickMode==1 and !data.containsKey('iid'))">
+                a.iid=#{data.iid},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('pid')) or (colPickMode==1 and !data.containsKey('pid'))">
+                a.pid=#{data.pid},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('haveGetDept')) or (colPickMode==1 and !data.containsKey('haveGetDept'))">
+                a.haveGetDept=#{data.haveGetDept},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('haveGetMatterList')) or (colPickMode==1 and !data.containsKey('haveGetMatterList'))">
+                a.haveGetMatterList=#{data.haveGetMatterList},
+            </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_iot_matters_area as a
+        <trim prefix="set" suffixOverrides=",">
+                <trim prefix="areaCode=(case" suffix="ELSE areaCode end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('areaCode')) or (colPickMode==1 and !item.containsKey('areaCode'))">
+                            when a.id=#{item.id} then #{item.areaCode}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="name=(case" suffix="ELSE name end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('name')) or (colPickMode==1 and !item.containsKey('name'))">
+                            when a.id=#{item.id} then #{item.name}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="areaLevel=(case" suffix="ELSE areaLevel end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('areaLevel')) or (colPickMode==1 and !item.containsKey('areaLevel'))">
+                            when a.id=#{item.id} then #{item.areaLevel}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="haveSonArea=(case" suffix="ELSE haveSonArea end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('haveSonArea')) or (colPickMode==1 and !item.containsKey('haveSonArea'))">
+                            when a.id=#{item.id} then #{item.haveSonArea}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="haveSonDept=(case" suffix="ELSE haveSonDept end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('haveSonDept')) or (colPickMode==1 and !item.containsKey('haveSonDept'))">
+                            when a.id=#{item.id} then #{item.haveSonDept}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="shortName=(case" suffix="ELSE shortName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('shortName')) or (colPickMode==1 and !item.containsKey('shortName'))">
+                            when a.id=#{item.id} then #{item.shortName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="domain=(case" suffix="ELSE domain end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('domain')) or (colPickMode==1 and !item.containsKey('domain'))">
+                            when a.id=#{item.id} then #{item.domain}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="iid=(case" suffix="ELSE iid end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('iid')) or (colPickMode==1 and !item.containsKey('iid'))">
+                            when a.id=#{item.id} then #{item.iid}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="pid=(case" suffix="ELSE pid end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('pid')) or (colPickMode==1 and !item.containsKey('pid'))">
+                            when a.id=#{item.id} then #{item.pid}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="haveGetDept=(case" suffix="ELSE haveGetDept end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('haveGetDept')) or (colPickMode==1 and !item.containsKey('haveGetDept'))">
+                            when a.id=#{item.id} then #{item.haveGetDept}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="haveGetMatterList=(case" suffix="ELSE haveGetMatterList end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('haveGetMatterList')) or (colPickMode==1 and !item.containsKey('haveGetMatterList'))">
+                            when a.id=#{item.id} then #{item.haveGetMatterList}
+                        </if>
+                    </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="MattersAreaEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_iot_matters_area as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_iot_matters_area as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_iot_matters_area where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_iot_matters_area as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="MattersAreaEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_iot_matters_area 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_iot_matters_area 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')">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" 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('areaCode')">
+                <if test="conditionParamRef.areaCode != null and conditionParamRef.areaCode != ''">
+                    ${_conditionType_} a.areaCode like #{${_conditionParam_}.areaCode}
+                </if>
+                <if test="conditionParamRef.areaCode == null">
+                    ${_conditionType_} a.areaCode is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('areaCodeList')">
+                ${_conditionType_} a.areaCode in
+                <foreach collection="conditionParamRef.areaCodeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('name')">
+                <if test="conditionParamRef.name != null and conditionParamRef.name != ''">
+                    ${_conditionType_} a.name like #{${_conditionParam_}.name}
+                </if>
+                <if test="conditionParamRef.name == null">
+                    ${_conditionType_} a.name is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('nameList')">
+                ${_conditionType_} a.name in
+                <foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('areaLevel')">
+                <if test="conditionParamRef.areaLevel != null and conditionParamRef.areaLevel != ''">
+                    ${_conditionType_} a.areaLevel like #{${_conditionParam_}.areaLevel}
+                </if>
+                <if test="conditionParamRef.areaLevel == null">
+                    ${_conditionType_} a.areaLevel is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('areaLevelList')">
+                ${_conditionType_} a.areaLevel in
+                <foreach collection="conditionParamRef.areaLevelList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('haveSonArea')">
+                <if test="conditionParamRef.haveSonArea != null and conditionParamRef.haveSonArea != ''">
+                    ${_conditionType_} a.haveSonArea like #{${_conditionParam_}.haveSonArea}
+                </if>
+                <if test="conditionParamRef.haveSonArea == null">
+                    ${_conditionType_} a.haveSonArea is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('haveSonAreaList')">
+                ${_conditionType_} a.haveSonArea in
+                <foreach collection="conditionParamRef.haveSonAreaList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('haveSonDept')">
+                <if test="conditionParamRef.haveSonDept != null and conditionParamRef.haveSonDept != ''">
+                    ${_conditionType_} a.haveSonDept like #{${_conditionParam_}.haveSonDept}
+                </if>
+                <if test="conditionParamRef.haveSonDept == null">
+                    ${_conditionType_} a.haveSonDept is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('haveSonDeptList')">
+                ${_conditionType_} a.haveSonDept in
+                <foreach collection="conditionParamRef.haveSonDeptList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('shortName')">
+                <if test="conditionParamRef.shortName != null and conditionParamRef.shortName != ''">
+                    ${_conditionType_} a.shortName like #{${_conditionParam_}.shortName}
+                </if>
+                <if test="conditionParamRef.shortName == null">
+                    ${_conditionType_} a.shortName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('shortNameList')">
+                ${_conditionType_} a.shortName in
+                <foreach collection="conditionParamRef.shortNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('domain')">
+                <if test="conditionParamRef.domain != null and conditionParamRef.domain != ''">
+                    ${_conditionType_} a.domain like #{${_conditionParam_}.domain}
+                </if>
+                <if test="conditionParamRef.domain == null">
+                    ${_conditionType_} a.domain is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('domainList')">
+                ${_conditionType_} a.domain in
+                <foreach collection="conditionParamRef.domainList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('iid')">
+                <if test="conditionParamRef.iid != null and conditionParamRef.iid != ''">
+                    ${_conditionType_} a.iid like #{${_conditionParam_}.iid}
+                </if>
+                <if test="conditionParamRef.iid == null">
+                    ${_conditionType_} a.iid is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('iidList')">
+                ${_conditionType_} a.iid in
+                <foreach collection="conditionParamRef.iidList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('pid')">
+                <if test="conditionParamRef.pid != null and conditionParamRef.pid != ''">
+                    ${_conditionType_} a.pid like #{${_conditionParam_}.pid}
+                </if>
+                <if test="conditionParamRef.pid == null">
+                    ${_conditionType_} a.pid is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('pidList')">
+                ${_conditionType_} a.pid in
+                <foreach collection="conditionParamRef.pidList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('haveGetDept')">
+                <if test="conditionParamRef.haveGetDept != null and conditionParamRef.haveGetDept != ''">
+                    ${_conditionType_} a.haveGetDept like #{${_conditionParam_}.haveGetDept}
+                </if>
+                <if test="conditionParamRef.haveGetDept == null">
+                    ${_conditionType_} a.haveGetDept is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('haveGetDeptList')">
+                ${_conditionType_} a.haveGetDept in
+                <foreach collection="conditionParamRef.haveGetDeptList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('haveGetMatterList')">
+                <if test="conditionParamRef.haveGetMatterList != null and conditionParamRef.haveGetMatterList != ''">
+                    ${_conditionType_} a.haveGetMatterList like #{${_conditionParam_}.haveGetMatterList}
+                </if>
+                <if test="conditionParamRef.haveGetMatterList == null">
+                    ${_conditionType_} a.haveGetMatterList is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('haveGetMatterListList')">
+                ${_conditionType_} a.haveGetMatterList in
+                <foreach collection="conditionParamRef.haveGetMatterListList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </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('areaCode')">
+                        a.areaCode
+                        <if test='orderCol.areaCode != null and "DESC".equalsIgnoreCase(orderCol.areaCode)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('name')">
+                        a.name
+                        <if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('areaLevel')">
+                        a.areaLevel
+                        <if test='orderCol.areaLevel != null and "DESC".equalsIgnoreCase(orderCol.areaLevel)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('haveSonArea')">
+                        a.haveSonArea
+                        <if test='orderCol.haveSonArea != null and "DESC".equalsIgnoreCase(orderCol.haveSonArea)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('haveSonDept')">
+                        a.haveSonDept
+                        <if test='orderCol.haveSonDept != null and "DESC".equalsIgnoreCase(orderCol.haveSonDept)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('shortName')">
+                        a.shortName
+                        <if test='orderCol.shortName != null and "DESC".equalsIgnoreCase(orderCol.shortName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('domain')">
+                        a.domain
+                        <if test='orderCol.domain != null and "DESC".equalsIgnoreCase(orderCol.domain)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('iid')">
+                        a.iid
+                        <if test='orderCol.iid != null and "DESC".equalsIgnoreCase(orderCol.iid)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('pid')">
+                        a.pid
+                        <if test='orderCol.pid != null and "DESC".equalsIgnoreCase(orderCol.pid)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('haveGetDept')">
+                        a.haveGetDept
+                        <if test='orderCol.haveGetDept != null and "DESC".equalsIgnoreCase(orderCol.haveGetDept)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('haveGetMatterList')">
+                        a.haveGetMatterList
+                        <if test='orderCol.haveGetMatterList != null and "DESC".equalsIgnoreCase(orderCol.haveGetMatterList)'>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

single-matter/src/main/resources/sqlmap/module/matters/MattersDeptMapper.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.matters.dao.ibatis.MattersDeptDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="MattersDeptEntity" id="MattersDeptEntity-Map">
+            <id  property="id" column="id" />
+            <result property="areaCode" column="areaCode" />
+            <result property="deptCode" column="deptCode" />
+            <result property="name" column="name" />
+            <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('areaCode') or colPickMode == 1 and data.containsKey('areaCode')))">
+                    a.areaCode,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptCode') or colPickMode == 1 and data.containsKey('deptCode')))">
+                    a.deptCode,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))">
+                    a.name,
+                </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="MattersDeptEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_iot_matters_dept
+        (areaCode,deptCode,name,updateTime)
+        VALUES
+        (#{areaCode},#{deptCode},#{name},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_iot_matters_dept
+        (areaCode,deptCode,name,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.areaCode},#{item.deptCode},#{item.name},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_iot_matters_dept as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('areaCode')) or (colPickMode==1 and !data.containsKey('areaCode'))">
+                a.areaCode=#{data.areaCode},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('deptCode')) or (colPickMode==1 and !data.containsKey('deptCode'))">
+                a.deptCode=#{data.deptCode},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('name')) or (colPickMode==1 and !data.containsKey('name'))">
+                a.name=#{data.name},
+            </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_iot_matters_dept as a
+        <trim prefix="set" suffixOverrides=",">
+                <trim prefix="areaCode=(case" suffix="ELSE areaCode end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('areaCode')) or (colPickMode==1 and !item.containsKey('areaCode'))">
+                            when a.id=#{item.id} then #{item.areaCode}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="deptCode=(case" suffix="ELSE deptCode end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('deptCode')) or (colPickMode==1 and !item.containsKey('deptCode'))">
+                            when a.id=#{item.id} then #{item.deptCode}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="name=(case" suffix="ELSE name end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('name')) or (colPickMode==1 and !item.containsKey('name'))">
+                            when a.id=#{item.id} then #{item.name}
+                        </if>
+                    </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="MattersDeptEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_iot_matters_dept as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_iot_matters_dept as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_iot_matters_dept where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_iot_matters_dept as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="MattersDeptEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_iot_matters_dept 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_iot_matters_dept 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')">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" 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('areaCode')">
+                <if test="conditionParamRef.areaCode != null and conditionParamRef.areaCode != ''">
+                    ${_conditionType_} a.areaCode like #{${_conditionParam_}.areaCode}
+                </if>
+                <if test="conditionParamRef.areaCode == null">
+                    ${_conditionType_} a.areaCode is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('areaCodeList')">
+                ${_conditionType_} a.areaCode in
+                <foreach collection="conditionParamRef.areaCodeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('deptCode')">
+                <if test="conditionParamRef.deptCode != null and conditionParamRef.deptCode != ''">
+                    ${_conditionType_} a.deptCode like #{${_conditionParam_}.deptCode}
+                </if>
+                <if test="conditionParamRef.deptCode == null">
+                    ${_conditionType_} a.deptCode is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('deptCodeList')">
+                ${_conditionType_} a.deptCode in
+                <foreach collection="conditionParamRef.deptCodeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('name')">
+                <if test="conditionParamRef.name != null and conditionParamRef.name != ''">
+                    ${_conditionType_} a.name like #{${_conditionParam_}.name}
+                </if>
+                <if test="conditionParamRef.name == null">
+                    ${_conditionType_} a.name is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('nameList')">
+                ${_conditionType_} a.name in
+                <foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </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('areaCode')">
+                        a.areaCode
+                        <if test='orderCol.areaCode != null and "DESC".equalsIgnoreCase(orderCol.areaCode)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('deptCode')">
+                        a.deptCode
+                        <if test='orderCol.deptCode != null and "DESC".equalsIgnoreCase(orderCol.deptCode)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('name')">
+                        a.name
+                        <if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>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

single-matter/src/main/resources/sqlmap/module/matters/MattersDetailMapper.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.matters.dao.ibatis.MattersDetailDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="MattersDetailEntity" id="MattersDetailEntity-Map">
+            <id  property="id" column="id" />
+            <result property="matterCode" column="matterCode" />
+            <result property="onlineurlZxsq" column="onlineUrl_zxsq" />
+            <result property="basicinfoJbxx" column="basicInfo_jbxx" />
+            <result property="materialsSqcl" column="materials_sqcl" />
+            <result property="conditionsSltj" column="conditions_sltj" />
+            <result property="processBllc" column="process_bllc" />
+            <result property="chargingSfbz" column="charging_sfbz" />
+            <result property="basisSdyj" column="basis_sdyj" />
+            <result property="intermediaryZjfw" column="intermediary_zjfw" />
+            <result property="questionCjwt" column="question_cjwt" />
+            <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('matterCode') or colPickMode == 1 and data.containsKey('matterCode')))">
+                    a.matterCode,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('onlineurlZxsq') or colPickMode == 1 and data.containsKey('onlineurlZxsq')))">
+                    a.onlineUrl_zxsq,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('basicinfoJbxx') or colPickMode == 1 and data.containsKey('basicinfoJbxx')))">
+                    a.basicInfo_jbxx,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('materialsSqcl') or colPickMode == 1 and data.containsKey('materialsSqcl')))">
+                    a.materials_sqcl,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('conditionsSltj') or colPickMode == 1 and data.containsKey('conditionsSltj')))">
+                    a.conditions_sltj,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('processBllc') or colPickMode == 1 and data.containsKey('processBllc')))">
+                    a.process_bllc,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('chargingSfbz') or colPickMode == 1 and data.containsKey('chargingSfbz')))">
+                    a.charging_sfbz,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('basisSdyj') or colPickMode == 1 and data.containsKey('basisSdyj')))">
+                    a.basis_sdyj,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('intermediaryZjfw') or colPickMode == 1 and data.containsKey('intermediaryZjfw')))">
+                    a.intermediary_zjfw,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('questionCjwt') or colPickMode == 1 and data.containsKey('questionCjwt')))">
+                    a.question_cjwt,
+                </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="MattersDetailEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_iot_matters_detail
+        (matterCode,onlineUrl_zxsq,basicInfo_jbxx,materials_sqcl,conditions_sltj,process_bllc,charging_sfbz,basis_sdyj,intermediary_zjfw,question_cjwt,updateTime)
+        VALUES
+        (#{matterCode},#{onlineurlZxsq},#{basicinfoJbxx},#{materialsSqcl},#{conditionsSltj},#{processBllc},#{chargingSfbz},#{basisSdyj},#{intermediaryZjfw},#{questionCjwt},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_iot_matters_detail
+        (matterCode,onlineUrl_zxsq,basicInfo_jbxx,materials_sqcl,conditions_sltj,process_bllc,charging_sfbz,basis_sdyj,intermediary_zjfw,question_cjwt,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.matterCode},#{item.onlineurlZxsq},#{item.basicinfoJbxx},#{item.materialsSqcl},#{item.conditionsSltj},#{item.processBllc},#{item.chargingSfbz},#{item.basisSdyj},#{item.intermediaryZjfw},#{item.questionCjwt},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_iot_matters_detail as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <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('onlineurlZxsq')) or (colPickMode==1 and !data.containsKey('onlineurlZxsq'))">
+                a.onlineUrl_zxsq=#{data.onlineurlZxsq},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('basicinfoJbxx')) or (colPickMode==1 and !data.containsKey('basicinfoJbxx'))">
+                a.basicInfo_jbxx=#{data.basicinfoJbxx},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('materialsSqcl')) or (colPickMode==1 and !data.containsKey('materialsSqcl'))">
+                a.materials_sqcl=#{data.materialsSqcl},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('conditionsSltj')) or (colPickMode==1 and !data.containsKey('conditionsSltj'))">
+                a.conditions_sltj=#{data.conditionsSltj},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('processBllc')) or (colPickMode==1 and !data.containsKey('processBllc'))">
+                a.process_bllc=#{data.processBllc},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('chargingSfbz')) or (colPickMode==1 and !data.containsKey('chargingSfbz'))">
+                a.charging_sfbz=#{data.chargingSfbz},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('basisSdyj')) or (colPickMode==1 and !data.containsKey('basisSdyj'))">
+                a.basis_sdyj=#{data.basisSdyj},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('intermediaryZjfw')) or (colPickMode==1 and !data.containsKey('intermediaryZjfw'))">
+                a.intermediary_zjfw=#{data.intermediaryZjfw},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('questionCjwt')) or (colPickMode==1 and !data.containsKey('questionCjwt'))">
+                a.question_cjwt=#{data.questionCjwt},
+            </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_iot_matters_detail as a
+        <trim prefix="set" suffixOverrides=",">
+                <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="onlineUrl_zxsq=(case" suffix="ELSE onlineUrl_zxsq end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('onlineurlZxsq')) or (colPickMode==1 and !item.containsKey('onlineurlZxsq'))">
+                            when a.id=#{item.id} then #{item.onlineurlZxsq}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="basicInfo_jbxx=(case" suffix="ELSE basicInfo_jbxx end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('basicinfoJbxx')) or (colPickMode==1 and !item.containsKey('basicinfoJbxx'))">
+                            when a.id=#{item.id} then #{item.basicinfoJbxx}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="materials_sqcl=(case" suffix="ELSE materials_sqcl end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('materialsSqcl')) or (colPickMode==1 and !item.containsKey('materialsSqcl'))">
+                            when a.id=#{item.id} then #{item.materialsSqcl}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="conditions_sltj=(case" suffix="ELSE conditions_sltj end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('conditionsSltj')) or (colPickMode==1 and !item.containsKey('conditionsSltj'))">
+                            when a.id=#{item.id} then #{item.conditionsSltj}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="process_bllc=(case" suffix="ELSE process_bllc end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('processBllc')) or (colPickMode==1 and !item.containsKey('processBllc'))">
+                            when a.id=#{item.id} then #{item.processBllc}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="charging_sfbz=(case" suffix="ELSE charging_sfbz end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('chargingSfbz')) or (colPickMode==1 and !item.containsKey('chargingSfbz'))">
+                            when a.id=#{item.id} then #{item.chargingSfbz}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="basis_sdyj=(case" suffix="ELSE basis_sdyj end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('basisSdyj')) or (colPickMode==1 and !item.containsKey('basisSdyj'))">
+                            when a.id=#{item.id} then #{item.basisSdyj}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="intermediary_zjfw=(case" suffix="ELSE intermediary_zjfw end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('intermediaryZjfw')) or (colPickMode==1 and !item.containsKey('intermediaryZjfw'))">
+                            when a.id=#{item.id} then #{item.intermediaryZjfw}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="question_cjwt=(case" suffix="ELSE question_cjwt end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('questionCjwt')) or (colPickMode==1 and !item.containsKey('questionCjwt'))">
+                            when a.id=#{item.id} then #{item.questionCjwt}
+                        </if>
+                    </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="MattersDetailEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_iot_matters_detail as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_iot_matters_detail as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_iot_matters_detail where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_iot_matters_detail as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="MattersDetailEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_iot_matters_detail 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_iot_matters_detail 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')">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" 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('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')">
+                ${_conditionType_} a.matterCode in
+                <foreach collection="conditionParamRef.matterCodeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('onlineurlZxsq')">
+                <if test="conditionParamRef.onlineurlZxsq != null and conditionParamRef.onlineurlZxsq != ''">
+                    ${_conditionType_} a.onlineUrl_zxsq like #{${_conditionParam_}.onlineurlZxsq}
+                </if>
+                <if test="conditionParamRef.onlineurlZxsq == null">
+                    ${_conditionType_} a.onlineUrl_zxsq is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('onlineurlZxsqList')">
+                ${_conditionType_} a.onlineUrl_zxsq in
+                <foreach collection="conditionParamRef.onlineurlZxsqList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('basicinfoJbxx')">
+                <if test="conditionParamRef.basicinfoJbxx != null and conditionParamRef.basicinfoJbxx != ''">
+                    ${_conditionType_} a.basicInfo_jbxx like #{${_conditionParam_}.basicinfoJbxx}
+                </if>
+                <if test="conditionParamRef.basicinfoJbxx == null">
+                    ${_conditionType_} a.basicInfo_jbxx is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('basicinfoJbxxList')">
+                ${_conditionType_} a.basicInfo_jbxx in
+                <foreach collection="conditionParamRef.basicinfoJbxxList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('materialsSqcl')">
+                <if test="conditionParamRef.materialsSqcl != null and conditionParamRef.materialsSqcl != ''">
+                    ${_conditionType_} a.materials_sqcl like #{${_conditionParam_}.materialsSqcl}
+                </if>
+                <if test="conditionParamRef.materialsSqcl == null">
+                    ${_conditionType_} a.materials_sqcl is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('materialsSqclList')">
+                ${_conditionType_} a.materials_sqcl in
+                <foreach collection="conditionParamRef.materialsSqclList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('conditionsSltj')">
+                <if test="conditionParamRef.conditionsSltj != null and conditionParamRef.conditionsSltj != ''">
+                    ${_conditionType_} a.conditions_sltj like #{${_conditionParam_}.conditionsSltj}
+                </if>
+                <if test="conditionParamRef.conditionsSltj == null">
+                    ${_conditionType_} a.conditions_sltj is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('conditionsSltjList')">
+                ${_conditionType_} a.conditions_sltj in
+                <foreach collection="conditionParamRef.conditionsSltjList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('processBllc')">
+                <if test="conditionParamRef.processBllc != null and conditionParamRef.processBllc != ''">
+                    ${_conditionType_} a.process_bllc like #{${_conditionParam_}.processBllc}
+                </if>
+                <if test="conditionParamRef.processBllc == null">
+                    ${_conditionType_} a.process_bllc is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('processBllcList')">
+                ${_conditionType_} a.process_bllc in
+                <foreach collection="conditionParamRef.processBllcList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('chargingSfbz')">
+                <if test="conditionParamRef.chargingSfbz != null and conditionParamRef.chargingSfbz != ''">
+                    ${_conditionType_} a.charging_sfbz like #{${_conditionParam_}.chargingSfbz}
+                </if>
+                <if test="conditionParamRef.chargingSfbz == null">
+                    ${_conditionType_} a.charging_sfbz is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('chargingSfbzList')">
+                ${_conditionType_} a.charging_sfbz in
+                <foreach collection="conditionParamRef.chargingSfbzList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('basisSdyj')">
+                <if test="conditionParamRef.basisSdyj != null and conditionParamRef.basisSdyj != ''">
+                    ${_conditionType_} a.basis_sdyj like #{${_conditionParam_}.basisSdyj}
+                </if>
+                <if test="conditionParamRef.basisSdyj == null">
+                    ${_conditionType_} a.basis_sdyj is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('basisSdyjList')">
+                ${_conditionType_} a.basis_sdyj in
+                <foreach collection="conditionParamRef.basisSdyjList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('intermediaryZjfw')">
+                <if test="conditionParamRef.intermediaryZjfw != null and conditionParamRef.intermediaryZjfw != ''">
+                    ${_conditionType_} a.intermediary_zjfw like #{${_conditionParam_}.intermediaryZjfw}
+                </if>
+                <if test="conditionParamRef.intermediaryZjfw == null">
+                    ${_conditionType_} a.intermediary_zjfw is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('intermediaryZjfwList')">
+                ${_conditionType_} a.intermediary_zjfw in
+                <foreach collection="conditionParamRef.intermediaryZjfwList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('questionCjwt')">
+                <if test="conditionParamRef.questionCjwt != null and conditionParamRef.questionCjwt != ''">
+                    ${_conditionType_} a.question_cjwt like #{${_conditionParam_}.questionCjwt}
+                </if>
+                <if test="conditionParamRef.questionCjwt == null">
+                    ${_conditionType_} a.question_cjwt is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('questionCjwtList')">
+                ${_conditionType_} a.question_cjwt in
+                <foreach collection="conditionParamRef.questionCjwtList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </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('matterCode')">
+                        a.matterCode
+                        <if test='orderCol.matterCode != null and "DESC".equalsIgnoreCase(orderCol.matterCode)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('onlineurlZxsq')">
+                        a.onlineUrl_zxsq
+                        <if test='orderCol.onlineurlZxsq != null and "DESC".equalsIgnoreCase(orderCol.onlineurlZxsq)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('basicinfoJbxx')">
+                        a.basicInfo_jbxx
+                        <if test='orderCol.basicinfoJbxx != null and "DESC".equalsIgnoreCase(orderCol.basicinfoJbxx)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('materialsSqcl')">
+                        a.materials_sqcl
+                        <if test='orderCol.materialsSqcl != null and "DESC".equalsIgnoreCase(orderCol.materialsSqcl)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('conditionsSltj')">
+                        a.conditions_sltj
+                        <if test='orderCol.conditionsSltj != null and "DESC".equalsIgnoreCase(orderCol.conditionsSltj)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('processBllc')">
+                        a.process_bllc
+                        <if test='orderCol.processBllc != null and "DESC".equalsIgnoreCase(orderCol.processBllc)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('chargingSfbz')">
+                        a.charging_sfbz
+                        <if test='orderCol.chargingSfbz != null and "DESC".equalsIgnoreCase(orderCol.chargingSfbz)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('basisSdyj')">
+                        a.basis_sdyj
+                        <if test='orderCol.basisSdyj != null and "DESC".equalsIgnoreCase(orderCol.basisSdyj)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('intermediaryZjfw')">
+                        a.intermediary_zjfw
+                        <if test='orderCol.intermediaryZjfw != null and "DESC".equalsIgnoreCase(orderCol.intermediaryZjfw)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('questionCjwt')">
+                        a.question_cjwt
+                        <if test='orderCol.questionCjwt != null and "DESC".equalsIgnoreCase(orderCol.questionCjwt)'>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

single-matter/src/main/resources/sqlmap/module/matters/MattersMapper.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.matters.dao.ibatis.MattersDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="MattersEntity" id="MattersEntity-Map">
+            <id  property="id" column="id" />
+            <result property="areaCode" column="areaCode" />
+            <result property="deptCode" column="deptCode" />
+            <result property="powerCode" column="powerCode" />
+            <result property="themeCode" column="themeCode" />
+            <result property="usertypeCode" column="usertypeCode" />
+            <result property="matterCode" column="matterCode" />
+            <result property="name" column="name" />
+            <result property="groupName" column="groupName" />
+            <result property="url" column="url" />
+            <result property="haveGetMatterInfo" column="haveGetMatterInfo" />
+            <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('areaCode') or colPickMode == 1 and data.containsKey('areaCode')))">
+                    a.areaCode,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptCode') or colPickMode == 1 and data.containsKey('deptCode')))">
+                    a.deptCode,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('powerCode') or colPickMode == 1 and data.containsKey('powerCode')))">
+                    a.powerCode,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('themeCode') or colPickMode == 1 and data.containsKey('themeCode')))">
+                    a.themeCode,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('usertypeCode') or colPickMode == 1 and data.containsKey('usertypeCode')))">
+                    a.usertypeCode,
+                </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('name') or colPickMode == 1 and data.containsKey('name')))">
+                    a.name,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('groupName') or colPickMode == 1 and data.containsKey('groupName')))">
+                    a.groupName,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('url') or colPickMode == 1 and data.containsKey('url')))">
+                    a.url,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('haveGetMatterInfo') or colPickMode == 1 and data.containsKey('haveGetMatterInfo')))">
+                    a.haveGetMatterInfo,
+                </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="MattersEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_iot_matters
+        (areaCode,deptCode,powerCode,themeCode,usertypeCode,matterCode,name,groupName,url,haveGetMatterInfo,updateTime)
+        VALUES
+        (#{areaCode},#{deptCode},#{powerCode},#{themeCode},#{usertypeCode},#{matterCode},#{name},#{groupName},#{url},#{haveGetMatterInfo},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_iot_matters
+        (areaCode,deptCode,powerCode,themeCode,usertypeCode,matterCode,name,groupName,url,haveGetMatterInfo,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.areaCode},#{item.deptCode},#{item.powerCode},#{item.themeCode},#{item.usertypeCode},#{item.matterCode},#{item.name},#{item.groupName},#{item.url},#{item.haveGetMatterInfo},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_iot_matters as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('areaCode')) or (colPickMode==1 and !data.containsKey('areaCode'))">
+                a.areaCode=#{data.areaCode},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('deptCode')) or (colPickMode==1 and !data.containsKey('deptCode'))">
+                a.deptCode=#{data.deptCode},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('powerCode')) or (colPickMode==1 and !data.containsKey('powerCode'))">
+                a.powerCode=#{data.powerCode},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('themeCode')) or (colPickMode==1 and !data.containsKey('themeCode'))">
+                a.themeCode=#{data.themeCode},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('usertypeCode')) or (colPickMode==1 and !data.containsKey('usertypeCode'))">
+                a.usertypeCode=#{data.usertypeCode},
+            </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('name')) or (colPickMode==1 and !data.containsKey('name'))">
+                a.name=#{data.name},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('groupName')) or (colPickMode==1 and !data.containsKey('groupName'))">
+                a.groupName=#{data.groupName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('url')) or (colPickMode==1 and !data.containsKey('url'))">
+                a.url=#{data.url},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('haveGetMatterInfo')) or (colPickMode==1 and !data.containsKey('haveGetMatterInfo'))">
+                a.haveGetMatterInfo=#{data.haveGetMatterInfo},
+            </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_iot_matters as a
+        <trim prefix="set" suffixOverrides=",">
+                <trim prefix="areaCode=(case" suffix="ELSE areaCode end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('areaCode')) or (colPickMode==1 and !item.containsKey('areaCode'))">
+                            when a.id=#{item.id} then #{item.areaCode}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="deptCode=(case" suffix="ELSE deptCode end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('deptCode')) or (colPickMode==1 and !item.containsKey('deptCode'))">
+                            when a.id=#{item.id} then #{item.deptCode}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="powerCode=(case" suffix="ELSE powerCode end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('powerCode')) or (colPickMode==1 and !item.containsKey('powerCode'))">
+                            when a.id=#{item.id} then #{item.powerCode}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="themeCode=(case" suffix="ELSE themeCode end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('themeCode')) or (colPickMode==1 and !item.containsKey('themeCode'))">
+                            when a.id=#{item.id} then #{item.themeCode}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="usertypeCode=(case" suffix="ELSE usertypeCode end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('usertypeCode')) or (colPickMode==1 and !item.containsKey('usertypeCode'))">
+                            when a.id=#{item.id} then #{item.usertypeCode}
+                        </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="name=(case" suffix="ELSE name end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('name')) or (colPickMode==1 and !item.containsKey('name'))">
+                            when a.id=#{item.id} then #{item.name}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="groupName=(case" suffix="ELSE groupName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('groupName')) or (colPickMode==1 and !item.containsKey('groupName'))">
+                            when a.id=#{item.id} then #{item.groupName}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="url=(case" suffix="ELSE url end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('url')) or (colPickMode==1 and !item.containsKey('url'))">
+                            when a.id=#{item.id} then #{item.url}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="haveGetMatterInfo=(case" suffix="ELSE haveGetMatterInfo end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('haveGetMatterInfo')) or (colPickMode==1 and !item.containsKey('haveGetMatterInfo'))">
+                            when a.id=#{item.id} then #{item.haveGetMatterInfo}
+                        </if>
+                    </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="MattersEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_iot_matters as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_iot_matters as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_iot_matters where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_iot_matters as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="MattersEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_iot_matters 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_iot_matters 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')">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" 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('areaCode')">
+                <if test="conditionParamRef.areaCode != null and conditionParamRef.areaCode != ''">
+                    ${_conditionType_} a.areaCode like #{${_conditionParam_}.areaCode}
+                </if>
+                <if test="conditionParamRef.areaCode == null">
+                    ${_conditionType_} a.areaCode is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('areaCodeList')">
+                ${_conditionType_} a.areaCode in
+                <foreach collection="conditionParamRef.areaCodeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('deptCode')">
+                <if test="conditionParamRef.deptCode != null and conditionParamRef.deptCode != ''">
+                    ${_conditionType_} a.deptCode like #{${_conditionParam_}.deptCode}
+                </if>
+                <if test="conditionParamRef.deptCode == null">
+                    ${_conditionType_} a.deptCode is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('deptCodeList')">
+                ${_conditionType_} a.deptCode in
+                <foreach collection="conditionParamRef.deptCodeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('powerCode')">
+                <if test="conditionParamRef.powerCode != null and conditionParamRef.powerCode != ''">
+                    ${_conditionType_} a.powerCode like #{${_conditionParam_}.powerCode}
+                </if>
+                <if test="conditionParamRef.powerCode == null">
+                    ${_conditionType_} a.powerCode is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('powerCodeList')">
+                ${_conditionType_} a.powerCode in
+                <foreach collection="conditionParamRef.powerCodeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('themeCode')">
+                <if test="conditionParamRef.themeCode != null and conditionParamRef.themeCode != ''">
+                    ${_conditionType_} a.themeCode like #{${_conditionParam_}.themeCode}
+                </if>
+                <if test="conditionParamRef.themeCode == null">
+                    ${_conditionType_} a.themeCode is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('themeCodeList')">
+                ${_conditionType_} a.themeCode in
+                <foreach collection="conditionParamRef.themeCodeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('usertypeCode')">
+                <if test="conditionParamRef.usertypeCode != null and conditionParamRef.usertypeCode != ''">
+                    ${_conditionType_} a.usertypeCode like #{${_conditionParam_}.usertypeCode}
+                </if>
+                <if test="conditionParamRef.usertypeCode == null">
+                    ${_conditionType_} a.usertypeCode is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('usertypeCodeList')">
+                ${_conditionType_} a.usertypeCode in
+                <foreach collection="conditionParamRef.usertypeCodeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </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')">
+                ${_conditionType_} a.matterCode in
+                <foreach collection="conditionParamRef.matterCodeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('name')">
+                <if test="conditionParamRef.name != null and conditionParamRef.name != ''">
+                    ${_conditionType_} a.name like #{${_conditionParam_}.name}
+                </if>
+                <if test="conditionParamRef.name == null">
+                    ${_conditionType_} a.name is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('nameList')">
+                ${_conditionType_} a.name in
+                <foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('groupName')">
+                <if test="conditionParamRef.groupName != null and conditionParamRef.groupName != ''">
+                    ${_conditionType_} a.groupName like #{${_conditionParam_}.groupName}
+                </if>
+                <if test="conditionParamRef.groupName == null">
+                    ${_conditionType_} a.groupName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('groupNameList')">
+                ${_conditionType_} a.groupName in
+                <foreach collection="conditionParamRef.groupNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('url')">
+                <if test="conditionParamRef.url != null and conditionParamRef.url != ''">
+                    ${_conditionType_} a.url like #{${_conditionParam_}.url}
+                </if>
+                <if test="conditionParamRef.url == null">
+                    ${_conditionType_} a.url is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('urlList')">
+                ${_conditionType_} a.url in
+                <foreach collection="conditionParamRef.urlList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('haveGetMatterInfo')">
+                <if test="conditionParamRef.haveGetMatterInfo != null and conditionParamRef.haveGetMatterInfo != ''">
+                    ${_conditionType_} a.haveGetMatterInfo like #{${_conditionParam_}.haveGetMatterInfo}
+                </if>
+                <if test="conditionParamRef.haveGetMatterInfo == null">
+                    ${_conditionType_} a.haveGetMatterInfo is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('haveGetMatterInfoList')">
+                ${_conditionType_} a.haveGetMatterInfo in
+                <foreach collection="conditionParamRef.haveGetMatterInfoList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </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('areaCode')">
+                        a.areaCode
+                        <if test='orderCol.areaCode != null and "DESC".equalsIgnoreCase(orderCol.areaCode)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('deptCode')">
+                        a.deptCode
+                        <if test='orderCol.deptCode != null and "DESC".equalsIgnoreCase(orderCol.deptCode)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('powerCode')">
+                        a.powerCode
+                        <if test='orderCol.powerCode != null and "DESC".equalsIgnoreCase(orderCol.powerCode)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('themeCode')">
+                        a.themeCode
+                        <if test='orderCol.themeCode != null and "DESC".equalsIgnoreCase(orderCol.themeCode)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('usertypeCode')">
+                        a.usertypeCode
+                        <if test='orderCol.usertypeCode != null and "DESC".equalsIgnoreCase(orderCol.usertypeCode)'>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('name')">
+                        a.name
+                        <if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('groupName')">
+                        a.groupName
+                        <if test='orderCol.groupName != null and "DESC".equalsIgnoreCase(orderCol.groupName)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('url')">
+                        a.url
+                        <if test='orderCol.url != null and "DESC".equalsIgnoreCase(orderCol.url)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('haveGetMatterInfo')">
+                        a.haveGetMatterInfo
+                        <if test='orderCol.haveGetMatterInfo != null and "DESC".equalsIgnoreCase(orderCol.haveGetMatterInfo)'>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

single-matter/src/main/resources/sqlmap/module/matters/MattersPowerMapper.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.matters.dao.ibatis.MattersPowerDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="MattersPowerEntity" id="MattersPowerEntity-Map">
+            <id  property="id" column="id" />
+            <result property="powerCode" column="powerCode" />
+            <result property="name" column="name" />
+            <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('powerCode') or colPickMode == 1 and data.containsKey('powerCode')))">
+                    a.powerCode,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))">
+                    a.name,
+                </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="MattersPowerEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_iot_matters_power
+        (powerCode,name,updateTime)
+        VALUES
+        (#{powerCode},#{name},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_iot_matters_power
+        (powerCode,name,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.powerCode},#{item.name},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_iot_matters_power as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('powerCode')) or (colPickMode==1 and !data.containsKey('powerCode'))">
+                a.powerCode=#{data.powerCode},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('name')) or (colPickMode==1 and !data.containsKey('name'))">
+                a.name=#{data.name},
+            </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_iot_matters_power as a
+        <trim prefix="set" suffixOverrides=",">
+                <trim prefix="powerCode=(case" suffix="ELSE powerCode end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('powerCode')) or (colPickMode==1 and !item.containsKey('powerCode'))">
+                            when a.id=#{item.id} then #{item.powerCode}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="name=(case" suffix="ELSE name end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('name')) or (colPickMode==1 and !item.containsKey('name'))">
+                            when a.id=#{item.id} then #{item.name}
+                        </if>
+                    </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="MattersPowerEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_iot_matters_power as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_iot_matters_power as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_iot_matters_power where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_iot_matters_power as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="MattersPowerEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_iot_matters_power 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_iot_matters_power 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')">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" 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('powerCode')">
+                <if test="conditionParamRef.powerCode != null and conditionParamRef.powerCode != ''">
+                    ${_conditionType_} a.powerCode like #{${_conditionParam_}.powerCode}
+                </if>
+                <if test="conditionParamRef.powerCode == null">
+                    ${_conditionType_} a.powerCode is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('powerCodeList')">
+                ${_conditionType_} a.powerCode in
+                <foreach collection="conditionParamRef.powerCodeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('name')">
+                <if test="conditionParamRef.name != null and conditionParamRef.name != ''">
+                    ${_conditionType_} a.name like #{${_conditionParam_}.name}
+                </if>
+                <if test="conditionParamRef.name == null">
+                    ${_conditionType_} a.name is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('nameList')">
+                ${_conditionType_} a.name in
+                <foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </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('powerCode')">
+                        a.powerCode
+                        <if test='orderCol.powerCode != null and "DESC".equalsIgnoreCase(orderCol.powerCode)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('name')">
+                        a.name
+                        <if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>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

single-matter/src/main/resources/sqlmap/module/matters/MattersThemeMapper.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.matters.dao.ibatis.MattersThemeDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="MattersThemeEntity" id="MattersThemeEntity-Map">
+            <id  property="id" column="id" />
+            <result property="usertypeCode" column="usertypeCode" />
+            <result property="themeCode" column="themeCode" />
+            <result property="name" column="name" />
+            <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('usertypeCode') or colPickMode == 1 and data.containsKey('usertypeCode')))">
+                    a.usertypeCode,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('themeCode') or colPickMode == 1 and data.containsKey('themeCode')))">
+                    a.themeCode,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))">
+                    a.name,
+                </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="MattersThemeEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_iot_matters_theme
+        (usertypeCode,themeCode,name,updatetime)
+        VALUES
+        (#{usertypeCode},#{themeCode},#{name},#{updatetime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_iot_matters_theme
+        (usertypeCode,themeCode,name,updatetime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.usertypeCode},#{item.themeCode},#{item.name},#{item.updatetime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_iot_matters_theme as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('usertypeCode')) or (colPickMode==1 and !data.containsKey('usertypeCode'))">
+                a.usertypeCode=#{data.usertypeCode},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('themeCode')) or (colPickMode==1 and !data.containsKey('themeCode'))">
+                a.themeCode=#{data.themeCode},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('name')) or (colPickMode==1 and !data.containsKey('name'))">
+                a.name=#{data.name},
+            </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_iot_matters_theme as a
+        <trim prefix="set" suffixOverrides=",">
+                <trim prefix="usertypeCode=(case" suffix="ELSE usertypeCode end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('usertypeCode')) or (colPickMode==1 and !item.containsKey('usertypeCode'))">
+                            when a.id=#{item.id} then #{item.usertypeCode}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="themeCode=(case" suffix="ELSE themeCode end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('themeCode')) or (colPickMode==1 and !item.containsKey('themeCode'))">
+                            when a.id=#{item.id} then #{item.themeCode}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="name=(case" suffix="ELSE name end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('name')) or (colPickMode==1 and !item.containsKey('name'))">
+                            when a.id=#{item.id} then #{item.name}
+                        </if>
+                    </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="MattersThemeEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_iot_matters_theme as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_iot_matters_theme as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_iot_matters_theme where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_iot_matters_theme as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="MattersThemeEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_iot_matters_theme 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_iot_matters_theme 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')">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" 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('usertypeCode')">
+                <if test="conditionParamRef.usertypeCode != null and conditionParamRef.usertypeCode != ''">
+                    ${_conditionType_} a.usertypeCode like #{${_conditionParam_}.usertypeCode}
+                </if>
+                <if test="conditionParamRef.usertypeCode == null">
+                    ${_conditionType_} a.usertypeCode is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('usertypeCodeList')">
+                ${_conditionType_} a.usertypeCode in
+                <foreach collection="conditionParamRef.usertypeCodeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('themeCode')">
+                <if test="conditionParamRef.themeCode != null and conditionParamRef.themeCode != ''">
+                    ${_conditionType_} a.themeCode like #{${_conditionParam_}.themeCode}
+                </if>
+                <if test="conditionParamRef.themeCode == null">
+                    ${_conditionType_} a.themeCode is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('themeCodeList')">
+                ${_conditionType_} a.themeCode in
+                <foreach collection="conditionParamRef.themeCodeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('name')">
+                <if test="conditionParamRef.name != null and conditionParamRef.name != ''">
+                    ${_conditionType_} a.name like #{${_conditionParam_}.name}
+                </if>
+                <if test="conditionParamRef.name == null">
+                    ${_conditionType_} a.name is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('nameList')">
+                ${_conditionType_} a.name in
+                <foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </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('usertypeCode')">
+                        a.usertypeCode
+                        <if test='orderCol.usertypeCode != null and "DESC".equalsIgnoreCase(orderCol.usertypeCode)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('themeCode')">
+                        a.themeCode
+                        <if test='orderCol.themeCode != null and "DESC".equalsIgnoreCase(orderCol.themeCode)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('name')">
+                        a.name
+                        <if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>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

single-matter/src/main/resources/sqlmap/module/matters/MattersUsertypeMapper.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.matters.dao.ibatis.MattersUsertypeDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="MattersUsertypeEntity" id="MattersUsertypeEntity-Map">
+            <id  property="id" column="id" />
+            <result property="usertypeCode" column="usertypeCode" />
+            <result property="name" column="name" />
+            <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('usertypeCode') or colPickMode == 1 and data.containsKey('usertypeCode')))">
+                    a.usertypeCode,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))">
+                    a.name,
+                </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="MattersUsertypeEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_iot_matters_usertype
+        (usertypeCode,name,updateTime)
+        VALUES
+        (#{usertypeCode},#{name},#{updateTime})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_iot_matters_usertype
+        (usertypeCode,name,updateTime)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.usertypeCode},#{item.name},#{item.updateTime})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_iot_matters_usertype as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('usertypeCode')) or (colPickMode==1 and !data.containsKey('usertypeCode'))">
+                a.usertypeCode=#{data.usertypeCode},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('name')) or (colPickMode==1 and !data.containsKey('name'))">
+                a.name=#{data.name},
+            </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_iot_matters_usertype as a
+        <trim prefix="set" suffixOverrides=",">
+                <trim prefix="usertypeCode=(case" suffix="ELSE usertypeCode end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('usertypeCode')) or (colPickMode==1 and !item.containsKey('usertypeCode'))">
+                            when a.id=#{item.id} then #{item.usertypeCode}
+                        </if>
+                    </foreach>
+                </trim>
+                <trim prefix="name=(case" suffix="ELSE name end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('name')) or (colPickMode==1 and !item.containsKey('name'))">
+                            when a.id=#{item.id} then #{item.name}
+                        </if>
+                    </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="MattersUsertypeEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_iot_matters_usertype as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_iot_matters_usertype as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_iot_matters_usertype where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_iot_matters_usertype as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="MattersUsertypeEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_iot_matters_usertype 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_iot_matters_usertype 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')">
+                ${_conditionType_} a.id in
+                <foreach collection="conditionParamRef.idList" 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('usertypeCode')">
+                <if test="conditionParamRef.usertypeCode != null and conditionParamRef.usertypeCode != ''">
+                    ${_conditionType_} a.usertypeCode like #{${_conditionParam_}.usertypeCode}
+                </if>
+                <if test="conditionParamRef.usertypeCode == null">
+                    ${_conditionType_} a.usertypeCode is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('usertypeCodeList')">
+                ${_conditionType_} a.usertypeCode in
+                <foreach collection="conditionParamRef.usertypeCodeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="conditionParamRef.containsKey('name')">
+                <if test="conditionParamRef.name != null and conditionParamRef.name != ''">
+                    ${_conditionType_} a.name like #{${_conditionParam_}.name}
+                </if>
+                <if test="conditionParamRef.name == null">
+                    ${_conditionType_} a.name is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('nameList')">
+                ${_conditionType_} a.name in
+                <foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </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('usertypeCode')">
+                        a.usertypeCode
+                        <if test='orderCol.usertypeCode != null and "DESC".equalsIgnoreCase(orderCol.usertypeCode)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('name')">
+                        a.name
+                        <if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>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