Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/db/add.sql

@@ -6,3 +6,6 @@ ALTER TABLE mortals_sys_window ADD COLUMN `duty` tinyint (1)  default 0   COMMEN
 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;
 
+ALTER TABLE mortals_sys_dept ADD COLUMN  `total` int(9)    DEFAULT '0' COMMENT '关联事项数量' AFTER updateTime;
+
+INSERT INTO `mortals_xhx_task` VALUES (null, '统计站点部门事项数', 'StatSiteDeptMatterTask', 0, 'StatSiteDeptMatterTask', NULL, NULL, 1, 0, '23:21', NULL, '172.17.0.1', '2023-03-05 23:21:01', 0, NULL, NULL, NULL);

base-manager/db/base_modules.sql

@@ -212,6 +212,7 @@ CREATE TABLE mortals_sys_dept
     `createTime`   datetime COMMENT '创建时间',
     `createUserId` bigint(20) COMMENT '创建用户',
     `updateTime`   datetime COMMENT '修改时间',
+    `total` int(9)    DEFAULT '0'  COMMENT '关联事项数量',
     PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='部门';
 

base-manager/src/main/java/com/mortals/xhx/daemon/task/StatSiteDeptMatterTaskImpl.java

+package com.mortals.xhx.daemon.task;
+
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.service.ITask;
+import com.mortals.framework.service.ITaskExcuteService;
+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.site.model.SiteMatterQuery;
+import com.mortals.xhx.module.site.service.SiteMatterService;
+import com.mortals.xhx.module.site.service.SiteService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 统计站点部门事项
+ */
+@Slf4j
+@Service("StatSiteDeptMatterTask")
+public class StatSiteDeptMatterTaskImpl implements ITaskExcuteService {
+    @Autowired
+    private DeptService deptService;
+    @Autowired
+    private SiteMatterService siteMatterService;
+
+
+    @Override
+    public void excuteTask(ITask task) throws AppException {
+        log.info("开始同步事项列表！");
+        List<DeptEntity> deptEntities = deptService.find(new DeptQuery());
+        for (DeptEntity deptEntity : deptEntities) {
+            int total = siteMatterService.count(new SiteMatterQuery().deptId(deptEntity.getId()), null);
+            if (total > 0) {
+                deptEntity.setTotal(total);
+                deptEntity.setUpdateTime(new Date());
+                deptService.update(deptEntity, null);
+            }
+
+        }
+
+    }
+
+    @Override
+    public void stopTask(ITask task) throws AppException {
+
+    }
+}

base-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java

@@ -15,6 +15,7 @@ import com.mortals.xhx.common.pdu.user.UserPdu;
 import com.mortals.xhx.common.utils.BeanUtil;
 import com.mortals.xhx.common.utils.SyncTreeSiteThread;
 import com.mortals.xhx.feign.user.IUserFeign;
+import com.mortals.xhx.module.dept.service.DeptService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

base-manager/src/main/java/com/mortals/xhx/module/dept/model/DeptEntity.java

@@ -10,7 +10,7 @@ import com.mortals.xhx.module.dept.model.vo.DeptVo;
  * 部门实体对象
  *
  * @author zxfei
- * @date 2022-11-23
+ * @date 2023-03-06
  */
 
 public class DeptEntity extends DeptVo {
@@ -84,6 +84,10 @@ public class DeptEntity extends DeptVo {
      * 部门来源
      */
     private Integer source;
+    /**
+     * 关联事项数量
+     */
+    private Integer total;
 
 
 
@@ -326,6 +330,20 @@ public class DeptEntity extends DeptVo {
     public void setSource(Integer source){
         this.source = source;
     }
+    /**
+     * 获取 关联事项数量
+     * @return Integer
+     */
+    public Integer getTotal(){
+        return total;
+    }
+    /**
+     * 设置 关联事项数量
+     * @param total
+     */
+    public void setTotal(Integer total){
+        this.total = total;
+    }
 
 
 
@@ -365,6 +383,7 @@ public class DeptEntity extends DeptVo {
         sb.append(",isEnglish:").append(getIsEnglish());
         sb.append(",sort:").append(getSort());
         sb.append(",source:").append(getSource());
+        sb.append(",total:").append(getTotal());
         return sb.toString();
     }
 
@@ -403,5 +422,7 @@ public class DeptEntity extends DeptVo {
         this.sort = 0;
 
         this.source = 0;
+
+        this.total = 0;
     }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/dept/model/DeptQuery.java

@@ -6,7 +6,7 @@ import com.mortals.xhx.module.dept.model.DeptEntity;
  * 部门查询对象
  *
  * @author zxfei
- * @date 2022-11-23
+ * @date 2023-03-06
  */
 public class DeptQuery extends DeptEntity {
     /** 开始 序号，主键，自增长 */
@@ -21,18 +21,29 @@ public class DeptQuery extends DeptEntity {
     /** 序号，主键，自增长列表 */
     private List <Long> idList;
 
+    /** 序号，主键，自增长排除列表 */
+    private List <Long> idNotList;
+
     /** 从政务系统来的部门id */
     private List<String> tidList;
 
+    /** 从政务系统来的部门id排除列表 */
+    private List <String> tidNotList;
     /** 从政务系统来的部门name */
     private List<String> tnameList;
 
+    /** 从政务系统来的部门name排除列表 */
+    private List <String> tnameNotList;
     /** 部门名称 */
     private List<String> nameList;
 
+    /** 部门名称排除列表 */
+    private List <String> nameNotList;
     /** 从政务系统来的别名 */
     private List<String> simpleNameList;
 
+    /** 从政务系统来的别名排除列表 */
+    private List <String> simpleNameNotList;
     /** 开始 站点ID */
     private Long siteIdStart;
 
@@ -45,15 +56,24 @@ public class DeptQuery extends DeptEntity {
     /** 站点ID列表 */
     private List <Long> siteIdList;
 
+    /** 站点ID排除列表 */
+    private List <Long> siteIdNotList;
+
     /** 部门简称 */
     private List<String> deptAbbList;
 
+    /** 部门简称排除列表 */
+    private List <String> deptAbbNotList;
     /** 部门电话 */
     private List<String> deptTelphoneList;
 
+    /** 部门电话排除列表 */
+    private List <String> deptTelphoneNotList;
     /** 部门编号 */
     private List<String> deptNumberList;
 
+    /** 部门编号排除列表 */
+    private List <String> deptNumberNotList;
     /** 开始 填单机展示 (0.否，1.是)  */
     private Integer isAutotableStart;
 
@@ -66,6 +86,9 @@ public class DeptQuery extends DeptEntity {
     /** 填单机展示 (0.否，1.是) 列表 */
     private List <Integer> isAutotableList;
 
+    /** 填单机展示 (0.否，1.是) 排除列表 */
+    private List <Integer> isAutotableNotList;
+
     /** 开始 预约展示 (0.否，1.是)  */
     private Integer isOrderStart;
 
@@ -78,6 +101,9 @@ public class DeptQuery extends DeptEntity {
     /** 预约展示 (0.否，1.是) 列表 */
     private List <Integer> isOrderList;
 
+    /** 预约展示 (0.否，1.是) 排除列表 */
+    private List <Integer> isOrderNotList;
+
     /** 开始 背靠背展示 (0.否，1.是)  */
     private Integer isBkbStart;
 
@@ -90,6 +116,9 @@ public class DeptQuery extends DeptEntity {
     /** 背靠背展示 (0.否，1.是) 列表 */
     private List <Integer> isBkbList;
 
+    /** 背靠背展示 (0.否，1.是) 排除列表 */
+    private List <Integer> isBkbNotList;
+
     /** 开始 办事指南展示 (0.否，1.是)  */
     private Integer isWorkGuideStart;
 
@@ -102,6 +131,9 @@ public class DeptQuery extends DeptEntity {
     /** 办事指南展示 (0.否，1.是) 列表 */
     private List <Integer> isWorkGuideList;
 
+    /** 办事指南展示 (0.否，1.是) 排除列表 */
+    private List <Integer> isWorkGuideNotList;
+
     /** 开始 是否使用 (0.否，1.是)  */
     private Integer usValidStart;
 
@@ -114,6 +146,9 @@ public class DeptQuery extends DeptEntity {
     /** 是否使用 (0.否，1.是) 列表 */
     private List <Integer> usValidList;
 
+    /** 是否使用 (0.否，1.是) 排除列表 */
+    private List <Integer> usValidNotList;
+
     /** 开始 部门电话是否展示 (0.否，1.是)  */
     private Integer isSecphoneStart;
 
@@ -126,6 +161,9 @@ public class DeptQuery extends DeptEntity {
     /** 部门电话是否展示 (0.否，1.是) 列表 */
     private List <Integer> isSecphoneList;
 
+    /** 部门电话是否展示 (0.否，1.是) 排除列表 */
+    private List <Integer> isSecphoneNotList;
+
     /** 开始 是否展示英文 (0.否，1.是)  */
     private Integer isEnglishStart;
 
@@ -138,6 +176,9 @@ public class DeptQuery extends DeptEntity {
     /** 是否展示英文 (0.否，1.是) 列表 */
     private List <Integer> isEnglishList;
 
+    /** 是否展示英文 (0.否，1.是) 排除列表 */
+    private List <Integer> isEnglishNotList;
+
     /** 开始 排序 */
     private Integer sortStart;
 
@@ -150,6 +191,9 @@ public class DeptQuery extends DeptEntity {
     /** 排序列表 */
     private List <Integer> sortList;
 
+    /** 排序排除列表 */
+    private List <Integer> sortNotList;
+
     /** 开始 部门来源 */
     private Integer sourceStart;
 
@@ -162,6 +206,9 @@ public class DeptQuery extends DeptEntity {
     /** 部门来源列表 */
     private List <Integer> sourceList;
 
+    /** 部门来源排除列表 */
+    private List <Integer> sourceNotList;
+
     /** 开始 创建时间 */
     private String createTimeStart;
 
@@ -180,12 +227,30 @@ public class DeptQuery extends DeptEntity {
     /** 创建用户列表 */
     private List <Long> createUserIdList;
 
+    /** 创建用户排除列表 */
+    private List <Long> createUserIdNotList;
+
     /** 开始 修改时间 */
     private String updateTimeStart;
 
     /** 结束 修改时间 */
     private String updateTimeEnd;
 
+    /** 开始 关联事项数量 */
+    private Integer totalStart;
+
+    /** 结束 关联事项数量 */
+    private Integer totalEnd;
+
+    /** 增加 关联事项数量 */
+    private Integer totalIncrement;
+
+    /** 关联事项数量列表 */
+    private List <Integer> totalList;
+
+    /** 关联事项数量排除列表 */
+    private List <Integer> totalNotList;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<DeptQuery> orConditionList;
 
@@ -258,6 +323,23 @@ public class DeptQuery extends DeptEntity {
         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 tidList
@@ -273,6 +355,23 @@ public class DeptQuery extends DeptEntity {
     public void setTidList(List<String> tidList){
         this.tidList = tidList;
     }
+
+    /**
+     * 获取 从政务系统来的部门id
+     * @return tidNotList
+     */
+    public List<String> getTidNotList(){
+        return this.tidNotList;
+    }
+
+    /**
+     * 设置 从政务系统来的部门id
+     * @param tidNotList
+     */
+    public void setTidNotList(List<String> tidNotList){
+        this.tidNotList = tidNotList;
+    }
+
     /**
      * 获取 从政务系统来的部门name
      * @return tnameList
@@ -288,6 +387,23 @@ public class DeptQuery extends DeptEntity {
     public void setTnameList(List<String> tnameList){
         this.tnameList = tnameList;
     }
+
+    /**
+     * 获取 从政务系统来的部门name
+     * @return tnameNotList
+     */
+    public List<String> getTnameNotList(){
+        return this.tnameNotList;
+    }
+
+    /**
+     * 设置 从政务系统来的部门name
+     * @param tnameNotList
+     */
+    public void setTnameNotList(List<String> tnameNotList){
+        this.tnameNotList = tnameNotList;
+    }
+
     /**
      * 获取 部门名称
      * @return nameList
@@ -303,6 +419,23 @@ public class DeptQuery extends DeptEntity {
     public void setNameList(List<String> nameList){
         this.nameList = nameList;
     }
+
+    /**
+     * 获取 部门名称
+     * @return nameNotList
+     */
+    public List<String> getNameNotList(){
+        return this.nameNotList;
+    }
+
+    /**
+     * 设置 部门名称
+     * @param nameNotList
+     */
+    public void setNameNotList(List<String> nameNotList){
+        this.nameNotList = nameNotList;
+    }
+
     /**
      * 获取 从政务系统来的别名
      * @return simpleNameList
@@ -318,6 +451,23 @@ public class DeptQuery extends DeptEntity {
     public void setSimpleNameList(List<String> simpleNameList){
         this.simpleNameList = simpleNameList;
     }
+
+    /**
+     * 获取 从政务系统来的别名
+     * @return simpleNameNotList
+     */
+    public List<String> getSimpleNameNotList(){
+        return this.simpleNameNotList;
+    }
+
+    /**
+     * 设置 从政务系统来的别名
+     * @param simpleNameNotList
+     */
+    public void setSimpleNameNotList(List<String> simpleNameNotList){
+        this.simpleNameNotList = simpleNameNotList;
+    }
+
     /**
      * 获取 开始 站点ID
      * @return siteIdStart
@@ -382,6 +532,23 @@ public class DeptQuery extends DeptEntity {
         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 deptAbbList
@@ -397,6 +564,23 @@ public class DeptQuery extends DeptEntity {
     public void setDeptAbbList(List<String> deptAbbList){
         this.deptAbbList = deptAbbList;
     }
+
+    /**
+     * 获取 部门简称
+     * @return deptAbbNotList
+     */
+    public List<String> getDeptAbbNotList(){
+        return this.deptAbbNotList;
+    }
+
+    /**
+     * 设置 部门简称
+     * @param deptAbbNotList
+     */
+    public void setDeptAbbNotList(List<String> deptAbbNotList){
+        this.deptAbbNotList = deptAbbNotList;
+    }
+
     /**
      * 获取 部门电话
      * @return deptTelphoneList
@@ -412,6 +596,23 @@ public class DeptQuery extends DeptEntity {
     public void setDeptTelphoneList(List<String> deptTelphoneList){
         this.deptTelphoneList = deptTelphoneList;
     }
+
+    /**
+     * 获取 部门电话
+     * @return deptTelphoneNotList
+     */
+    public List<String> getDeptTelphoneNotList(){
+        return this.deptTelphoneNotList;
+    }
+
+    /**
+     * 设置 部门电话
+     * @param deptTelphoneNotList
+     */
+    public void setDeptTelphoneNotList(List<String> deptTelphoneNotList){
+        this.deptTelphoneNotList = deptTelphoneNotList;
+    }
+
     /**
      * 获取 部门编号
      * @return deptNumberList
@@ -427,6 +628,23 @@ public class DeptQuery extends DeptEntity {
     public void setDeptNumberList(List<String> deptNumberList){
         this.deptNumberList = deptNumberList;
     }
+
+    /**
+     * 获取 部门编号
+     * @return deptNumberNotList
+     */
+    public List<String> getDeptNumberNotList(){
+        return this.deptNumberNotList;
+    }
+
+    /**
+     * 设置 部门编号
+     * @param deptNumberNotList
+     */
+    public void setDeptNumberNotList(List<String> deptNumberNotList){
+        this.deptNumberNotList = deptNumberNotList;
+    }
+
     /**
      * 获取 开始 填单机展示 (0.否，1.是)
      * @return isAutotableStart
@@ -491,6 +709,23 @@ public class DeptQuery extends DeptEntity {
         this.isAutotableList = isAutotableList;
     }
 
+    /**
+     * 获取 填单机展示 (0.否，1.是)
+     * @return isAutotableNotList
+     */
+    public List<Integer> getIsAutotableNotList(){
+        return this.isAutotableNotList;
+    }
+
+    /**
+     * 设置 填单机展示 (0.否，1.是)
+     * @param isAutotableNotList
+     */
+    public void setIsAutotableNotList(List<Integer> isAutotableNotList){
+        this.isAutotableNotList = isAutotableNotList;
+    }
+
+
     /**
      * 获取 开始 预约展示 (0.否，1.是)
      * @return isOrderStart
@@ -555,6 +790,23 @@ public class DeptQuery extends DeptEntity {
         this.isOrderList = isOrderList;
     }
 
+    /**
+     * 获取 预约展示 (0.否，1.是)
+     * @return isOrderNotList
+     */
+    public List<Integer> getIsOrderNotList(){
+        return this.isOrderNotList;
+    }
+
+    /**
+     * 设置 预约展示 (0.否，1.是)
+     * @param isOrderNotList
+     */
+    public void setIsOrderNotList(List<Integer> isOrderNotList){
+        this.isOrderNotList = isOrderNotList;
+    }
+
+
     /**
      * 获取 开始 背靠背展示 (0.否，1.是)
      * @return isBkbStart
@@ -619,6 +871,23 @@ public class DeptQuery extends DeptEntity {
         this.isBkbList = isBkbList;
     }
 
+    /**
+     * 获取 背靠背展示 (0.否，1.是)
+     * @return isBkbNotList
+     */
+    public List<Integer> getIsBkbNotList(){
+        return this.isBkbNotList;
+    }
+
+    /**
+     * 设置 背靠背展示 (0.否，1.是)
+     * @param isBkbNotList
+     */
+    public void setIsBkbNotList(List<Integer> isBkbNotList){
+        this.isBkbNotList = isBkbNotList;
+    }
+
+
     /**
      * 获取 开始 办事指南展示 (0.否，1.是)
      * @return isWorkGuideStart
@@ -683,6 +952,23 @@ public class DeptQuery extends DeptEntity {
         this.isWorkGuideList = isWorkGuideList;
     }
 
+    /**
+     * 获取 办事指南展示 (0.否，1.是)
+     * @return isWorkGuideNotList
+     */
+    public List<Integer> getIsWorkGuideNotList(){
+        return this.isWorkGuideNotList;
+    }
+
+    /**
+     * 设置 办事指南展示 (0.否，1.是)
+     * @param isWorkGuideNotList
+     */
+    public void setIsWorkGuideNotList(List<Integer> isWorkGuideNotList){
+        this.isWorkGuideNotList = isWorkGuideNotList;
+    }
+
+
     /**
      * 获取 开始 是否使用 (0.否，1.是)
      * @return usValidStart
@@ -747,6 +1033,23 @@ public class DeptQuery extends DeptEntity {
         this.usValidList = usValidList;
     }
 
+    /**
+     * 获取 是否使用 (0.否，1.是)
+     * @return usValidNotList
+     */
+    public List<Integer> getUsValidNotList(){
+        return this.usValidNotList;
+    }
+
+    /**
+     * 设置 是否使用 (0.否，1.是)
+     * @param usValidNotList
+     */
+    public void setUsValidNotList(List<Integer> usValidNotList){
+        this.usValidNotList = usValidNotList;
+    }
+
+
     /**
      * 获取 开始 部门电话是否展示 (0.否，1.是)
      * @return isSecphoneStart
@@ -811,6 +1114,23 @@ public class DeptQuery extends DeptEntity {
         this.isSecphoneList = isSecphoneList;
     }
 
+    /**
+     * 获取 部门电话是否展示 (0.否，1.是)
+     * @return isSecphoneNotList
+     */
+    public List<Integer> getIsSecphoneNotList(){
+        return this.isSecphoneNotList;
+    }
+
+    /**
+     * 设置 部门电话是否展示 (0.否，1.是)
+     * @param isSecphoneNotList
+     */
+    public void setIsSecphoneNotList(List<Integer> isSecphoneNotList){
+        this.isSecphoneNotList = isSecphoneNotList;
+    }
+
+
     /**
      * 获取 开始 是否展示英文 (0.否，1.是)
      * @return isEnglishStart
@@ -875,6 +1195,23 @@ public class DeptQuery extends DeptEntity {
         this.isEnglishList = isEnglishList;
     }
 
+    /**
+     * 获取 是否展示英文 (0.否，1.是)
+     * @return isEnglishNotList
+     */
+    public List<Integer> getIsEnglishNotList(){
+        return this.isEnglishNotList;
+    }
+
+    /**
+     * 设置 是否展示英文 (0.否，1.是)
+     * @param isEnglishNotList
+     */
+    public void setIsEnglishNotList(List<Integer> isEnglishNotList){
+        this.isEnglishNotList = isEnglishNotList;
+    }
+
+
     /**
      * 获取 开始 排序
      * @return sortStart
@@ -939,6 +1276,23 @@ public class DeptQuery extends DeptEntity {
         this.sortList = sortList;
     }
 
+    /**
+     * 获取 排序
+     * @return sortNotList
+     */
+    public List<Integer> getSortNotList(){
+        return this.sortNotList;
+    }
+
+    /**
+     * 设置 排序
+     * @param sortNotList
+     */
+    public void setSortNotList(List<Integer> sortNotList){
+        this.sortNotList = sortNotList;
+    }
+
+
     /**
      * 获取 开始 部门来源
      * @return sourceStart
@@ -1003,6 +1357,23 @@ public class DeptQuery extends DeptEntity {
         this.sourceList = sourceList;
     }
 
+    /**
+     * 获取 部门来源
+     * @return sourceNotList
+     */
+    public List<Integer> getSourceNotList(){
+        return this.sourceNotList;
+    }
+
+    /**
+     * 设置 部门来源
+     * @param sourceNotList
+     */
+    public void setSourceNotList(List<Integer> sourceNotList){
+        this.sourceNotList = sourceNotList;
+    }
+
+
     /**
      * 获取 开始 创建时间
      * @return createTimeStart
@@ -1099,6 +1470,23 @@ public class DeptQuery extends DeptEntity {
         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
@@ -1131,6 +1519,87 @@ public class DeptQuery extends DeptEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+     * 获取 开始 关联事项数量
+     * @return totalStart
+     */
+    public Integer getTotalStart(){
+        return this.totalStart;
+    }
+
+    /**
+     * 设置 开始 关联事项数量
+     * @param totalStart
+     */
+    public void setTotalStart(Integer totalStart){
+        this.totalStart = totalStart;
+    }
+
+    /**
+     * 获取 结束 关联事项数量
+     * @return $totalEnd
+     */
+    public Integer getTotalEnd(){
+        return this.totalEnd;
+    }
+
+    /**
+     * 设置 结束 关联事项数量
+     * @param totalEnd
+     */
+    public void setTotalEnd(Integer totalEnd){
+        this.totalEnd = totalEnd;
+    }
+
+    /**
+     * 获取 增加 关联事项数量
+     * @return totalIncrement
+     */
+    public Integer getTotalIncrement(){
+        return this.totalIncrement;
+    }
+
+    /**
+     * 设置 增加 关联事项数量
+     * @param totalIncrement
+     */
+    public void setTotalIncrement(Integer totalIncrement){
+        this.totalIncrement = totalIncrement;
+    }
+
+    /**
+     * 获取 关联事项数量
+     * @return totalList
+     */
+    public List<Integer> getTotalList(){
+        return this.totalList;
+    }
+
+    /**
+     * 设置 关联事项数量
+     * @param totalList
+     */
+    public void setTotalList(List<Integer> totalList){
+        this.totalList = totalList;
+    }
+
+    /**
+     * 获取 关联事项数量
+     * @return totalNotList
+     */
+    public List<Integer> getTotalNotList(){
+        return this.totalNotList;
+    }
+
+    /**
+     * 设置 关联事项数量
+     * @param totalNotList
+     */
+    public void setTotalNotList(List<Integer> totalNotList){
+        this.totalNotList = totalNotList;
+    }
+
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -1176,6 +1645,15 @@ public class DeptQuery extends DeptEntity {
         return this;
     }
 
+    /**
+     * 设置 序号，主键，自增长
+     * @param idNotList
+     */
+    public DeptQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+    }
+
 
     /**
      * 设置 从政务系统来的部门id
@@ -1297,6 +1775,15 @@ public class DeptQuery extends DeptEntity {
         return this;
     }
 
+    /**
+     * 设置 站点ID
+     * @param siteIdNotList
+     */
+    public DeptQuery siteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+        return this;
+    }
+
 
     /**
      * 设置 部门简称
@@ -1399,6 +1886,15 @@ public class DeptQuery extends DeptEntity {
         return this;
     }
 
+    /**
+     * 设置 填单机展示 (0.否，1.是)
+     * @param isAutotableNotList
+     */
+    public DeptQuery isAutotableNotList(List<Integer> isAutotableNotList){
+        this.isAutotableNotList = isAutotableNotList;
+        return this;
+    }
+
     /**
      * 设置  预约展示 (0.否，1.是)
      * @param isOrder
@@ -1444,6 +1940,15 @@ public class DeptQuery extends DeptEntity {
         return this;
     }
 
+    /**
+     * 设置 预约展示 (0.否，1.是)
+     * @param isOrderNotList
+     */
+    public DeptQuery isOrderNotList(List<Integer> isOrderNotList){
+        this.isOrderNotList = isOrderNotList;
+        return this;
+    }
+
     /**
      * 设置  背靠背展示 (0.否，1.是)
      * @param isBkb
@@ -1489,6 +1994,15 @@ public class DeptQuery extends DeptEntity {
         return this;
     }
 
+    /**
+     * 设置 背靠背展示 (0.否，1.是)
+     * @param isBkbNotList
+     */
+    public DeptQuery isBkbNotList(List<Integer> isBkbNotList){
+        this.isBkbNotList = isBkbNotList;
+        return this;
+    }
+
     /**
      * 设置  办事指南展示 (0.否，1.是)
      * @param isWorkGuide
@@ -1534,6 +2048,15 @@ public class DeptQuery extends DeptEntity {
         return this;
     }
 
+    /**
+     * 设置 办事指南展示 (0.否，1.是)
+     * @param isWorkGuideNotList
+     */
+    public DeptQuery isWorkGuideNotList(List<Integer> isWorkGuideNotList){
+        this.isWorkGuideNotList = isWorkGuideNotList;
+        return this;
+    }
+
     /**
      * 设置  是否使用 (0.否，1.是)
      * @param usValid
@@ -1579,6 +2102,15 @@ public class DeptQuery extends DeptEntity {
         return this;
     }
 
+    /**
+     * 设置 是否使用 (0.否，1.是)
+     * @param usValidNotList
+     */
+    public DeptQuery usValidNotList(List<Integer> usValidNotList){
+        this.usValidNotList = usValidNotList;
+        return this;
+    }
+
     /**
      * 设置  部门电话是否展示 (0.否，1.是)
      * @param isSecphone
@@ -1624,6 +2156,15 @@ public class DeptQuery extends DeptEntity {
         return this;
     }
 
+    /**
+     * 设置 部门电话是否展示 (0.否，1.是)
+     * @param isSecphoneNotList
+     */
+    public DeptQuery isSecphoneNotList(List<Integer> isSecphoneNotList){
+        this.isSecphoneNotList = isSecphoneNotList;
+        return this;
+    }
+
     /**
      * 设置  是否展示英文 (0.否，1.是)
      * @param isEnglish
@@ -1669,6 +2210,15 @@ public class DeptQuery extends DeptEntity {
         return this;
     }
 
+    /**
+     * 设置 是否展示英文 (0.否，1.是)
+     * @param isEnglishNotList
+     */
+    public DeptQuery isEnglishNotList(List<Integer> isEnglishNotList){
+        this.isEnglishNotList = isEnglishNotList;
+        return this;
+    }
+
     /**
      * 设置  排序
      * @param sort
@@ -1714,6 +2264,15 @@ public class DeptQuery extends DeptEntity {
         return this;
     }
 
+    /**
+     * 设置 排序
+     * @param sortNotList
+     */
+    public DeptQuery sortNotList(List<Integer> sortNotList){
+        this.sortNotList = sortNotList;
+        return this;
+    }
+
     /**
      * 设置  部门来源
      * @param source
@@ -1759,6 +2318,15 @@ public class DeptQuery extends DeptEntity {
         return this;
     }
 
+    /**
+     * 设置 部门来源
+     * @param sourceNotList
+     */
+    public DeptQuery sourceNotList(List<Integer> sourceNotList){
+        this.sourceNotList = sourceNotList;
+        return this;
+    }
+
 
     /**
      * 设置  创建用户
@@ -1805,6 +2373,69 @@ public class DeptQuery extends DeptEntity {
         return this;
     }
 
+    /**
+     * 设置 创建用户
+     * @param createUserIdNotList
+     */
+    public DeptQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
+        return this;
+    }
+
+
+    /**
+     * 设置  关联事项数量
+     * @param total
+     */
+    public DeptQuery total(Integer total){
+        setTotal(total);
+        return this;
+    }
+
+    /**
+     * 设置 开始 关联事项数量
+     * @param totalStart
+     */
+    public DeptQuery totalStart(Integer totalStart){
+        this.totalStart = totalStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 关联事项数量
+     * @param totalEnd
+     */
+    public DeptQuery totalEnd(Integer totalEnd){
+        this.totalEnd = totalEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 关联事项数量
+     * @param totalIncrement
+     */
+    public DeptQuery totalIncrement(Integer totalIncrement){
+        this.totalIncrement = totalIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 关联事项数量
+     * @param totalList
+     */
+    public DeptQuery totalList(List<Integer> totalList){
+        this.totalList = totalList;
+        return this;
+    }
+
+    /**
+     * 设置 关联事项数量
+     * @param totalNotList
+     */
+    public DeptQuery totalNotList(List<Integer> totalNotList){
+        this.totalNotList = totalNotList;
+        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/dept/model/vo/DeptVo.java

@@ -43,5 +43,12 @@ public class DeptVo extends BaseEntityLong {
 
     /** 部门ID列表 */
     private List <Long> idList;
+    /**
+     * 是否过滤不存在事项的部门（0.不过滤，1.过滤，默认不过滤）
+     */
+    private Integer filter;
+
+    /** 开始 关联事项数量 */
+    private Integer totalStart;
 
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/dept/service/impl/DeptServiceImpl.java

@@ -4,6 +4,7 @@ import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
+import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
 import com.mortals.xhx.common.code.SourceEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
@@ -69,6 +70,7 @@ public class DeptServiceImpl extends AbstractCRUDCacheServiceImpl<DeptDao, DeptE
         return data.getDeptNumber();
     }
 
+
     /**
      * @param entity
      * @param context

base-manager/src/main/java/com/mortals/xhx/module/dept/web/DeptController.java

@@ -9,6 +9,7 @@ import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.util.DataUtil;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.module.business.model.BusinessEntity;
 import com.mortals.xhx.module.dept.model.DeptEntity;
 import com.mortals.xhx.module.dept.model.DeptQuery;
@@ -59,6 +60,11 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic
                 add(new OrderCol("a.createTime", OrderCol.ASCENDING));
             }
         });
+
+        if(!ObjectUtils.isEmpty(query.getFilter())&& YesNoEnum.YES.getValue()==query.getFilter()){
+            //过滤部门事项数据为0的部门
+            query.setTotalStart(0);
+        }
         super.doListBefore(query, model, context);
     }
 

base-manager/src/main/resources/sqlmap/module/dept/DeptMapper.xml

@@ -26,6 +26,7 @@
         <result property="createTime" column="createTime" />
         <result property="createUserId" column="createUserId" />
         <result property="updateTime" column="updateTime" />
+        <result property="total" column="total" />
 
     </resultMap>
 
@@ -96,23 +97,26 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
                 a.updateTime,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('total') or colPickMode == 1 and data.containsKey('total')))">
+                a.total,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="DeptEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_sys_dept
-        (tid,tname,name,simpleName,siteId,deptAbb,deptTelphone,deptNumber,isAutotable,isOrder,isBkb,isWorkGuide,usValid,isSecphone,isEnglish,sort,source,createTime,createUserId,updateTime)
+        (tid,tname,name,simpleName,siteId,deptAbb,deptTelphone,deptNumber,isAutotable,isOrder,isBkb,isWorkGuide,usValid,isSecphone,isEnglish,sort,source,createTime,createUserId,updateTime,total)
         VALUES
-        (#{tid},#{tname},#{name},#{simpleName},#{siteId},#{deptAbb},#{deptTelphone},#{deptNumber},#{isAutotable},#{isOrder},#{isBkb},#{isWorkGuide},#{usValid},#{isSecphone},#{isEnglish},#{sort},#{source},#{createTime},#{createUserId},#{updateTime})
+        (#{tid},#{tname},#{name},#{simpleName},#{siteId},#{deptAbb},#{deptTelphone},#{deptNumber},#{isAutotable},#{isOrder},#{isBkb},#{isWorkGuide},#{usValid},#{isSecphone},#{isEnglish},#{sort},#{source},#{createTime},#{createUserId},#{updateTime},#{total})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_sys_dept
-        (tid,tname,name,simpleName,siteId,deptAbb,deptTelphone,deptNumber,isAutotable,isOrder,isBkb,isWorkGuide,usValid,isSecphone,isEnglish,sort,source,createTime,createUserId,updateTime)
+        (tid,tname,name,simpleName,siteId,deptAbb,deptTelphone,deptNumber,isAutotable,isOrder,isBkb,isWorkGuide,usValid,isSecphone,isEnglish,sort,source,createTime,createUserId,updateTime,total)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.tid},#{item.tname},#{item.name},#{item.simpleName},#{item.siteId},#{item.deptAbb},#{item.deptTelphone},#{item.deptNumber},#{item.isAutotable},#{item.isOrder},#{item.isBkb},#{item.isWorkGuide},#{item.usValid},#{item.isSecphone},#{item.isEnglish},#{item.sort},#{item.source},#{item.createTime},#{item.createUserId},#{item.updateTime})
+            (#{item.tid},#{item.tname},#{item.name},#{item.simpleName},#{item.siteId},#{item.deptAbb},#{item.deptTelphone},#{item.deptNumber},#{item.isAutotable},#{item.isOrder},#{item.isBkb},#{item.isWorkGuide},#{item.usValid},#{item.isSecphone},#{item.isEnglish},#{item.sort},#{item.source},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.total})
         </foreach>
     </insert>
 
@@ -215,6 +219,12 @@
             <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
                 a.updateTime=#{data.updateTime},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('total')) or (colPickMode==1 and !data.containsKey('total'))">
+                a.total=#{data.total},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('totalIncrement')) or (colPickMode==1 and !data.containsKey('totalIncrement'))">
+                a.total=ifnull(a.total,0) + #{data.totalIncrement},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -422,6 +432,18 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="total=(case" suffix="ELSE total end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('total')) or (colPickMode==1 and !item.containsKey('total'))">
+                            when a.id=#{item.id} then #{item.total}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('totalIncrement')) or (colPickMode==1 and !item.containsKey('totalIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.total,0) + #{item.totalIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -546,12 +568,18 @@
                 ${_conditionType_} a.id is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('idList')">
+        <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
             ${_conditionType_} a.id in
             <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
+            ${_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>
@@ -568,12 +596,18 @@
                 ${_conditionType_} a.tid is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('tidList')">
+        <if test="conditionParamRef.containsKey('tidList') and conditionParamRef.tidList.size() > 0">
             ${_conditionType_} a.tid in
             <foreach collection="conditionParamRef.tidList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('tidNotList') and conditionParamRef.tidNotList.size() > 0">
+            ${_conditionType_} a.tid not in
+            <foreach collection="conditionParamRef.tidNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('tname')">
             <if test="conditionParamRef.tname != null and conditionParamRef.tname != ''">
@@ -583,12 +617,18 @@
                 ${_conditionType_} a.tname is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('tnameList')">
+        <if test="conditionParamRef.containsKey('tnameList') and conditionParamRef.tnameList.size() > 0">
             ${_conditionType_} a.tname in
             <foreach collection="conditionParamRef.tnameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('tnameNotList') and conditionParamRef.tnameNotList.size() > 0">
+            ${_conditionType_} a.tname not in
+            <foreach collection="conditionParamRef.tnameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('name')">
             <if test="conditionParamRef.name != null and conditionParamRef.name != ''">
@@ -598,12 +638,18 @@
                 ${_conditionType_} a.name is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('nameList')">
+        <if test="conditionParamRef.containsKey('nameList') and conditionParamRef.nameList.size() > 0">
             ${_conditionType_} a.name in
             <foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('nameNotList') and conditionParamRef.nameNotList.size() > 0">
+            ${_conditionType_} a.name not in
+            <foreach collection="conditionParamRef.nameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('simpleName')">
             <if test="conditionParamRef.simpleName != null and conditionParamRef.simpleName != ''">
@@ -613,12 +659,18 @@
                 ${_conditionType_} a.simpleName is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('simpleNameList')">
+        <if test="conditionParamRef.containsKey('simpleNameList') and conditionParamRef.simpleNameList.size() > 0">
             ${_conditionType_} a.simpleName in
             <foreach collection="conditionParamRef.simpleNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('simpleNameNotList') and conditionParamRef.simpleNameNotList.size() > 0">
+            ${_conditionType_} a.simpleName not in
+            <foreach collection="conditionParamRef.simpleNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('siteId')">
             <if test="conditionParamRef.siteId != null ">
                 ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
@@ -627,12 +679,18 @@
                 ${_conditionType_} a.siteId is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('siteIdList')">
+        <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
             ${_conditionType_} a.siteId in
             <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
+            ${_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>
@@ -649,12 +707,18 @@
                 ${_conditionType_} a.deptAbb is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('deptAbbList')">
+        <if test="conditionParamRef.containsKey('deptAbbList') and conditionParamRef.deptAbbList.size() > 0">
             ${_conditionType_} a.deptAbb in
             <foreach collection="conditionParamRef.deptAbbList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('deptAbbNotList') and conditionParamRef.deptAbbNotList.size() > 0">
+            ${_conditionType_} a.deptAbb not in
+            <foreach collection="conditionParamRef.deptAbbNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('deptTelphone')">
             <if test="conditionParamRef.deptTelphone != null and conditionParamRef.deptTelphone != ''">
@@ -664,12 +728,18 @@
                 ${_conditionType_} a.deptTelphone is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('deptTelphoneList')">
+        <if test="conditionParamRef.containsKey('deptTelphoneList') and conditionParamRef.deptTelphoneList.size() > 0">
             ${_conditionType_} a.deptTelphone in
             <foreach collection="conditionParamRef.deptTelphoneList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('deptTelphoneNotList') and conditionParamRef.deptTelphoneNotList.size() > 0">
+            ${_conditionType_} a.deptTelphone not in
+            <foreach collection="conditionParamRef.deptTelphoneNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('deptNumber')">
             <if test="conditionParamRef.deptNumber != null and conditionParamRef.deptNumber != ''">
@@ -679,12 +749,18 @@
                 ${_conditionType_} a.deptNumber is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('deptNumberList')">
+        <if test="conditionParamRef.containsKey('deptNumberList') and conditionParamRef.deptNumberList.size() > 0">
             ${_conditionType_} a.deptNumber in
             <foreach collection="conditionParamRef.deptNumberList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('deptNumberNotList') and conditionParamRef.deptNumberNotList.size() > 0">
+            ${_conditionType_} a.deptNumber not in
+            <foreach collection="conditionParamRef.deptNumberNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('isAutotable')">
             <if test="conditionParamRef.isAutotable != null ">
                 ${_conditionType_} a.isAutotable = #{${_conditionParam_}.isAutotable}
@@ -693,12 +769,18 @@
                 ${_conditionType_} a.isAutotable is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('isAutotableList')">
+        <if test="conditionParamRef.containsKey('isAutotableList') and conditionParamRef.isAutotableList.size() > 0">
             ${_conditionType_} a.isAutotable in
             <foreach collection="conditionParamRef.isAutotableList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('isAutotableNotList') and conditionParamRef.isAutotableNotList.size() > 0">
+            ${_conditionType_} a.isAutotable not in
+            <foreach collection="conditionParamRef.isAutotableNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('isAutotableStart') and conditionParamRef.isAutotableStart != null">
             ${_conditionType_} a.isAutotable <![CDATA[ >= ]]> #{${_conditionParam_}.isAutotableStart}
         </if>
@@ -714,12 +796,18 @@
                 ${_conditionType_} a.isOrder is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('isOrderList')">
+        <if test="conditionParamRef.containsKey('isOrderList') and conditionParamRef.isOrderList.size() > 0">
             ${_conditionType_} a.isOrder in
             <foreach collection="conditionParamRef.isOrderList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('isOrderNotList') and conditionParamRef.isOrderNotList.size() > 0">
+            ${_conditionType_} a.isOrder not in
+            <foreach collection="conditionParamRef.isOrderNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('isOrderStart') and conditionParamRef.isOrderStart != null">
             ${_conditionType_} a.isOrder <![CDATA[ >= ]]> #{${_conditionParam_}.isOrderStart}
         </if>
@@ -735,12 +823,18 @@
                 ${_conditionType_} a.isBkb is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('isBkbList')">
+        <if test="conditionParamRef.containsKey('isBkbList') and conditionParamRef.isBkbList.size() > 0">
             ${_conditionType_} a.isBkb in
             <foreach collection="conditionParamRef.isBkbList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('isBkbNotList') and conditionParamRef.isBkbNotList.size() > 0">
+            ${_conditionType_} a.isBkb not in
+            <foreach collection="conditionParamRef.isBkbNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('isBkbStart') and conditionParamRef.isBkbStart != null">
             ${_conditionType_} a.isBkb <![CDATA[ >= ]]> #{${_conditionParam_}.isBkbStart}
         </if>
@@ -756,12 +850,18 @@
                 ${_conditionType_} a.isWorkGuide is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('isWorkGuideList')">
+        <if test="conditionParamRef.containsKey('isWorkGuideList') and conditionParamRef.isWorkGuideList.size() > 0">
             ${_conditionType_} a.isWorkGuide in
             <foreach collection="conditionParamRef.isWorkGuideList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('isWorkGuideNotList') and conditionParamRef.isWorkGuideNotList.size() > 0">
+            ${_conditionType_} a.isWorkGuide not in
+            <foreach collection="conditionParamRef.isWorkGuideNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('isWorkGuideStart') and conditionParamRef.isWorkGuideStart != null">
             ${_conditionType_} a.isWorkGuide <![CDATA[ >= ]]> #{${_conditionParam_}.isWorkGuideStart}
         </if>
@@ -777,12 +877,18 @@
                 ${_conditionType_} a.usValid is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('usValidList')">
+        <if test="conditionParamRef.containsKey('usValidList') and conditionParamRef.usValidList.size() > 0">
             ${_conditionType_} a.usValid in
             <foreach collection="conditionParamRef.usValidList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('usValidNotList') and conditionParamRef.usValidNotList.size() > 0">
+            ${_conditionType_} a.usValid not in
+            <foreach collection="conditionParamRef.usValidNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('usValidStart') and conditionParamRef.usValidStart != null">
             ${_conditionType_} a.usValid <![CDATA[ >= ]]> #{${_conditionParam_}.usValidStart}
         </if>
@@ -798,12 +904,18 @@
                 ${_conditionType_} a.isSecphone is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('isSecphoneList')">
+        <if test="conditionParamRef.containsKey('isSecphoneList') and conditionParamRef.isSecphoneList.size() > 0">
             ${_conditionType_} a.isSecphone in
             <foreach collection="conditionParamRef.isSecphoneList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('isSecphoneNotList') and conditionParamRef.isSecphoneNotList.size() > 0">
+            ${_conditionType_} a.isSecphone not in
+            <foreach collection="conditionParamRef.isSecphoneNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('isSecphoneStart') and conditionParamRef.isSecphoneStart != null">
             ${_conditionType_} a.isSecphone <![CDATA[ >= ]]> #{${_conditionParam_}.isSecphoneStart}
         </if>
@@ -819,12 +931,18 @@
                 ${_conditionType_} a.isEnglish is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('isEnglishList')">
+        <if test="conditionParamRef.containsKey('isEnglishList') and conditionParamRef.isEnglishList.size() > 0">
             ${_conditionType_} a.isEnglish in
             <foreach collection="conditionParamRef.isEnglishList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('isEnglishNotList') and conditionParamRef.isEnglishNotList.size() > 0">
+            ${_conditionType_} a.isEnglish not in
+            <foreach collection="conditionParamRef.isEnglishNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('isEnglishStart') and conditionParamRef.isEnglishStart != null">
             ${_conditionType_} a.isEnglish <![CDATA[ >= ]]> #{${_conditionParam_}.isEnglishStart}
         </if>
@@ -840,12 +958,18 @@
                 ${_conditionType_} a.sort is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('sortList')">
+        <if test="conditionParamRef.containsKey('sortList') and conditionParamRef.sortList.size() > 0">
             ${_conditionType_} a.sort in
             <foreach collection="conditionParamRef.sortList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('sortNotList') and conditionParamRef.sortNotList.size() > 0">
+            ${_conditionType_} a.sort not in
+            <foreach collection="conditionParamRef.sortNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('sortStart') and conditionParamRef.sortStart != null">
             ${_conditionType_} a.sort <![CDATA[ >= ]]> #{${_conditionParam_}.sortStart}
         </if>
@@ -861,12 +985,18 @@
                 ${_conditionType_} a.source is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('sourceList')">
+        <if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
             ${_conditionType_} a.source in
             <foreach collection="conditionParamRef.sourceList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('sourceNotList') and conditionParamRef.sourceNotList.size() > 0">
+            ${_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>
@@ -897,12 +1027,18 @@
                 ${_conditionType_} a.createUserId is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('createUserIdList')">
+        <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
             ${_conditionType_} a.createUserId in
             <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
+            ${_conditionType_} a.createUserId not in
+            <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
             ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
         </if>
@@ -925,6 +1061,33 @@
         <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
             ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
         </if>
+        <if test="conditionParamRef.containsKey('total')">
+            <if test="conditionParamRef.total != null ">
+                ${_conditionType_} a.total = #{${_conditionParam_}.total}
+            </if>
+            <if test="conditionParamRef.total == null">
+                ${_conditionType_} a.total is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('totalList') and conditionParamRef.totalList.size() > 0">
+            ${_conditionType_} a.total in
+            <foreach collection="conditionParamRef.totalList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('totalNotList') and conditionParamRef.totalNotList.size() > 0">
+            ${_conditionType_} a.total not in
+            <foreach collection="conditionParamRef.totalNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('totalStart') and conditionParamRef.totalStart != null">
+            ${_conditionType_} a.total <![CDATA[ >= ]]> #{${_conditionParam_}.totalStart}
+        </if>
+        <if test="conditionParamRef.containsKey('totalEnd') and conditionParamRef.totalEnd != null">
+            ${_conditionType_} a.total <![CDATA[ <= ]]> #{${_conditionParam_}.totalEnd}
+        </if>
+
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1043,6 +1206,11 @@
                     <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('total')">
+                    a.total
+                    <if test='orderCol.total != null and "DESC".equalsIgnoreCase(orderCol.total)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
     </sql>

portal-manager/pom.xml

@@ -116,7 +116,7 @@
 				<profiles.log.level>INFO</profiles.log.level>
 				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
 				<package.environment>yibin</package.environment>
-				<skipUi>true</skipUi>
+				<skipUi>false</skipUi>
 			</properties>
 		</profile>