涉访涉诉--查询条件修改

src/main/java/com/biutag/supervision/pojo/enums/complaintCollection/ComplaintCollectionHandleMethodEnum.java

@@ -1,25 +1,25 @@
 package com.biutag.supervision.pojo.enums.complaintCollection;
 
-import com.biutag.supervision.constants.enums.IntegerEnum;
+import com.biutag.supervision.constants.enums.CodeEnum;
 
 /**
  * 办理方式枚举
  */
-public enum ComplaintCollectionHandleMethodEnum implements IntegerEnum {
+public enum ComplaintCollectionHandleMethodEnum implements CodeEnum {
 
-    ZB(0, "自办"),
-    XF(1, "下发");
+    ZB("0", "自办"),
+    XF("1", "下发");
 
-    private final int code;
+    private final String code;
     private final String desc;
 
-    ComplaintCollectionHandleMethodEnum(int code, String desc) {
+    ComplaintCollectionHandleMethodEnum(String code, String desc) {
         this.code = code;
         this.desc = desc;
     }
 
     @Override
-    public int getCode() {
+    public String getCode() {
         return code;
     }
 

src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionQueryParam.java

@@ -40,8 +40,14 @@ public class ComplaintCollectionQueryParam extends BasePage {
     @Schema(description = "来源表类型：PETITION/CASE_VERIF/MAILBOX")
     private String sourceTable;
 
-    @Schema(description = "信件来源")
-    private Set<String> sourceTables;
+    @Schema(description = "信件来源集合")
+    private Set<String> sourceTableList;
+
+    @Schema(description = "信件来源一级子类")
+    private String sourceTableSubOne;
+
+    @Schema(description = "信件来源一级子类集合")
+    private Set<String> sourceTableSubOneList;
 
     @Schema(description = "反映人姓名（PETITION.responder_name；CASE_VERIF.responder_name；MAILBOX.responderName）")
     private String responderName;

src/main/java/com/biutag/supervision/pojo/param/SupExternalDepartQueryParam.java

@@ -21,6 +21,9 @@ public class SupExternalDepartQueryParam {
     private Set<String> internalIds;
 
 
+    @Schema(description = "外部单位ids")
+    private Set<String> externalIds;
+
     @Schema(description = "外部来源")
     private String source;
 

src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionPageRequest.java

@@ -26,7 +26,11 @@ public class ComplaintCollectionPageRequest extends BasePage implements ParamChe
 
 
     @Schema(description = "信件来源")
-    private Set<String> sourceTables;
+    private Set<String> sourceTableList;
+
+    @Schema(description = "信件来源一级子类")
+    private Set<String> sourceTableSubOneList;
+
 
     @Schema(description = "信件编号")
     private String originId;

src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java

@@ -53,7 +53,8 @@ public class ComplaintCollectionResourceService extends BaseDAO {
         // 构建分页对象
         Page<ComplaintCollection> page = new Page<>(param.getCurrent(), param.getSize());
         LambdaQueryWrapper<ComplaintCollection> qw = new LambdaQueryWrapper<>();
-        setBatchQuery(param.getSourceTable(), param.getSourceTables(), qw, ComplaintCollection::getSourceTable);
+        setBatchQuery(param.getSourceTable(), param.getSourceTableList(), qw, ComplaintCollection::getSourceTable);
+        setBatchQuery(param.getSourceTableSubOne(), param.getSourceTableSubOneList(), qw, ComplaintCollection::getSourceTableSubOne);
         setBatchLikeQuery(param.getOriginId(), param.getOriginIds(), qw, ComplaintCollection::getOriginId);
         if (CollectionUtil.size(param.getDiscoveryTimeList()) == 2
                 && param.getDiscoveryTimeList().get(0) != null
@@ -220,4 +221,29 @@ public class ComplaintCollectionResourceService extends BaseDAO {
     }
 
 
+    /**
+     *
+     * @param list
+     * @return
+     */
+    public Boolean saveOrUpdateComplaintCollection(List<ComplaintCollection> list) {
+        if (CollectionUtil.isEmpty(list)) {
+            return false;
+        }
+        for (ComplaintCollection item :list) {
+            LambdaQueryWrapper<ComplaintCollection> query = new LambdaQueryWrapper<>();
+            query.eq(ComplaintCollection::getOriginId, item.getOriginId());
+            query.eq(ComplaintCollection::getSourceTable, item.getSourceTable());
+            ComplaintCollection exist = complaintCollectionMapper.selectOne(query);
+            if (exist != null) {
+                item.setId(exist.getId());
+                complaintCollectionMapper.updateById(item);
+            } else {
+                complaintCollectionMapper.insert(item);
+            }
+        }
+        return true;
+    }
+
+
 }

src/main/java/com/biutag/supervision/repository/supExternalDepart/SupExternalDepartResourceService.java

@@ -29,7 +29,7 @@ public class SupExternalDepartResourceService {
         LambdaQueryWrapper<SupExternalDepart> wrapper= new LambdaQueryWrapper<>();
         wrapper.eq(StrUtil.isNotBlank(param.getSource()), SupExternalDepart::getSource, param.getSource());
         wrapper.in(CollectionUtil.isNotEmpty(param.getInternalIds()),  SupExternalDepart::getInternalId, param.getInternalIds());
-
+        wrapper.in(CollectionUtil.isNotEmpty(param.getExternalIds()), SupExternalDepart::getExternalId, param.getExternalIds());
         if (wrapper.getExpression() == null || wrapper.getExpression().getSqlSegment().isEmpty()) {
             return Collections.emptyList();
         }