From 442770282d43b9ced2793aadd93a1553039546da Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Thu, 12 Mar 2026 15:38:55 +0800 Subject: [PATCH] =?UTF-8?q?fix--=E7=9D=A3=E5=AF=9F=E6=8E=AA=E6=96=BD?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6=E5=85=B3=E8=81=94=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/param/ConfinementQueryParam.java | 4 ++++ .../supervision/service/ConfinementService.java | 14 ++++++++++++++ 2 files changed, 18 insertions(+) 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; }