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 5393346..85b144f 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 @@ -139,6 +139,8 @@ public class ComplaintCollectionQueryParam extends BasePage { @Schema(description = "涉及单位ID集合(包含所有子节点)") private Set involveDepartIds; + @Schema(description = "处理结果代码") + private List handleResultCode; // @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 6d686cb..7872112 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 @@ -99,6 +99,9 @@ public class ComplaintCollectionPageRequest extends BasePage implements ParamChe @Schema(description = "办理单位ID") private String handleDepartId; + @Schema(description = "处理结果代码") + private List handleResultCode; + @Override public void check() { diff --git a/src/main/resources/mapper/ComplaintCollectionMapper.xml b/src/main/resources/mapper/ComplaintCollectionMapper.xml index 7ee1c00..7c4be41 100644 --- a/src/main/resources/mapper/ComplaintCollectionMapper.xml +++ b/src/main/resources/mapper/ComplaintCollectionMapper.xml @@ -335,6 +335,19 @@ ) + + AND n.id IN ( + SELECT DISTINCT nb.negativeId + FROM negative_blame nb + WHERE + + ( + CONCAT(',', nb.handleResultCode, ',') LIKE CONCAT('%,', #{code}, ',%') + OR CONCAT(',', nb.leadHandleResultCode, ',') LIKE CONCAT('%,', #{code}, ',%') + ) + + ) + ORDER BY n.crtTime DESC, cc.id DESC