添加事项同步数据

base-manager/src/main/java/com/mortals/xhx/base/framework/config/InterceptorConfig.java

@@ -5,13 +5,19 @@ import java.util.Set;
 
 import javax.annotation.PostConstruct;
 
+import cn.hutool.setting.Setting;
+import cn.hutool.setting.SettingUtil;
+import com.alibaba.fastjson.JSON;
 import lombok.Getter;
+import lombok.Setter;
+import lombok.extern.apachecommons.CommonsLog;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
 import com.mortals.framework.util.StringUtils;
 
 @Configuration
+@CommonsLog
 public class InterceptorConfig {
     /**
      * cookie的密钥
@@ -30,7 +36,12 @@ public class InterceptorConfig {
      */
     @Value("${application.auth.uncheckUrl}")
     private String uncheckAuthUrl;
-
+    @Setter
+    @Getter
+    private Setting baseInfoSetting;
+    @Setter
+    @Getter
+    private Setting sqclInfoSetting;
 
     private Set<String> uncheckLoginUrls = new HashSet<>();
 
@@ -85,6 +96,16 @@ public class InterceptorConfig {
                 uncheckAuthUrlsSuffix.add(url.substring(0, index));
             }
         }
+
+
+        //加载配置文件
+        Setting baseinfo = SettingUtil.get("baseinfo");
+        this.setBaseInfoSetting(baseinfo);
+       // log.info("baseinfo:"+ JSON.toJSONString(baseinfo));
+
+        Setting sqclinfo = SettingUtil.get("sqclinfo");
+        this.setSqclInfoSetting(sqclinfo);
+
     }
 
 }

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

@@ -3,6 +3,9 @@ import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDCacheService;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.matter.model.MatterEntity;
+
+import java.util.Map;
+
 /**
 * MatterService
 *
@@ -20,4 +23,16 @@ public interface MatterService extends ICRUDCacheService<MatterEntity,Long> {
      * @param context
      */
     void addMatterToSite(String matterIds, Long siteId, Context context);
+
+
+    /**
+     * 同步政务网事项数据
+     * @param context
+     */
+    void syncMatter(Context context);
+
+
+    Map<String,String> getBaseInfoMap(Context context);
+
+    Map<String,String> getSqclInfoMap(Context context);
 }
\ No newline at end of file

base-manager/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>{
+
+
+}

base-manager/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>{
+
+
+}

base-manager/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>{
+
+
+}

base-manager/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>{
+
+
+}

base-manager/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>{
+
+
+}

base-manager/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>{
+
+
+}

base-manager/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>{
+
+
+}

base-manager/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 {
+
+
+
+}

base-manager/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 {
+
+
+
+}

base-manager/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 {
+
+
+
+}

base-manager/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 {
+
+
+
+}

base-manager/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 {
+
+
+
+}

base-manager/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 {
+
+
+
+}

base-manager/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 {
+
+
+
+}

base-manager/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

base-manager/src/main/java/com/mortals/xhx/module/matters/model/MattersDeptEntity.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.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

base-manager/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

base-manager/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

base-manager/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

base-manager/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

base-manager/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

base-manager/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

base-manager/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

base-manager/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