添加窗口无人值守

base-manager/db/add.sql

@@ -2,7 +2,7 @@
 -- ----------------------------
 2023-2-21
 -- ----------------------------
-ALTER TABLE mortals_sys_window ADD COLUMN `duty` tinyint (1)    COMMENT '无人值守(1.是，0.否)' AFTER hongqi;
-ALTER TABLE mortals_sys_window ADD COLUMN `dutyContent` varchar (256)    COMMENT '显示内容' AFTER duty;
-ALTER TABLE mortals_sys_window ADD COLUMN `dutyEnglish` varchar (256)    COMMENT '显示英文' AFTER dutyContent;
+ALTER TABLE mortals_sys_window ADD COLUMN `duty` tinyint (1)  default 0   COMMENT '无人值守(1.是，0.否)' AFTER hongqi;
+ALTER TABLE mortals_sys_window ADD COLUMN `dutyContent` varchar (256) default ""  COMMENT '显示内容' AFTER duty;
+ALTER TABLE mortals_sys_window ADD COLUMN `dutyEnglish` varchar (256)  default "" COMMENT '显示英文' AFTER dutyContent;
 

base-manager/src/main/java/com/mortals/xhx/busiz/web/DemoWebApiController.java

@@ -12,6 +12,7 @@ import com.mortals.framework.web.BaseJsonBodyController;
 import com.mortals.xhx.module.dept.model.DeptEntity;
 import com.mortals.xhx.module.dept.model.DeptQuery;
 import com.mortals.xhx.module.dept.service.DeptService;
+import com.mortals.xhx.module.matter.model.MatterEntity;
 import com.mortals.xhx.module.matter.model.MatterQuery;
 import com.mortals.xhx.module.matter.model.vo.MatterInfo;
 import com.mortals.xhx.module.matter.service.MatterService;
@@ -66,6 +67,8 @@ public class DemoWebApiController {
     private WindowMatterService windowMatterService;
     @Autowired
     private DeptService deptService;
+    @Autowired
+    private MatterService matterService;
 
 
     @PostMapping(value = "testGov")
@@ -103,6 +106,23 @@ public class DemoWebApiController {
         return Rest.ok(cookieStr);
     }
 
+    @PostMapping(value = "reEventShow")
+    @UnAuth
+    public Rest<String> reEventShow() {
+        List<SiteMatterEntity> siteMatterEntities = siteMatterService.find(new SiteMatterQuery());
+        for (SiteMatterEntity siteMatterEntity : siteMatterEntities) {
+            if(ObjectUtils.isEmpty(siteMatterEntity.getEventTypeShow())){
+                MatterEntity matterEntity = matterService.get(siteMatterEntity.getMatterId());
+                if(!ObjectUtils.isEmpty(matterEntity)&&!ObjectUtils.isEmpty(matterEntity.getEventTypeShow())){
+                    siteMatterEntity.setEventTypeShow(matterEntity.getEventTypeShow());
+                    siteMatterService.update(siteMatterEntity);
+                }
+            }
+        }
+
+        return Rest.ok();
+    }
+
 
     @PostMapping(value = "reDepts")
     @UnAuth

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

@@ -6,7 +6,7 @@ import com.mortals.xhx.module.site.model.SiteMatterEntity;
  * 站点事项查询对象
  *
  * @author zxfei
- * @date 2022-11-16
+ * @date 2023-02-21
  */
 public class SiteMatterQuery extends SiteMatterEntity {
     /** 开始 序号，主键，自增长 */
@@ -21,6 +21,9 @@ public class SiteMatterQuery extends SiteMatterEntity {
     /** 序号，主键，自增长列表 */
     private List <Long> idList;
 
+    /** 序号，主键，自增长排除列表 */
+    private List <Long> idNotList;
+
     /** 开始 站点ID */
     private Long siteIdStart;
 
@@ -33,9 +36,14 @@ public class SiteMatterQuery extends SiteMatterEntity {
     /** 站点ID列表 */
     private List <Long> siteIdList;
 
+    /** 站点ID排除列表 */
+    private List <Long> siteIdNotList;
+
     /** 站点名称 */
     private List<String> siteNameList;
 
+    /** 站点名称排除列表 */
+    private List <String> siteNameNotList;
     /** 开始 事项ID */
     private Long matterIdStart;
 
@@ -48,12 +56,19 @@ public class SiteMatterQuery extends SiteMatterEntity {
     /** 事项ID列表 */
     private List <Long> matterIdList;
 
+    /** 事项ID排除列表 */
+    private List <Long> matterIdNotList;
+
     /** 事项名称 */
     private List<String> matterNameList;
 
+    /** 事项名称排除列表 */
+    private List <String> matterNameNotList;
     /** 事项编码 */
     private List<String> matterCodeList;
 
+    /** 事项编码排除列表 */
+    private List <String> matterCodeNotList;
     /** 开始 部门ID */
     private Long deptIdStart;
 
@@ -66,9 +81,19 @@ public class SiteMatterQuery extends SiteMatterEntity {
     /** 部门ID列表 */
     private List <Long> deptIdList;
 
+    /** 部门ID排除列表 */
+    private List <Long> deptIdNotList;
+
     /** 部门名称 */
     private List<String> deptNameList;
 
+    /** 部门名称排除列表 */
+    private List <String> deptNameNotList;
+    /** 事项类型 */
+    private List<String> eventTypeShowList;
+
+    /** 事项类型排除列表 */
+    private List <String> eventTypeShowNotList;
     /** 开始 事项来源 */
     private Integer sourceStart;
 
@@ -81,9 +106,14 @@ public class SiteMatterQuery extends SiteMatterEntity {
     /** 事项来源列表 */
     private List <Integer> sourceList;
 
+    /** 事项来源排除列表 */
+    private List <Integer> sourceNotList;
+
     /** 部门编号 */
     private List<String> deptCodeList;
 
+    /** 部门编号排除列表 */
+    private List <String> deptCodeNotList;
     /** 开始 创建时间 */
     private String createTimeStart;
 
@@ -102,6 +132,9 @@ public class SiteMatterQuery extends SiteMatterEntity {
     /** 创建用户列表 */
     private List <Long> createUserIdList;
 
+    /** 创建用户排除列表 */
+    private List <Long> createUserIdNotList;
+
     /** 开始 修改时间 */
     private String updateTimeStart;
 
@@ -180,6 +213,23 @@ public class SiteMatterQuery extends SiteMatterEntity {
         this.idList = idList;
     }
 
+    /**
+     * 获取 序号，主键，自增长
+     * @return idNotList
+     */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+     * 设置 序号，主键，自增长
+     * @param idNotList
+     */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
     /**
      * 获取 开始 站点ID
      * @return siteIdStart
@@ -244,6 +294,23 @@ public class SiteMatterQuery extends SiteMatterEntity {
         this.siteIdList = siteIdList;
     }
 
+    /**
+     * 获取 站点ID
+     * @return siteIdNotList
+     */
+    public List<Long> getSiteIdNotList(){
+        return this.siteIdNotList;
+    }
+
+    /**
+     * 设置 站点ID
+     * @param siteIdNotList
+     */
+    public void setSiteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+    }
+
+
     /**
      * 获取 站点名称
      * @return siteNameList
@@ -259,6 +326,23 @@ public class SiteMatterQuery extends SiteMatterEntity {
     public void setSiteNameList(List<String> siteNameList){
         this.siteNameList = siteNameList;
     }
+
+    /**
+     * 获取 站点名称
+     * @return siteNameNotList
+     */
+    public List<String> getSiteNameNotList(){
+        return this.siteNameNotList;
+    }
+
+    /**
+     * 设置 站点名称
+     * @param siteNameNotList
+     */
+    public void setSiteNameNotList(List<String> siteNameNotList){
+        this.siteNameNotList = siteNameNotList;
+    }
+
     /**
      * 获取 开始 事项ID
      * @return matterIdStart
@@ -323,6 +407,23 @@ public class SiteMatterQuery extends SiteMatterEntity {
         this.matterIdList = matterIdList;
     }
 
+    /**
+     * 获取 事项ID
+     * @return matterIdNotList
+     */
+    public List<Long> getMatterIdNotList(){
+        return this.matterIdNotList;
+    }
+
+    /**
+     * 设置 事项ID
+     * @param matterIdNotList
+     */
+    public void setMatterIdNotList(List<Long> matterIdNotList){
+        this.matterIdNotList = matterIdNotList;
+    }
+
+
     /**
      * 获取 事项名称
      * @return matterNameList
@@ -338,6 +439,23 @@ public class SiteMatterQuery extends SiteMatterEntity {
     public void setMatterNameList(List<String> matterNameList){
         this.matterNameList = matterNameList;
     }
+
+    /**
+     * 获取 事项名称
+     * @return matterNameNotList
+     */
+    public List<String> getMatterNameNotList(){
+        return this.matterNameNotList;
+    }
+
+    /**
+     * 设置 事项名称
+     * @param matterNameNotList
+     */
+    public void setMatterNameNotList(List<String> matterNameNotList){
+        this.matterNameNotList = matterNameNotList;
+    }
+
     /**
      * 获取 事项编码
      * @return matterCodeList
@@ -353,6 +471,23 @@ public class SiteMatterQuery extends SiteMatterEntity {
     public void setMatterCodeList(List<String> matterCodeList){
         this.matterCodeList = matterCodeList;
     }
+
+    /**
+     * 获取 事项编码
+     * @return matterCodeNotList
+     */
+    public List<String> getMatterCodeNotList(){
+        return this.matterCodeNotList;
+    }
+
+    /**
+     * 设置 事项编码
+     * @param matterCodeNotList
+     */
+    public void setMatterCodeNotList(List<String> matterCodeNotList){
+        this.matterCodeNotList = matterCodeNotList;
+    }
+
     /**
      * 获取 开始 部门ID
      * @return deptIdStart
@@ -417,6 +552,23 @@ public class SiteMatterQuery extends SiteMatterEntity {
         this.deptIdList = deptIdList;
     }
 
+    /**
+     * 获取 部门ID
+     * @return deptIdNotList
+     */
+    public List<Long> getDeptIdNotList(){
+        return this.deptIdNotList;
+    }
+
+    /**
+     * 设置 部门ID
+     * @param deptIdNotList
+     */
+    public void setDeptIdNotList(List<Long> deptIdNotList){
+        this.deptIdNotList = deptIdNotList;
+    }
+
+
     /**
      * 获取 部门名称
      * @return deptNameList
@@ -432,6 +584,55 @@ public class SiteMatterQuery extends SiteMatterEntity {
     public void setDeptNameList(List<String> deptNameList){
         this.deptNameList = deptNameList;
     }
+
+    /**
+     * 获取 部门名称
+     * @return deptNameNotList
+     */
+    public List<String> getDeptNameNotList(){
+        return this.deptNameNotList;
+    }
+
+    /**
+     * 设置 部门名称
+     * @param deptNameNotList
+     */
+    public void setDeptNameNotList(List<String> deptNameNotList){
+        this.deptNameNotList = deptNameNotList;
+    }
+
+    /**
+     * 获取 事项类型
+     * @return eventTypeShowList
+     */
+    public List<String> getEventTypeShowList(){
+        return this.eventTypeShowList;
+    }
+
+    /**
+     * 设置 事项类型
+     * @param eventTypeShowList
+     */
+    public void setEventTypeShowList(List<String> eventTypeShowList){
+        this.eventTypeShowList = eventTypeShowList;
+    }
+
+    /**
+     * 获取 事项类型
+     * @return eventTypeShowNotList
+     */
+    public List<String> getEventTypeShowNotList(){
+        return this.eventTypeShowNotList;
+    }
+
+    /**
+     * 设置 事项类型
+     * @param eventTypeShowNotList
+     */
+    public void setEventTypeShowNotList(List<String> eventTypeShowNotList){
+        this.eventTypeShowNotList = eventTypeShowNotList;
+    }
+
     /**
      * 获取 开始 事项来源
      * @return sourceStart
@@ -496,6 +697,23 @@ public class SiteMatterQuery extends SiteMatterEntity {
         this.sourceList = sourceList;
     }
 
+    /**
+     * 获取 事项来源
+     * @return sourceNotList
+     */
+    public List<Integer> getSourceNotList(){
+        return this.sourceNotList;
+    }
+
+    /**
+     * 设置 事项来源
+     * @param sourceNotList
+     */
+    public void setSourceNotList(List<Integer> sourceNotList){
+        this.sourceNotList = sourceNotList;
+    }
+
+
     /**
      * 获取 部门编号
      * @return deptCodeList
@@ -511,6 +729,23 @@ public class SiteMatterQuery extends SiteMatterEntity {
     public void setDeptCodeList(List<String> deptCodeList){
         this.deptCodeList = deptCodeList;
     }
+
+    /**
+     * 获取 部门编号
+     * @return deptCodeNotList
+     */
+    public List<String> getDeptCodeNotList(){
+        return this.deptCodeNotList;
+    }
+
+    /**
+     * 设置 部门编号
+     * @param deptCodeNotList
+     */
+    public void setDeptCodeNotList(List<String> deptCodeNotList){
+        this.deptCodeNotList = deptCodeNotList;
+    }
+
     /**
      * 获取 开始 创建时间
      * @return createTimeStart
@@ -607,6 +842,23 @@ public class SiteMatterQuery extends SiteMatterEntity {
         this.createUserIdList = createUserIdList;
     }
 
+    /**
+     * 获取 创建用户
+     * @return createUserIdNotList
+     */
+    public List<Long> getCreateUserIdNotList(){
+        return this.createUserIdNotList;
+    }
+
+    /**
+     * 设置 创建用户
+     * @param createUserIdNotList
+     */
+    public void setCreateUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+    }
+
+
     /**
      * 获取 开始 修改时间
      * @return updateTimeStart
@@ -684,6 +936,15 @@ public class SiteMatterQuery extends SiteMatterEntity {
         return this;
     }
 
+    /**
+     * 设置 序号，主键，自增长
+     * @param idNotList
+     */
+    public SiteMatterQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+    }
+
     /**
      * 设置  站点ID
      * @param siteId
@@ -729,6 +990,15 @@ public class SiteMatterQuery extends SiteMatterEntity {
         return this;
     }
 
+    /**
+     * 设置 站点ID
+     * @param siteIdNotList
+     */
+    public SiteMatterQuery siteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+        return this;
+    }
+
 
     /**
      * 设置 站点名称
@@ -793,6 +1063,15 @@ public class SiteMatterQuery extends SiteMatterEntity {
         return this;
     }
 
+    /**
+     * 设置 事项ID
+     * @param matterIdNotList
+     */
+    public SiteMatterQuery matterIdNotList(List<Long> matterIdNotList){
+        this.matterIdNotList = matterIdNotList;
+        return this;
+    }
+
 
     /**
      * 设置 事项名称
@@ -876,6 +1155,15 @@ public class SiteMatterQuery extends SiteMatterEntity {
         return this;
     }
 
+    /**
+     * 设置 部门ID
+     * @param deptIdNotList
+     */
+    public SiteMatterQuery deptIdNotList(List<Long> deptIdNotList){
+        this.deptIdNotList = deptIdNotList;
+        return this;
+    }
+
 
     /**
      * 设置 部门名称
@@ -895,6 +1183,25 @@ public class SiteMatterQuery extends SiteMatterEntity {
         return this;
     }
 
+
+    /**
+     * 设置 事项类型
+     * @param eventTypeShow
+     */
+    public SiteMatterQuery eventTypeShow(String eventTypeShow){
+        setEventTypeShow(eventTypeShow);
+        return this;
+    }
+
+    /**
+     * 设置 事项类型
+     * @param eventTypeShowList
+     */
+    public SiteMatterQuery eventTypeShowList(List<String> eventTypeShowList){
+        this.eventTypeShowList = eventTypeShowList;
+        return this;
+    }
+
     /**
      * 设置  事项来源
      * @param source
@@ -940,6 +1247,15 @@ public class SiteMatterQuery extends SiteMatterEntity {
         return this;
     }
 
+    /**
+     * 设置 事项来源
+     * @param sourceNotList
+     */
+    public SiteMatterQuery sourceNotList(List<Integer> sourceNotList){
+        this.sourceNotList = sourceNotList;
+        return this;
+    }
+
 
     /**
      * 设置 部门编号
@@ -1005,6 +1321,15 @@ public class SiteMatterQuery extends SiteMatterEntity {
         return this;
     }
 
+    /**
+     * 设置 创建用户
+     * @param createUserIdNotList
+     */
+    public SiteMatterQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        return this;
+    }
+
 
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)

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

@@ -34,4 +34,7 @@ public class SiteMatterVo extends BaseEntityLong {
      */
     private  String areaCode;
 
+    /** 事项类型排除列表 */
+    private List <String> eventTypeShowNotList;
+
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.site.web;
 
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.site.model.SiteMatterEntity;
 import com.mortals.xhx.module.site.service.SiteMatterService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.Map;
+
 /**
  * 站点事项
  *
@@ -27,4 +33,19 @@ public class SiteMatterController extends BaseCRUDJsonBodyMappingController<Site
         super.setModuleDesc("站点事项");
     }
 
+    /**
+     * @param query
+     * @param model
+     * @param context
+     * @throws AppException
+     */
+    @Override
+    protected void doListBefore(SiteMatterEntity query, Map<String, Object> model, Context context) throws AppException {
+        super.doListBefore(query, model, context);
+        if(ObjectUtils.isEmpty(query.getEventTypeShowNotList())){
+            ArrayList<String> notList = new ArrayList<>();
+            notList.add("行政处罚");
+            query.setEventTypeShowNotList(notList);
+        }
+    }
 }
\ No newline at end of file

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

@@ -13,6 +13,7 @@
         <result property="matterCode" column="matterCode" />
         <result property="deptId" column="deptId" />
         <result property="deptName" column="deptName" />
+        <result property="eventTypeShow" column="eventTypeShow" />
         <result property="source" column="source" />
         <result property="deptCode" column="deptCode" />
         <result property="createTime" column="createTime" />
@@ -49,6 +50,9 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptName') or colPickMode == 1 and data.containsKey('deptName')))">
                 a.deptName,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('eventTypeShow') or colPickMode == 1 and data.containsKey('eventTypeShow')))">
+                a.eventTypeShow,
+            </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('source') or colPickMode == 1 and data.containsKey('source')))">
                 a.source,
             </if>
@@ -69,18 +73,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="SiteMatterEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_sys_site_matter
-        (siteId,siteName,matterId,matterName,matterCode,deptId,deptName,source,deptCode,createTime,createUserId,updateTime)
+        (siteId,siteName,matterId,matterName,matterCode,deptId,deptName,eventTypeShow,source,deptCode,createTime,createUserId,updateTime)
         VALUES
-        (#{siteId},#{siteName},#{matterId},#{matterName},#{matterCode},#{deptId},#{deptName},#{source},#{deptCode},#{createTime},#{createUserId},#{updateTime})
+        (#{siteId},#{siteName},#{matterId},#{matterName},#{matterCode},#{deptId},#{deptName},#{eventTypeShow},#{source},#{deptCode},#{createTime},#{createUserId},#{updateTime})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_sys_site_matter
-        (siteId,siteName,matterId,matterName,matterCode,deptId,deptName,source,deptCode,createTime,createUserId,updateTime)
+        (siteId,siteName,matterId,matterName,matterCode,deptId,deptName,eventTypeShow,source,deptCode,createTime,createUserId,updateTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.siteId},#{item.siteName},#{item.matterId},#{item.matterName},#{item.matterCode},#{item.deptId},#{item.deptName},#{item.source},#{item.deptCode},#{item.createTime},#{item.createUserId},#{item.updateTime})
+            (#{item.siteId},#{item.siteName},#{item.matterId},#{item.matterName},#{item.matterCode},#{item.deptId},#{item.deptName},#{item.eventTypeShow},#{item.source},#{item.deptCode},#{item.createTime},#{item.createUserId},#{item.updateTime})
         </foreach>
     </insert>
 
@@ -120,6 +124,9 @@
             <if test="(colPickMode==0 and data.containsKey('deptName')) or (colPickMode==1 and !data.containsKey('deptName'))">
                 a.deptName=#{data.deptName},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('eventTypeShow')) or (colPickMode==1 and !data.containsKey('eventTypeShow'))">
+                a.eventTypeShow=#{data.eventTypeShow},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('source')) or (colPickMode==1 and !data.containsKey('source'))">
                 a.source=#{data.source},
             </if>
@@ -217,6 +224,13 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="eventTypeShow=(case" suffix="ELSE eventTypeShow end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('eventTypeShow')) or (colPickMode==1 and !item.containsKey('eventTypeShow'))">
+                        when a.id=#{item.id} then #{item.eventTypeShow}
+                    </if>
+                </foreach>
+            </trim>
             <trim prefix="source=(case" suffix="ELSE source end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
                     <choose>
@@ -285,6 +299,21 @@
             #{item}
         </foreach>
     </delete>
+    <!-- 根据主健列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeyList">
+        delete from mortals_sys_site_matter where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <!-- 根据对象列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByEntityList">
+        delete from mortals_sys_site_matter where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </delete>
     <!-- 根据paramDto删除一批 -->
     <delete id="deleteByMap" parameterType="paramDto">
         delete a.* from mortals_sys_site_matter as a
@@ -377,6 +406,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('idNotList')">
+            ${_conditionType_} a.id not in
+            <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
             ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
         </if>
@@ -398,6 +433,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('siteIdNotList')">
+            ${_conditionType_} a.siteId not in
+            <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
             ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
         </if>
@@ -420,6 +461,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('siteNameNotList')">
+            ${_conditionType_} a.siteName not in
+            <foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('matterId')">
             <if test="conditionParamRef.matterId != null ">
                 ${_conditionType_} a.matterId = #{${_conditionParam_}.matterId}
@@ -434,6 +481,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('matterIdNotList')">
+            ${_conditionType_} a.matterId not in
+            <foreach collection="conditionParamRef.matterIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('matterIdStart') and conditionParamRef.matterIdStart != null">
             ${_conditionType_} a.matterId <![CDATA[ >= ]]> #{${_conditionParam_}.matterIdStart}
         </if>
@@ -456,6 +509,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('matterNameNotList')">
+            ${_conditionType_} a.matterName not in
+            <foreach collection="conditionParamRef.matterNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('matterCode')">
             <if test="conditionParamRef.matterCode != null and conditionParamRef.matterCode != ''">
@@ -471,6 +530,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('matterCodeNotList')">
+            ${_conditionType_} a.matterCode not in
+            <foreach collection="conditionParamRef.matterCodeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('deptId')">
             <if test="conditionParamRef.deptId != null ">
                 ${_conditionType_} a.deptId = #{${_conditionParam_}.deptId}
@@ -485,6 +550,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('deptIdNotList')">
+            ${_conditionType_} a.deptId not in
+            <foreach collection="conditionParamRef.deptIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('deptIdStart') and conditionParamRef.deptIdStart != null">
             ${_conditionType_} a.deptId <![CDATA[ >= ]]> #{${_conditionParam_}.deptIdStart}
         </if>
@@ -507,6 +578,33 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('deptNameNotList')">
+            ${_conditionType_} a.deptName not in
+            <foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('eventTypeShow')">
+            <if test="conditionParamRef.eventTypeShow != null and conditionParamRef.eventTypeShow != ''">
+                ${_conditionType_} a.eventTypeShow like #{${_conditionParam_}.eventTypeShow}
+            </if>
+            <if test="conditionParamRef.eventTypeShow == null">
+                ${_conditionType_} a.eventTypeShow is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('eventTypeShowList')">
+            ${_conditionType_} a.eventTypeShow in
+            <foreach collection="conditionParamRef.eventTypeShowList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('eventTypeShowNotList')">
+            ${_conditionType_} a.eventTypeShow not in
+            <foreach collection="conditionParamRef.eventTypeShowNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('source')">
             <if test="conditionParamRef.source != null ">
                 ${_conditionType_} a.source = #{${_conditionParam_}.source}
@@ -521,6 +619,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('sourceNotList')">
+            ${_conditionType_} a.source not in
+            <foreach collection="conditionParamRef.sourceNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('sourceStart') and conditionParamRef.sourceStart != null">
             ${_conditionType_} a.source <![CDATA[ >= ]]> #{${_conditionParam_}.sourceStart}
         </if>
@@ -543,6 +647,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('deptCodeNotList')">
+            ${_conditionType_} a.deptCode not in
+            <foreach collection="conditionParamRef.deptCodeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('createTime')">
             <if test="conditionParamRef.createTime != null ">
@@ -572,6 +682,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('createUserIdNotList')">
+            ${_conditionType_} a.createUserId not in
+            <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
             ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
         </if>
@@ -647,6 +763,11 @@
                     <if test='orderCol.deptName != null and "DESC".equalsIgnoreCase(orderCol.deptName)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('eventTypeShow')">
+                    a.eventTypeShow
+                    <if test='orderCol.eventTypeShow != null and "DESC".equalsIgnoreCase(orderCol.eventTypeShow)'>DESC</if>
+                    ,
+                </if>
                 <if test="orderCol.containsKey('source')">
                     a.source
                     <if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>DESC</if>

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

@@ -21,9 +21,8 @@ Content-Type: application/json
 
 {
   "siteId": 1,
-  "eventTypeShowNotList": ["行政处罚"],
   "page": 1,
-  "size": 10
+  "size": 100
 }
 
 ###微官网事项列表