diff --git a/src/main/java/com/biutag/supervision/pojo/param/ConfinementQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/ConfinementQueryParam.java index 756f875..7d945ba 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/ConfinementQueryParam.java +++ b/src/main/java/com/biutag/supervision/pojo/param/ConfinementQueryParam.java @@ -1,6 +1,7 @@ package com.biutag.supervision.pojo.param; import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; import org.springframework.format.annotation.DateTimeFormat; @@ -29,4 +30,7 @@ public class ConfinementQueryParam extends BasePage { // 当前单位及其所有子单位 private Boolean departBranch; + + @Schema(description = "是否关联问题 1是 0否") + private String isNegative; } diff --git a/src/main/java/com/biutag/supervision/service/ConfinementService.java b/src/main/java/com/biutag/supervision/service/ConfinementService.java index c13c7c9..15df93d 100644 --- a/src/main/java/com/biutag/supervision/service/ConfinementService.java +++ b/src/main/java/com/biutag/supervision/service/ConfinementService.java @@ -84,6 +84,20 @@ public class ConfinementService extends ServiceImpl one.setNegativeId(negativeIdMap.get(one.getId()))); + if (StrUtil.isNotBlank(param.getIsNegative())) { + List filtered = records; + if ("1".equals(param.getIsNegative())) { + filtered = records.stream() + .filter(one -> StrUtil.isNotBlank(one.getNegativeId())) + .collect(Collectors.toList()); + } else if ("0".equals(param.getIsNegative())) { + filtered = records.stream() + .filter(one -> StrUtil.isBlank(one.getNegativeId())) + .collect(Collectors.toList()); + } + confinementVoPage.setRecords(filtered); + confinementVoPage.setTotal(filtered.size()); + } } return confinementVoPage; }