添加事项同步数据

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/daemon/RequestDataController.java

+package com.mortals.xhx.daemon;
+
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.setting.Setting;
+import cn.hutool.setting.dialect.Props;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.base.system.upload.service.UploadService;
+import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.common.key.Constant;
+import com.mortals.xhx.common.pdu.ApiRespPdu;
+import com.mortals.xhx.module.matter.model.MatterDatumEntity;
+import com.mortals.xhx.module.matter.model.MatterDatumFileEntity;
+import com.mortals.xhx.module.matter.service.*;
+import com.mortals.xhx.module.matters.service.MattersDetailService;
+import com.mortals.xhx.module.matters.service.MattersService;
+import lombok.extern.apachecommons.CommonsLog;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * 事项数据同步更新
+ *
+ * @author: zxfei
+ * @date: 2022/3/30 9:45
+ */
+@CommonsLog
+@RestController
+@RequestMapping("test")
+public class RequestDataController {
+
+    @Autowired
+    private MatterService matterService;
+    @Autowired
+    private MattersService mattersService;
+    @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 ParamService paramService;
+    @Autowired
+    private UploadService uploadService;
+
+
+    /**
+     * 生成基础数据prop
+     *
+     * @return
+     */
+    @PostMapping("/baseprop")
+    public ApiRespPdu<String> baseprop() {
+        ApiRespPdu<String> respPdu = new ApiRespPdu<>();
+
+        Map<String, String> baseInfoMap = matterService.getBaseInfoMap(null);
+        //保存为
+
+        Setting setting = Setting.create();
+        setting.putAll(baseInfoMap);
+        setting.store("E://baseinfo.setting");
+
+        Map<String, String> sqclInfoMap = matterService.getSqclInfoMap(null);
+
+        sqclInfoMap.entrySet().stream().peek(item -> {
+            String[] split = item.getValue().split(",");
+            if (split.length > 1) {
+                StringBuffer sb = new StringBuffer();
+                for (int i = 0; i < split.length; i++) {
+                    sb.append(split[i]);
+                    sb.append(".");
+                    sb.append(split[i]);
+                    if (i != split.length - 1) {
+                        sb.append(",");
+                    }
+
+                }
+                item.setValue(sb.toString());
+            }
+        }).count();
+
+        setting = Setting.create();
+        setting.putAll(sqclInfoMap);
+        setting.store("E://sqclinfo.setting");
+
+        return respPdu;
+    }
+
+
+    /**
+     * 同步事项数据
+     *
+     * @return
+     */
+    @PostMapping("/syncMatter")
+    public ApiRespPdu<String> syncMatter() {
+        ApiRespPdu<String> respPdu = new ApiRespPdu<>();
+
+        matterService.syncMatter(null);
+
+        return respPdu;
+    }
+
+    /*
+     */
+
+    /**
+     * 同步解析材料
+     *
+     * @param
+     * @return
+     *//*
+    @PostMapping("/datumn")
+    public String datumn(@RequestBody ApiReqPdu<RequestTaskReq> req) {
+
+        ApiRespPdu<String> respPdu = new ApiRespPdu<>();
+        BiMap<String, String> materialPropertyInverseMap = HashBiMap.create(paramService.getParamByFirstOrganize(Constant.Param_materialProperty)).inverse();
+        BiMap<String, String> materialTypeInverseMap = HashBiMap.create(paramService.getParamByFirstOrganize(Constant.Param_materialType)).inverse();
+        BiMap<String, String> electronicgsInverseMap = HashBiMap.create(paramService.getParamByFirstOrganize(Constant.Param_electronicgs)).inverse();
+        BiMap<String, String> materialSourceInverseMap = HashBiMap.create(paramService.getParamByFirstOrganize(Constant.Param_materialSource)).inverse();
+        BiMap<String, String> paperGgInverseMap = HashBiMap.create(paramService.getParamByFirstOrganize(Constant.Param_paperGg)).inverse();
+        BiMap<String, String> jianmMsInverseMap = HashBiMap.create(paramService.getParamByFirstOrganize(Constant.Param_jianmMs)).inverse();
+        BiMap<String, String> sealWayInverseMap = HashBiMap.create(paramService.getParamByFirstOrganize(Constant.Param_sealWay)).inverse();
+        BiMap<String, String> isMustInverseMap = HashBiMap.create(paramService.getParamByFirstOrganize(Constant.Param_isMust)).inverse();
+        BiMap<String, String> iszzsbInverseMap = HashBiMap.create(YesNoEnum.getEnumMap()).inverse();
+        BiMap<String, String> yesOrNoInverseMap = HashBiMap.create(YesNoEnum.getEnumMap()).inverse();
+
+        //String value = inverse.getOrDefault(m.getValue().toString(), "0");
+
+        try {
+            //拆分材料库数据
+            matterDetailService.find(new MatterDetailQuery()).stream().peek(item -> {
+                String json = item.getMaterialsSqcl();
+                //log.info("receive json:"+json);
+                if (ObjectUtils.isEmpty(json) || "{}".equals(json)) {
+                    log.info("json:" + json);
+                    return;
+                }
+                JSONObject root = null;
+                try {
+                    root = JSON.parseObject(json);
+                } catch (Exception e) {
+                    json = json.replaceAll("\\\\", "\\\\\\\\");
+
+                    try {
+                        root = JSON.parseObject(json);
+                    } catch (Exception e1) {
+                        log.error("error json:" + json);
+                        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.setMatterId(item.getMatterId());
+                    datumEntity.setSource(0);
+                    datumEntity.setCreateTime(new Date());
+                    datumEntity.setCreateUser("system");
+
+                    //材料详情
+                    JSONArray jsonArrayThree = secondJsonObject.getJSONArray("材料详情");
+                    if (!ObjectUtils.isEmpty(jsonArrayThree)) {
+
+                        for (int j = 0; j < jsonArrayThree.size(); j++) {
+                            jsonArrayThree.getJSONObject(j).entrySet().stream().peek(m -> {
+                                Boolean bool = false;
+
+                                if ("材料名称".equals(m.getKey().trim())) {
+                                    datumEntity.setMaterialName(m.getValue().toString());
+                                    bool = true;
+                                }
+
+                                if ("材料形式".equals(m.getKey().trim())) {
+                                    //materialPropertyInverseMap
+                                    String value = materialPropertyInverseMap.getOrDefault(m.getValue().toString(), "0");
+
+                                    datumEntity.setMaterialProperty(Integer.parseInt(value));
+                                    bool = true;
+                                    checkKeyValue(materialPropertyInverseMap, m, value);
+
+                                }
+
+                                if ("材料必要性".equals(m.getKey().trim())) {
+                                    //isMustInverseMap
+                                    String value = isMustInverseMap.getOrDefault(m.getValue().toString(), "0");
+                                    datumEntity.setIsMust(Integer.parseInt(value));
+                                    bool = true;
+                                    checkKeyValue(isMustInverseMap, m, value);
+                                }
+
+                                if ("材料类型".equals(m.getKey().trim())) {
+                                    //materialTypeInverseMap
+                                    String value = materialTypeInverseMap.getOrDefault(m.getValue().toString(), "0");
+                                    datumEntity.setMaterialType(Integer.parseInt(value));
+                                    bool = true;
+                                    checkKeyValue(materialTypeInverseMap, m, value);
+                                }
+
+                                if ("电子材料格式".equals(m.getKey().trim())) {
+                                    //electronicgsInverseMap
+                                    String value = electronicgsInverseMap.getOrDefault(m.getValue().toString(), "0");
+                                    datumEntity.setElectronicgs(Integer.parseInt(value));
+                                    bool = true;
+                                    checkKeyValue(electronicgsInverseMap, m, value);
+                                }
+
+                                if ("来源渠道".equals(m.getKey().trim())) {
+                                    //materialSourceSmInverseMap
+                                    String value = materialSourceInverseMap.getOrDefault(m.getValue().toString(), "0");
+                                    datumEntity.setMaterialSource(Integer.parseInt(value));
+                                    bool = true;
+                                    checkKeyValue(materialSourceInverseMap, m, value);
+                                }
+
+                                if ("来源渠道说明".equals(m.getKey().trim())) {
+                                    datumEntity.setMaterialSourceSm(m.getValue().toString());
+                                    bool = true;
+                                }
+
+                                if ("纸质材料份数".equals(m.getKey().trim())) {
+                                    //materialSourceSmInverseMap
+                                    datumEntity.setPaperNum(Integer.parseInt(m.getValue().toString()));
+                                    bool = true;
+                                }
+
+                                if ("纸质材料规格".equals(m.getKey().trim())) {
+                                    //paperGgInverseMap
+                                    String value = paperGgInverseMap.getOrDefault(m.getValue().toString(), "0");
+                                    datumEntity.setPaperGg(Integer.parseInt(value));
+                                    bool = true;
+                                    checkKeyValue(paperGgInverseMap, m, value);
+
+                                    datumEntity.setPaperGgText(m.getValue().toString());
+
+                                }
+
+                                if ("盖章或盖手印方式".equals(m.getKey().trim())) {
+                                    //sealWayInverseMap
+                                    String value = sealWayInverseMap.getOrDefault(m.getValue().toString(), "0");
+                                    datumEntity.setSealWay(Integer.parseInt(value));
+                                    bool = true;
+                                    checkKeyValue(sealWayInverseMap, m, value);
+                                    datumEntity.setSealWayText(m.getValue().toString());
+                                }
+
+                                if ("是否容缺".equals(m.getKey().trim())) {
+                                    //yesOrNoInverseMap
+                                    String value = yesOrNoInverseMap.getOrDefault(m.getValue().toString(), "0");
+                                    datumEntity.setIsLack(Integer.parseInt(value));
+                                    bool = true;
+                                    checkKeyValue(yesOrNoInverseMap, m, value);
+                                }
+
+                                if ("是否减免".equals(m.getKey().trim())) {
+                                    //yesOrNoInverseMap
+                                    String value = yesOrNoInverseMap.getOrDefault(m.getValue().toString(), "0");
+                                    datumEntity.setIsjianm(Integer.parseInt(value));
+                                    bool = true;
+                                    checkKeyValue(yesOrNoInverseMap, m, value);
+                                }
+
+                                if ("减免模式".equals(m.getKey().trim())) {
+                                    //jianmMsInverseMap
+
+                                    if ("".equals(m.getValue().toString())) {
+                                        m.setValue("无");
+                                    }
+                                    String value = jianmMsInverseMap.getOrDefault(m.getValue().toString(), "0");
+                                    datumEntity.setJianmMs(Integer.parseInt(value));
+                                    bool = true;
+                                    checkKeyValue(jianmMsInverseMap, m, value);
+                                }
+
+                                if ("填报须知".equals(m.getKey().trim())) {
+                                    datumEntity.setRemarkSub(m.getValue().toString());
+                                    bool = true;
+                                }
+
+                                if ("受理标准".equals(m.getKey().trim())) {
+                                    datumEntity.setSummary(m.getValue().toString());
+                                    bool = true;
+                                }
+
+                                if ("要求提供材料的依据".equals(m.getKey().trim())) {
+                                    datumEntity.setClauseContent(m.getValue().toString());
+                                    bool = true;
+                                }
+
+                                if ("备注".equals(m.getKey().trim())) {
+                                    datumEntity.setRemark(m.getValue().toString());
+                                    bool = true;
+                                }
+
+                                if (!bool) {
+                                    System.out.println("name:" + m.getKey());
+                                    System.out.print(" 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.setDatumid(datumEntity.getId());
+                            fileEntity.setSource(0);
+                            fileEntity.setFiletype(1);
+                            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.setSource(0);
+                            fileEntity.setFiletype(2);
+                            jsonArraytwo.getJSONObject(j).entrySet().stream().peek(m -> {
+                                fileEntity.setFileName(m.getKey());
+                                fileEntity.setFileUrl(m.getValue().toString());
+                            }).count();
+                            fileArrayList.add(fileEntity);
+                        }
+                        matterDatumFileService.save(fileArrayList);
+                    }
+                }
+
+            }).count();
+
+
+        } catch (Exception e) {
+            log.error("error", e);
+        }
+        return respPdu;
+    }*/
+    private void checkKeyValue(BiMap<String, String> map, Map.Entry<String, Object> m, String value) {
+        if ("0".equals(value)) {
+            //查看是否为空
+            String temp = map.get(m.getValue().toString());
+            if (ObjectUtils.isEmpty(temp)) {
+                //打印枚举类型值
+                System.out.println("uncheck name:" + m.getKey() + " value:" + m.getValue());
+            }
+        }
+    }
+
+
+    public static void main(String[] args) {
+
+
+    }
+
+}

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/matter/service/impl/MatterServiceImpl.java

 package com.mortals.xhx.module.matter.service.impl;
 
+import cn.hutool.core.util.ReflectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.setting.Setting;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
-import com.mortals.xhx.common.utils.BeanUtil;
-import com.mortals.xhx.module.business.model.BusinessQuery;
-import com.mortals.xhx.module.matter.model.MatterQuery;
-import com.mortals.xhx.module.site.model.SiteMatterEntity;
-import com.mortals.xhx.module.site.model.SiteBusinessQuery;
+import com.mortals.framework.util.DataUtil;
+import com.mortals.xhx.base.framework.config.InterceptorConfig;
+import com.mortals.xhx.common.code.SourceEnum;
+import com.mortals.xhx.module.matter.dao.MatterDao;
+import com.mortals.xhx.module.matter.model.*;
+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.MattersAreaService;
+import com.mortals.xhx.module.matters.service.MattersDetailService;
+import com.mortals.xhx.module.matters.service.MattersService;
 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.site.service.SiteBusinessService;
 import com.mortals.xhx.module.site.service.SiteMatterService;
 import com.mortals.xhx.module.site.service.SiteService;
 import org.springframework.beans.BeanUtils;
 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.MatterDao;
-import com.mortals.xhx.module.matter.model.MatterEntity;
-import com.mortals.xhx.module.matter.service.MatterService;
 import org.springframework.util.ObjectUtils;
 
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -40,6 +48,31 @@ public class MatterServiceImpl extends AbstractCRUDCacheServiceImpl<MatterDao, M
     private SiteMatterService siteMatterService;
     @Autowired
     private SiteService siteService;
+    @Autowired
+    private MattersService mattersService;
+    @Autowired
+    private InterceptorConfig interceptorConfig;
+
+    @Autowired
+    private MattersAreaService mattersAreaService;
+    @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;
 
 
     @Override
@@ -74,10 +107,8 @@ public class MatterServiceImpl extends AbstractCRUDCacheServiceImpl<MatterDao, M
         super.removeBefore(ids, context);
     }
 
-
     @Override
     public void addMatterToSite(String matterIds, Long siteId, Context context) {
-
         if (ObjectUtils.isEmpty(siteId)) {
             throw new AppException("请选择对应站点");
         }
@@ -108,4 +139,690 @@ public class MatterServiceImpl extends AbstractCRUDCacheServiceImpl<MatterDao, M
             siteMatterService.save(siteMatterEntity, context);
         }
     }
+
+
+    @Override
+    public void syncMatter(Context context) {
+        List<MatterEntity> list = this.find(new MatterQuery().source(SourceEnum.政务网.getValue()));
+        if (!ObjectUtils.isEmpty(list)) {
+            // TODO: 2022/3/30  查询本地数据，进行交叉更新对比
+        } else {
+            //读取区域数据
+            //mattersAreaService.find()
+            //读取事项基础数据
+            List<MattersEntity> mattersEntities = mattersService.find(new MattersQuery());
+            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");
+                        String basicinfoJbxx = itemDetail.getBasicinfoJbxx();
+                        //解析基础数据
+                        //todo 设置基础值
+                        //基本信息属性与字段映射表
+                        Setting baseInfoSetting = interceptorConfig.getBaseInfoSetting();
+                        Setting sqclInfoSetting = interceptorConfig.getSqclInfoSetting();
+                        createBaseMatterJson(basicinfoJbxx, baseInfoSetting, matterEntity);
+                        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(cjwtJson, 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(value)) {
+                                        //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.setMatterId(matterEntity.getId());
+            datumEntity.setMaterialName(matterEntity.getMatterName());
+            datumEntity.setSource(SourceEnum.政务网.getValue());
+            datumEntity.setCreateTime(new Date());
+            datumEntity.setCreateUser("system");
+
+            //材料详情
+            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.setDatumId(datumEntity.getId());
+                    fileEntity.setMaterialName(datumEntity.getMaterialName());
+                    fileEntity.setSource(SourceEnum.政务网.getValue());
+                    fileEntity.setFiletype(1);
+                    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(2);
+                    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");
+            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");
+            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.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.setMatterId(matterEntity.getId());
+            matterFlowlimitEntity.setMatterName(matterEntity.getMatterName());
+            matterFlowlimitEntity.setSource(SourceEnum.政务网.getValue());
+            matterFlowlimitEntity.setCreateTime(new Date());
+            matterFlowlimitEntity.setCreateUser("system");
+            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");
+            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 中介服务");
+        }
+
+        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.setMatterId(matterEntity.getId());
+            matterIntermediaryEntity.setMatterName(matterEntity.getMatterName());
+            matterIntermediaryEntity.setSource(SourceEnum.政务网.getValue());
+            matterIntermediaryEntity.setCreateTime(new Date());
+            matterIntermediaryEntity.setCreateUser("system");
+            jsonArray.getJSONObject(i).entrySet().stream().peek(m -> {
+                    if ("中介服务事项名称".equals(m.getKey().trim())) {
+                        matterIntermediaryEntity.setTitle(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.setRemark(m.getValue().toString());
+                    }
+
+                }).count();
+
+            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);
+                }
+            }
+
+        }
+    }
+
 }
\ 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/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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

base-manager/src/main/java/com/mortals/xhx/module/matters/web/MattersAreaController.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.MattersAreaEntity;
+import com.mortals.xhx.module.matters.model.MattersAreaQuery;
+import com.mortals.xhx.module.matters.service.MattersAreaService;
+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/area")
+public class MattersAreaController extends BaseCRUDJsonMappingController<MattersAreaService,MattersAreaForm,MattersAreaEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public MattersAreaController(){
+        super.setFormClass(MattersAreaForm.class);
+        super.setModuleDesc( "区域");
+    }
+
+    @Override
+    protected void init(HttpServletRequest request, HttpServletResponse response, MattersAreaForm form, Map<String, Object> model, Context context) {
+        super.init(request, response, form, model, context);
+    }
+
+}
\ No newline at end of file

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

base-manager/src/main/java/com/mortals/xhx/module/matters/web/MattersController.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.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
+*/
+@RestController
+@RequestMapping("matters")
+public class MattersController extends BaseCRUDJsonMappingController<MattersService,MattersForm,MattersEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public MattersController(){
+        super.setFormClass(MattersForm.class);
+        super.setModuleDesc( "事项列");
+    }
+
+    @Override
+    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

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

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

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

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

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

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

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

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

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

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

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

base-manager/src/main/resources/baseinfo.setting

+仲裁检定结果 = 
+职业技能鉴定补贴申请 = 
+被拐儿童身份证明 = 
+公示系统查询备案情况 = 
+公证机构执业证 = 
+承诺办结时限 = promiseTimeLimitShow
+亲属关系证明 = 
+基本编码 = baseCode
+计划生效日期 = planTakeTime
+临时便民服务摊点 = 
+征收种类 = 
+采矿权抵押备案通知书 = 
+剧毒化学品准购证 = 
+乡村医生执业证书 = 
+非机动车行驶证 = 
+安全驾驶经历证明 = 
+移出经营异常名录 = 
+批文 = 
+医疗广告审查证明 = 
+事项状态 = matterStatus
+其他 = 
+城市建筑垃圾处置核准证 =
+审批结果样本 = 
+是否进驻政务大厅 = goveServiceCenterShow
+暂扣或吊销执照 = 
+创业培训开班（含报名） = 
+居住证 = 
+到办事现场次数 = onlineToTheSceneNum
+注销通知书 = 
+校车标牌 = 
+就业技能培训补贴申请 = 
+监督投诉方式 = superviseShow
+登记通知书 = 
+临时身份证明 = 
+机动车解除抵押登记 = 
+机动车注销登记证明 = 
+序号 =
+边境管理区通行证 = 
+行使方式 = 
+承诺时限办结说明 = promiseEndExplain
+租赁补贴发放审核结果 = 
+行政拘留 = 
+事项版本 = matterEdition
+没收违法所得 = 
+联办机构 = jointInfoShow
+办件类型 = 
+机动车检验合格标志 = 
+四川省老年人优待证 = 
+公租房租金缴纳发票 = 
+居民户口薄 = 
+机动车变更登记 = 
+办理形式 = handleType
+机动车登记证书 = 
+委托部门 = entrustmentDepartmen
+是否收费 = isChargesShow
+划定矿区范围批复 = 
+护士执业证书 = 
+建设工程设计方案批复 = 
+征收使用草原审核同意书 = 
+股权出质设立登记通知书 = 
+即时回复 = 
+生鲜乳准运证明 = 
+准予注销登记通知书 = 
+营业执照 = 
+个体演出经纪人备案证明 = 
+准予迁入调档函 = 
+饮用水供水单位卫生许可 = 
+矿山闭坑地质报告审批 = 
+特别程序 = specialProcedure
+必须到现场原因 = mustSceneExplain
+就业创业证 = 
+证明 = 
+计划取消日期 = 
+回执单 = 
+动物检疫合格证明 = 
+个体演员备案证明 = 
+单位缴费汇总单 = 
+公租房资格认定结果 = 
+业务办理项编码 = operateItemCode
+认证等级需求 = certificationLevelsShow
+名称 = 
+校车驾驶资格 = 
+专家评审意见 = 
+股权出质变更登记通知书 = 
+艺术品经营单位备案证明 = 
+责令停产停业 = 
+法定办结时限 = legalTimeLimitShow
+实施主体编码 = implementBodyCode
+食品经营许可注销通知书 = 
+四川省养犬登记证 = 
+道路运输证 =
+咨询方式 = cousultingShow
+服务对象 = appoveObjectShow
+办理时间 = operateTime
+医师执业证书 = 
+实施主体性质 = performDeptTypeShow
+事项名称 = 
+办结通知书 = 
+不动产登记证明 = 
+确定抗震设防要求 = 
+无犯罪记录证明 = 
+四川省食品小作坊备案证 = 
+权力来源 = powerSourceShow
+移出经营异常名录审批表 = 
+法定时限办结说明 = legalEndExplain
+行使层级 = performHierarchyShow
+夜间施工许可 = 
+警告 = 
+社会保障卡信息变更 = 
+不动产权证书 = 
+实施主体 = performDeptType
+创业培训补贴申请 = 
+准予撤销登记通知书 = 
+处罚种类 = 
+备案证明材料 = 
+医疗机构设置批准证书 = 
+医师定期考核结果备案表 = 
+事项类型 = eventTypeShow
+无审批结果 = 
+机动车抵押登记 = 
+营业执照、登记通知书 = 
+植物检疫证书（省内） = 
+非正常死亡证明 = 
+查看 = 
+旧货业备案 = 
+旅行社分社备案登记证明 = 
+查询结果 = 
+放射人员工作证 = 
+通办范围 = operatScopeShow
+法定办结时限单位 = 
+游行示威批准书 = 
+档案资料 = 
+证照 = 
+备案通知书 = 
+变更后的规划条件 =
+机动车临时通行牌证 = 
+居民身份证 = 
+没收非法财物 = 
+法定办结时限说明 = 
+建设工程安全监督登记表 = 
+计量授权证书 = 
+机动车号牌 = 
+审批结果类型 = 
+股权出质注销登记通知书 = 
+设立变更 = 
+机动车行驶证 = 
+当即回复 = 
+注销户口证明 = 
+实施编码 = implementCode
+其他行政处罚 = 
+行政许可批准决定书 = 
+办理地点 = operateSite
+机动车驾驶证 = 

base-manager/src/main/resources/sqclinfo.setting

+材料必要性 = isMust
+盖章或盖手印方式 = sealWay
+是否容缺 = isLack
+减免模式 = jianmMs
+电子材料格式 = electronicgs
+要求提供材料的依据 = clauseContent
+材料形式 = materialProperty
+备注 = remark
+是否减免 = isjianm
+纸质材料份数 = paperNum
+材料名称 = matterName
+填报须知 = remarkSub
+受理标准 = summary
+来源渠道 = materialSource
+纸质材料规格 = paperGg
+材料类型 = materialType
+来源渠道说明 = materialSourceSm

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

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

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

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

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

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

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

base-manager/src/test/java/com/mortals/httpclient/matter/MatterController.http

 
+###基础事项列表
+POST {{baseUrl}}/test/baseprop
+Content-Type: application/json
+
+{
+
+}
+
+###基础事项列表
+POST {{baseUrl}}/test/syncMatter
+Content-Type: application/json
+
+{
+
+}
+
+
+
 ###基础事项列表
 POST {{baseUrl}}/matter/list
 Content-Type: application/json

common-lib/src/main/java/com/mortals/xhx/common/pdu/api/ApiReqPdu.java

+package com.mortals.xhx.common.pdu.api;
+
+import lombok.Data;
+
+/**
+ * @author karlhoo
+ */
+@Data
+public class ApiReqPdu<T> {
+
+    private String seq;
+
+    /**
+     * 透传数据
+     */
+    private T transmission;
+}

common-lib/src/main/java/com/mortals/xhx/common/pdu/api/ApiRespPdu.java

+package com.mortals.xhx.common.pdu.api;
+
+import lombok.Data;
+
+/**
+ * @author karlhoo
+ */
+@Data
+public class ApiRespPdu<T> {
+    /**
+     * 结果编码
+     */
+    private int code;
+    /**
+     * 结果描述
+     */
+    private String msg;
+    /**
+     * 响应数据
+     */
+    private T data;
+}