diff --git a/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionQueryParam.java index a6c444f..dc9307d 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionQueryParam.java +++ b/src/main/java/com/biutag/supervision/pojo/param/ComplaintCollection/ComplaintCollectionQueryParam.java @@ -7,7 +7,7 @@ import lombok.Getter; import lombok.Setter; import java.time.LocalDateTime; -import java.util.Date; +import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -108,6 +108,9 @@ public class ComplaintCollectionQueryParam extends BasePage { @Schema(description = "初核材料, 查询状态") private List initialReviewFileList; + @Schema(description = "涉嫌问题List") + private List involveProblemIdList = new ArrayList<>(); + // @Schema(description = "部门ID集合") // private Set secondDepartIds; diff --git a/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionPageRequest.java b/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionPageRequest.java index 4be1641..2a8229c 100644 --- a/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionPageRequest.java +++ b/src/main/java/com/biutag/supervision/pojo/request/complaintCollection/ComplaintCollectionPageRequest.java @@ -79,6 +79,9 @@ public class ComplaintCollectionPageRequest extends BasePage implements ParamChe @Schema(description = "初核材料, 查询状态") private List initialReviewFileList = new ArrayList<>(); + @Schema(description = "涉嫌问题List") + private List involveProblemIdList = new ArrayList<>(); + @Override public void check() { if (CollectionUtil.isNotEmpty(discoveryTimeList)){ diff --git a/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java b/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java index 299b63a..a235a50 100644 --- a/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java +++ b/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java @@ -95,6 +95,14 @@ public class ComplaintCollectionResourceService extends BaseDAO { } }); } + List ids = param.getInvolveProblemIdList(); + if (CollectionUtil.isNotEmpty(ids)) { + qw.and(w -> { + ids.forEach(id -> + w.or().apply("FIND_IN_SET({0}, involve_problem)", id) + ); + }); + } // 排序 qw.orderByDesc(ComplaintCollection::getDiscoveryTime).orderByDesc(ComplaintCollection::getId); return complaintCollectionMapper.selectPage(page, qw);