添加排除事项

sample-form-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java

@@ -78,7 +78,7 @@ public class AuthTokenServiceImpl implements IAuthTokenService {
 
     protected static final Long SECOND_WEEK = 7 * SECOND_DAY;
 
-    private static final Long SECOND_MINUTE_TEN = 1 * SECOND_MINUTE;
+    private static final Long SECOND_MINUTE_TEN = 10 * SECOND_MINUTE;
 
     @Autowired
     private ICacheService cacheService;

sample-form-manager/src/main/java/com/mortals/xhx/base/system/resource/service/impl/ResourceServiceImpl.java

@@ -25,6 +25,7 @@ import com.mortals.xhx.base.system.role.service.RoleAuthService;
 import com.mortals.xhx.common.key.RedisKey;
 import com.mortals.xhx.common.utils.ControllerScanUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
@@ -49,6 +50,7 @@ public class ResourceServiceImpl extends AbstractCRUDServiceImpl<ResourceDao, Re
     private ICacheService cacheService;
 
     @Autowired
+    @Lazy
     private RoleAuthService roleAuthService;
 
     @Override

sample-form-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java

@@ -69,8 +69,8 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
     @Autowired
     private RoleUserService roleUserService;
 
-    @Lazy
     @Autowired
+    @Lazy
     private IUserFeign userFeign;
 
     @Override

sample-form-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSON;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
+import com.mortals.framework.service.IUser;
+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.DeviceMethodEnum;
@@ -13,8 +15,10 @@ import com.mortals.xhx.common.pdu.LoginForm;
 import com.mortals.xhx.common.pdu.RespData;
 import com.mortals.xhx.common.pdu.device.DeviceReq;
 import com.mortals.xhx.common.pdu.firm.FirmPdu;
+import com.mortals.xhx.feign.base.pdu.SitePdu;
 import com.mortals.xhx.feign.device.IDeviceFeign;
 import com.mortals.xhx.feign.firm.IFirmFeign;
+import com.mortals.xhx.feign.rsp.ApiResp;
 import com.mortals.xhx.module.device.model.DeviceQuery;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
@@ -34,15 +38,11 @@ import com.mortals.xhx.module.device.service.DeviceService;
 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.*;
 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;
 
@@ -156,36 +156,11 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
 
     @Override
     protected int saveAfter(DeviceEntity entity, Map<String, Object> model, Context context) throws AppException {
-        if (ObjectUtils.isEmpty(entity.getUpdateTime())) {
-/*            String token = getToken();
-            DeviceReq deviceReq = new DeviceReq();
-            deviceReq.setReceiveMethod(DeviceMethodEnum.ADD.getValue());
-            deviceReq.setDeviceName(entity.getDeviceName());
-            deviceReq.setDeviceCode(entity.getDeviceCode());
-            deviceReq.setProductCode(entity.getProductCode());
-            deviceReq.setIp(entity.getIp());
-            deviceReq.setPort(entity.getPort());
-            deviceReq.setSiteId(1L);
-            deviceReq.setSiteCode("511500000000-0001");
-            deviceReq.setSiteName("宜宾市民中心");
-            deviceReq.setLeadingOfficial(entity.getLeadingOfficial());
-            deviceReq.setLeadingOfficialTelephone(entity.getLeadingOfficialTelephone());
-            deviceReq.setSource(1);
-            deviceReq.setDeviceStatus(entity.getDeviceStatus());
-            Rest<String> rest = deviceFeign.deviceCall(deviceReq, token);
-            log.info("添加结果：{}", JSON.toJSONString(rest));*/
-        } else {
-          //  String token = getToken();
+        if (!ObjectUtils.isEmpty(entity.getUpdateTime())) {
             DeviceReq deviceReq = new DeviceReq();
             deviceReq.setReceiveMethod(DeviceMethodEnum.UPDATE.getValue());
-/*            deviceReq.setDeviceName(entity.getDeviceName());
-            deviceReq.setDeviceCode(entity.getDeviceCode());
-            deviceReq.setProductCode(entity.getProductCode());*/
             deviceReq.setIp(entity.getIp());
             deviceReq.setPort(entity.getPort());
-/*            deviceReq.setSiteId(1L);
-            deviceReq.setSiteCode("511500000000-0001");
-            deviceReq.setSiteName("宜宾市民中心");*/
             deviceReq.setLeadingOfficial(entity.getLeadingOfficial());
             deviceReq.setLeadingOfficialTelephone(entity.getLeadingOfficialTelephone());
             deviceReq.setSource(1);
@@ -213,13 +188,29 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
         }
     }
 
-/*    private String getToken() {
-        LoginForm loginForm = new LoginForm();
-        loginForm.setLoginName(loginName);
-        loginForm.setPassword(password);
-        Rest<String> rest = deviceFeign.getToken(loginForm);
-        String token = rest.getData();
-        return token;
-    }*/
 
+
+    @PostMapping({"matter/list"})
+    public Rest<Object> list() {
+
+        Rest<Object> ret = new Rest();
+        Map<String, Object> model = new HashMap();
+        String busiDesc = "查询第设备事项列表";
+
+        int code = 1;
+        try {
+
+            model.put("message_info", busiDesc + "成功");
+            this.recordSysLog(this.request, busiDesc + " 【成功】");
+        } catch (Exception e) {
+            code = VALUE_RESULT_FAILURE;
+            this.doException(this.request, busiDesc, model, e);
+        }
+
+        ret.setCode(code);
+        ret.setData(model);
+        ret.setDict(model.get("dict"));
+        ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+        return ret;
+    }
 }
\ No newline at end of file

sample-form-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterQuery.java

@@ -7,7 +7,7 @@ import com.mortals.xhx.module.matter.model.MatterEntity;
  * 事项申请材料业务查询对象
  *
  * @author zxfei
- * @date 2022-11-17
+ * @date 2024-07-16
  */
 public class MatterQuery extends MatterEntity {
     /** 开始 主键，自增长 */
@@ -22,6 +22,9 @@ public class MatterQuery extends MatterEntity {
     /** 主键，自增长列表 */
     private List <Long> idList;
 
+    /** 主键，自增长排除列表 */
+    private List <Long> idNotList;
+
     /** 开始 站点ID */
     private Long siteIdStart;
 
@@ -34,27 +37,44 @@ public class MatterQuery extends MatterEntity {
     /** 站点ID列表 */
     private List <Long> siteIdList;
 
+    /** 站点ID排除列表 */
+    private List <Long> siteIdNotList;
+
     /** 从政务系统来的事项id */
     private List<String> tidList;
 
+    /** 从政务系统来的事项id排除列表 */
+    private List <String> tidNotList;
     /** 从政务系统来的事项code */
     private List<String> tcodeList;
 
+    /** 从政务系统来的事项code排除列表 */
+    private List <String> tcodeNotList;
     /** 从政务系统来的事项name */
     private List<String> tnameList;
 
+    /** 从政务系统来的事项name排除列表 */
+    private List <String> tnameNotList;
     /** 事项名称 */
     private List<String> matterNameList;
 
+    /** 事项名称排除列表 */
+    private List <String> matterNameNotList;
     /** 英语事项名 */
     private List<String> englishNameList;
 
+    /** 英语事项名排除列表 */
+    private List <String> englishNameNotList;
     /** 事项编号 */
     private List<String> matterNoList;
 
+    /** 事项编号排除列表 */
+    private List <String> matterNoNotList;
     /** 事项全称 */
     private List<String> matterFullNameList;
 
+    /** 事项全称排除列表 */
+    private List <String> matterFullNameNotList;
     /** 开始 部门ID */
     private Long deptIdStart;
 
@@ -67,12 +87,19 @@ public class MatterQuery extends MatterEntity {
     /** 部门ID列表 */
     private List <Long> deptIdList;
 
+    /** 部门ID排除列表 */
+    private List <Long> deptIdNotList;
+
     /** 部门编号 */
     private List<String> deptCodeList;
 
+    /** 部门编号排除列表 */
+    private List <String> deptCodeNotList;
     /** 部门名称 */
     private List<String> deptNameList;
 
+    /** 部门名称排除列表 */
+    private List <String> deptNameNotList;
     /** 开始 填单次数 */
     private Integer totalStart;
 
@@ -85,6 +112,9 @@ public class MatterQuery extends MatterEntity {
     /** 填单次数列表 */
     private List <Integer> totalList;
 
+    /** 填单次数排除列表 */
+    private List <Integer> totalNotList;
+
     /** 开始 排序 */
     private Integer sortStart;
 
@@ -97,6 +127,9 @@ public class MatterQuery extends MatterEntity {
     /** 排序列表 */
     private List <Integer> sortList;
 
+    /** 排序排除列表 */
+    private List <Integer> sortNotList;
+
     /** 开始 是否推荐(0.未推荐，1.推荐) */
     private Integer isRecommendStart;
 
@@ -109,6 +142,9 @@ public class MatterQuery extends MatterEntity {
     /** 是否推荐(0.未推荐，1.推荐)列表 */
     private List <Integer> isRecommendList;
 
+    /** 是否推荐(0.未推荐，1.推荐)排除列表 */
+    private List <Integer> isRecommendNotList;
+
     /** 开始 是否推荐(0.手动添加，1.站点事项) */
     private Integer sourceStart;
 
@@ -121,6 +157,9 @@ public class MatterQuery extends MatterEntity {
     /** 是否推荐(0.手动添加，1.站点事项)列表 */
     private List <Integer> sourceList;
 
+    /** 是否推荐(0.手动添加，1.站点事项)排除列表 */
+    private List <Integer> sourceNotList;
+
     /** 开始 创建时间 */
     private String createTimeStart;
 
@@ -139,6 +178,9 @@ public class MatterQuery extends MatterEntity {
     /** 创建用户列表 */
     private List <Long> createUserIdList;
 
+    /** 创建用户排除列表 */
+    private List <Long> createUserIdNotList;
+
     /** 开始 修改时间 */
     private String updateTimeStart;
 
@@ -217,6 +259,23 @@ public class MatterQuery extends MatterEntity {
         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
@@ -281,6 +340,23 @@ public class MatterQuery extends MatterEntity {
         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;
+    }
+
+
     /**
      * 获取 从政务系统来的事项id
      * @return tidList
@@ -296,6 +372,23 @@ public class MatterQuery extends MatterEntity {
     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;
+    }
+
     /**
      * 获取 从政务系统来的事项code
      * @return tcodeList
@@ -311,6 +404,23 @@ public class MatterQuery extends MatterEntity {
     public void setTcodeList(List<String> tcodeList){
         this.tcodeList = tcodeList;
     }
+
+    /**
+     * 获取 从政务系统来的事项code
+     * @return tcodeNotList
+     */
+    public List<String> getTcodeNotList(){
+        return this.tcodeNotList;
+    }
+
+    /**
+     * 设置 从政务系统来的事项code
+     * @param tcodeNotList
+     */
+    public void setTcodeNotList(List<String> tcodeNotList){
+        this.tcodeNotList = tcodeNotList;
+    }
+
     /**
      * 获取 从政务系统来的事项name
      * @return tnameList
@@ -326,6 +436,23 @@ public class MatterQuery extends MatterEntity {
     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 matterNameList
@@ -341,6 +468,23 @@ public class MatterQuery extends MatterEntity {
     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 englishNameList
@@ -356,6 +500,23 @@ public class MatterQuery extends MatterEntity {
     public void setEnglishNameList(List<String> englishNameList){
         this.englishNameList = englishNameList;
     }
+
+    /**
+     * 获取 英语事项名
+     * @return englishNameNotList
+     */
+    public List<String> getEnglishNameNotList(){
+        return this.englishNameNotList;
+    }
+
+    /**
+     * 设置 英语事项名
+     * @param englishNameNotList
+     */
+    public void setEnglishNameNotList(List<String> englishNameNotList){
+        this.englishNameNotList = englishNameNotList;
+    }
+
     /**
      * 获取 事项编号
      * @return matterNoList
@@ -371,6 +532,23 @@ public class MatterQuery extends MatterEntity {
     public void setMatterNoList(List<String> matterNoList){
         this.matterNoList = matterNoList;
     }
+
+    /**
+     * 获取 事项编号
+     * @return matterNoNotList
+     */
+    public List<String> getMatterNoNotList(){
+        return this.matterNoNotList;
+    }
+
+    /**
+     * 设置 事项编号
+     * @param matterNoNotList
+     */
+    public void setMatterNoNotList(List<String> matterNoNotList){
+        this.matterNoNotList = matterNoNotList;
+    }
+
     /**
      * 获取 事项全称
      * @return matterFullNameList
@@ -386,6 +564,23 @@ public class MatterQuery extends MatterEntity {
     public void setMatterFullNameList(List<String> matterFullNameList){
         this.matterFullNameList = matterFullNameList;
     }
+
+    /**
+     * 获取 事项全称
+     * @return matterFullNameNotList
+     */
+    public List<String> getMatterFullNameNotList(){
+        return this.matterFullNameNotList;
+    }
+
+    /**
+     * 设置 事项全称
+     * @param matterFullNameNotList
+     */
+    public void setMatterFullNameNotList(List<String> matterFullNameNotList){
+        this.matterFullNameNotList = matterFullNameNotList;
+    }
+
     /**
      * 获取 开始 部门ID
      * @return deptIdStart
@@ -450,6 +645,23 @@ public class MatterQuery extends MatterEntity {
         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 deptCodeList
@@ -465,6 +677,23 @@ public class MatterQuery extends MatterEntity {
     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 deptNameList
@@ -480,6 +709,23 @@ public class MatterQuery extends MatterEntity {
     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 totalStart
@@ -544,6 +790,23 @@ public class MatterQuery extends MatterEntity {
         this.totalList = totalList;
     }
 
+    /**
+     * 获取 填单次数
+     * @return totalNotList
+     */
+    public List<Integer> getTotalNotList(){
+        return this.totalNotList;
+    }
+
+    /**
+     * 设置 填单次数
+     * @param totalNotList
+     */
+    public void setTotalNotList(List<Integer> totalNotList){
+        this.totalNotList = totalNotList;
+    }
+
+
     /**
      * 获取 开始 排序
      * @return sortStart
@@ -608,6 +871,23 @@ public class MatterQuery extends MatterEntity {
         this.sortList = sortList;
     }
 
+    /**
+     * 获取 排序
+     * @return sortNotList
+     */
+    public List<Integer> getSortNotList(){
+        return this.sortNotList;
+    }
+
+    /**
+     * 设置 排序
+     * @param sortNotList
+     */
+    public void setSortNotList(List<Integer> sortNotList){
+        this.sortNotList = sortNotList;
+    }
+
+
     /**
      * 获取 开始 是否推荐(0.未推荐，1.推荐)
      * @return isRecommendStart
@@ -672,6 +952,23 @@ public class MatterQuery extends MatterEntity {
         this.isRecommendList = isRecommendList;
     }
 
+    /**
+     * 获取 是否推荐(0.未推荐，1.推荐)
+     * @return isRecommendNotList
+     */
+    public List<Integer> getIsRecommendNotList(){
+        return this.isRecommendNotList;
+    }
+
+    /**
+     * 设置 是否推荐(0.未推荐，1.推荐)
+     * @param isRecommendNotList
+     */
+    public void setIsRecommendNotList(List<Integer> isRecommendNotList){
+        this.isRecommendNotList = isRecommendNotList;
+    }
+
+
     /**
      * 获取 开始 是否推荐(0.手动添加，1.站点事项)
      * @return sourceStart
@@ -736,6 +1033,23 @@ public class MatterQuery extends MatterEntity {
         this.sourceList = sourceList;
     }
 
+    /**
+     * 获取 是否推荐(0.手动添加，1.站点事项)
+     * @return sourceNotList
+     */
+    public List<Integer> getSourceNotList(){
+        return this.sourceNotList;
+    }
+
+    /**
+     * 设置 是否推荐(0.手动添加，1.站点事项)
+     * @param sourceNotList
+     */
+    public void setSourceNotList(List<Integer> sourceNotList){
+        this.sourceNotList = sourceNotList;
+    }
+
+
     /**
      * 获取 开始 创建时间
      * @return createTimeStart
@@ -832,6 +1146,23 @@ public class MatterQuery extends MatterEntity {
         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
@@ -909,6 +1240,15 @@ public class MatterQuery extends MatterEntity {
         return this;
     }
 
+    /**
+     * 设置 主键，自增长
+     * @param idNotList
+     */
+    public MatterQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+    }
+
     /**
      * 设置  站点ID
      * @param siteId
@@ -954,6 +1294,15 @@ public class MatterQuery extends MatterEntity {
         return this;
     }
 
+    /**
+     * 设置 站点ID
+     * @param siteIdNotList
+     */
+    public MatterQuery siteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+        return this;
+    }
+
 
     /**
      * 设置 从政务系统来的事项id
@@ -1132,6 +1481,15 @@ public class MatterQuery extends MatterEntity {
         return this;
     }
 
+    /**
+     * 设置 部门ID
+     * @param deptIdNotList
+     */
+    public MatterQuery deptIdNotList(List<Long> deptIdNotList){
+        this.deptIdNotList = deptIdNotList;
+        return this;
+    }
+
 
     /**
      * 设置 部门编号
@@ -1215,6 +1573,15 @@ public class MatterQuery extends MatterEntity {
         return this;
     }
 
+    /**
+     * 设置 填单次数
+     * @param totalNotList
+     */
+    public MatterQuery totalNotList(List<Integer> totalNotList){
+        this.totalNotList = totalNotList;
+        return this;
+    }
+
     /**
      * 设置  排序
      * @param sort
@@ -1260,6 +1627,15 @@ public class MatterQuery extends MatterEntity {
         return this;
     }
 
+    /**
+     * 设置 排序
+     * @param sortNotList
+     */
+    public MatterQuery sortNotList(List<Integer> sortNotList){
+        this.sortNotList = sortNotList;
+        return this;
+    }
+
     /**
      * 设置  是否推荐(0.未推荐，1.推荐)
      * @param isRecommend
@@ -1305,6 +1681,15 @@ public class MatterQuery extends MatterEntity {
         return this;
     }
 
+    /**
+     * 设置 是否推荐(0.未推荐，1.推荐)
+     * @param isRecommendNotList
+     */
+    public MatterQuery isRecommendNotList(List<Integer> isRecommendNotList){
+        this.isRecommendNotList = isRecommendNotList;
+        return this;
+    }
+
     /**
      * 设置  是否推荐(0.手动添加，1.站点事项)
      * @param source
@@ -1350,6 +1735,15 @@ public class MatterQuery extends MatterEntity {
         return this;
     }
 
+    /**
+     * 设置 是否推荐(0.手动添加，1.站点事项)
+     * @param sourceNotList
+     */
+    public MatterQuery sourceNotList(List<Integer> sourceNotList){
+        this.sourceNotList = sourceNotList;
+        return this;
+    }
+
 
     /**
      * 设置  创建用户
@@ -1396,6 +1790,15 @@ public class MatterQuery extends MatterEntity {
         return this;
     }
 
+    /**
+     * 设置 创建用户
+     * @param createUserIdNotList
+     */
+    public MatterQuery 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)

sample-form-manager/src/main/resources/sqlmap/module/matter/MatterMapper.xml

@@ -507,6 +507,10 @@
     <!-- 条件映射-代参数 -->
     <sql id="_condition_param_">
         <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="permissionSql != null and permissionSql != ''">
+            ${permissionSql}
+        </if>
+
         <if test="conditionParamRef.containsKey('id')">
             <if test="conditionParamRef.id != null">
                 ${_conditionType_} a.id=#{${_conditionParam_}.id}
@@ -520,12 +524,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>
@@ -541,12 +551,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>
@@ -563,12 +579,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('tcode')">
             <if test="conditionParamRef.tcode != null and conditionParamRef.tcode != ''">
@@ -578,12 +600,18 @@
                 ${_conditionType_} a.tcode is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('tcodeList')">
+        <if test="conditionParamRef.containsKey('tcodeList') and conditionParamRef.tcodeList.size() > 0">
             ${_conditionType_} a.tcode in
             <foreach collection="conditionParamRef.tcodeList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('tcodeNotList') and conditionParamRef.tcodeNotList.size() > 0">
+            ${_conditionType_} a.tcode not in
+            <foreach collection="conditionParamRef.tcodeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('tname')">
             <if test="conditionParamRef.tname != null and conditionParamRef.tname != ''">
@@ -593,12 +621,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('matterName')">
             <if test="conditionParamRef.matterName != null and conditionParamRef.matterName != ''">
@@ -608,12 +642,18 @@
                 ${_conditionType_} a.matterName is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('matterNameList')">
+        <if test="conditionParamRef.containsKey('matterNameList') and conditionParamRef.matterNameList.size() > 0">
             ${_conditionType_} a.matterName in
             <foreach collection="conditionParamRef.matterNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('matterNameNotList') and conditionParamRef.matterNameNotList.size() > 0">
+            ${_conditionType_} a.matterName not in
+            <foreach collection="conditionParamRef.matterNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('englishName')">
             <if test="conditionParamRef.englishName != null and conditionParamRef.englishName != ''">
@@ -623,12 +663,18 @@
                 ${_conditionType_} a.englishName is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('englishNameList')">
+        <if test="conditionParamRef.containsKey('englishNameList') and conditionParamRef.englishNameList.size() > 0">
             ${_conditionType_} a.englishName in
             <foreach collection="conditionParamRef.englishNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('englishNameNotList') and conditionParamRef.englishNameNotList.size() > 0">
+            ${_conditionType_} a.englishName not in
+            <foreach collection="conditionParamRef.englishNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('matterNo')">
             <if test="conditionParamRef.matterNo != null and conditionParamRef.matterNo != ''">
@@ -638,12 +684,18 @@
                 ${_conditionType_} a.matterNo is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('matterNoList')">
+        <if test="conditionParamRef.containsKey('matterNoList') and conditionParamRef.matterNoList.size() > 0">
             ${_conditionType_} a.matterNo in
             <foreach collection="conditionParamRef.matterNoList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('matterNoNotList') and conditionParamRef.matterNoNotList.size() > 0">
+            ${_conditionType_} a.matterNo not in
+            <foreach collection="conditionParamRef.matterNoNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('matterFullName')">
             <if test="conditionParamRef.matterFullName != null and conditionParamRef.matterFullName != ''">
@@ -653,12 +705,18 @@
                 ${_conditionType_} a.matterFullName is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('matterFullNameList')">
+        <if test="conditionParamRef.containsKey('matterFullNameList') and conditionParamRef.matterFullNameList.size() > 0">
             ${_conditionType_} a.matterFullName in
             <foreach collection="conditionParamRef.matterFullNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('matterFullNameNotList') and conditionParamRef.matterFullNameNotList.size() > 0">
+            ${_conditionType_} a.matterFullName not in
+            <foreach collection="conditionParamRef.matterFullNameNotList" 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}
@@ -667,12 +725,18 @@
                 ${_conditionType_} a.deptId is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('deptIdList')">
+        <if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
             ${_conditionType_} a.deptId in
             <foreach collection="conditionParamRef.deptIdList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('deptIdNotList') and conditionParamRef.deptIdNotList.size() > 0">
+            ${_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>
@@ -689,12 +753,18 @@
                 ${_conditionType_} a.deptCode is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('deptCodeList')">
+        <if test="conditionParamRef.containsKey('deptCodeList') and conditionParamRef.deptCodeList.size() > 0">
             ${_conditionType_} a.deptCode in
             <foreach collection="conditionParamRef.deptCodeList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('deptCodeNotList') and conditionParamRef.deptCodeNotList.size() > 0">
+            ${_conditionType_} a.deptCode not in
+            <foreach collection="conditionParamRef.deptCodeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="conditionParamRef.containsKey('deptName')">
             <if test="conditionParamRef.deptName != null and conditionParamRef.deptName != ''">
@@ -704,12 +774,18 @@
                 ${_conditionType_} a.deptName is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('deptNameList')">
+        <if test="conditionParamRef.containsKey('deptNameList') and conditionParamRef.deptNameList.size() > 0">
             ${_conditionType_} a.deptName in
             <foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('deptNameNotList') and conditionParamRef.deptNameNotList.size() > 0">
+            ${_conditionType_} a.deptName not in
+            <foreach collection="conditionParamRef.deptNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('total')">
             <if test="conditionParamRef.total != null ">
                 ${_conditionType_} a.total = #{${_conditionParam_}.total}
@@ -718,12 +794,18 @@
                 ${_conditionType_} a.total is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('totalList')">
+        <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>
@@ -739,12 +821,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>
@@ -760,12 +848,18 @@
                 ${_conditionType_} a.isRecommend is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('isRecommendList')">
+        <if test="conditionParamRef.containsKey('isRecommendList') and conditionParamRef.isRecommendList.size() > 0">
             ${_conditionType_} a.isRecommend in
             <foreach collection="conditionParamRef.isRecommendList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
+        <if test="conditionParamRef.containsKey('isRecommendNotList') and conditionParamRef.isRecommendNotList.size() > 0">
+            ${_conditionType_} a.isRecommend not in
+            <foreach collection="conditionParamRef.isRecommendNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="conditionParamRef.containsKey('isRecommendStart') and conditionParamRef.isRecommendStart != null">
             ${_conditionType_} a.isRecommend <![CDATA[ >= ]]> #{${_conditionParam_}.isRecommendStart}
         </if>
@@ -781,12 +875,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>
@@ -817,12 +917,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>
@@ -849,14 +955,126 @@
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
             order by
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                field(a.id,
+                <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+                field(a.siteId,
+                <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
+                field(a.deptId,
+                <foreach collection="conditionParamRef.deptIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('totalList') and conditionParamRef.totalList.size() > 0">
+                field(a.total,
+                <foreach collection="conditionParamRef.totalList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('sortList') and conditionParamRef.sortList.size() > 0">
+                field(a.sort,
+                <foreach collection="conditionParamRef.sortList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('isRecommendList') and conditionParamRef.isRecommendList.size() > 0">
+                field(a.isRecommend,
+                <foreach collection="conditionParamRef.isRecommendList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
+                field(a.source,
+                <foreach collection="conditionParamRef.sourceList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                field(a.createUserId,
+                <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
-                    ${item.colName} ${item.sortKind}
+                    a.${item.colName} ${item.sortKind}
                 </foreach>
             </trim>
         </if>
         <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
             order by
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+                field(a.id,
+                <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+                field(a.siteId,
+                <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
+                field(a.deptId,
+                <foreach collection="conditionParamRef.deptIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('totalList') and conditionParamRef.totalList.size() > 0">
+                field(a.total,
+                <foreach collection="conditionParamRef.totalList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('sortList') and conditionParamRef.sortList.size() > 0">
+                field(a.sort,
+                <foreach collection="conditionParamRef.sortList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('isRecommendList') and conditionParamRef.isRecommendList.size() > 0">
+                field(a.isRecommend,
+                <foreach collection="conditionParamRef.isRecommendList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
+                field(a.source,
+                <foreach collection="conditionParamRef.sourceList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                field(a.createUserId,
+                <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+                ,
+            </if>
             <trim suffixOverrides=","  suffix="">
                 <if test="orderCol.containsKey('id')">
                     a.id
@@ -955,6 +1173,8 @@
                 </if>
             </trim>
         </if>
+
+
     </sql>
     <sql id="_group_by_">
         <if test="groupList != null and !groupList.isEmpty()">