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 d0e2ff7..25046dd 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 @@ -65,6 +65,12 @@ public class ComplaintCollectionQueryParam extends BasePage { @Schema(description = "被投诉二级机构Ids") private Set secondDepartIds; + @Schema(description = "被投诉三级机构Id") + private String thirdDepartId; + + @Schema(description = "被投诉三级机构Ids") + private Set thirdDepartIds; + @Schema(description = "被投诉二级机构名字") private String secondDepartName; 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 7686ccf..fb02c83 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 @@ -49,6 +49,9 @@ public class ComplaintCollectionPageRequest extends BasePage implements ParamChe @Schema(description = "被投诉二级机构名字") private String secondDepartName; + @Schema(description = "被投诉三级机构Id") + private String thirdDepartId; + /** * @see ComplaintCollectionHandleMethodEnum */ 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 6ec5044..537263c 100644 --- a/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java +++ b/src/main/java/com/biutag/supervision/repository/complaintCollection/ComplaintCollectionResourceService.java @@ -61,6 +61,7 @@ public class ComplaintCollectionResourceService extends BaseDAO { setBatchLikeQuery(param.getOriginId(), param.getOriginIds(), qw, ComplaintCollection::getOriginId); setBatchLikeQuery(param.getCheckStatus(), param.getCheckStatusList(),qw, ComplaintCollection::getCheckStatus); setBatchQuery(param.getSecondDepartId(), param.getSecondDepartIds(), qw, ComplaintCollection::getSecondDepartId); + setBatchQuery(param.getThirdDepartId(), param.getThirdDepartIds(), qw, ComplaintCollection::getThirdDepartId); if (CollectionUtil.size(param.getDiscoveryTimeList()) == 2 && param.getDiscoveryTimeList().get(0) != null && param.getDiscoveryTimeList().get(1) != null) {