From 412088a3c0aa6ea8892de9617304b77d27048d8e Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Sat, 28 Feb 2026 14:23:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2=E5=8A=A0?= =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E5=8F=91=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervision/pojo/param/NegativeQueryParam.java | 9 +++++++++ .../com/biutag/supervision/pojo/vo/NegativeQueryVo.java | 8 ++++++++ .../biutag/supervision/service/NegativeQueryService.java | 4 ++++ 3 files changed, 21 insertions(+) diff --git a/src/main/java/com/biutag/supervision/pojo/param/NegativeQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/NegativeQueryParam.java index f5995fa..a6650d1 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/NegativeQueryParam.java +++ b/src/main/java/com/biutag/supervision/pojo/param/NegativeQueryParam.java @@ -1,5 +1,6 @@ package com.biutag.supervision.pojo.param; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; @@ -104,5 +105,13 @@ public class NegativeQueryParam extends BasePage { @Schema(description = "问题类型") private List threeLevelCode; + @Schema(description = "下发单位id") + @TableField("issuingDepartId") + private String issuingDepartId; + + @Schema(description = "下发单位名字") + @TableField("issuingDepartName") + private String issuingDepartName; + } diff --git a/src/main/java/com/biutag/supervision/pojo/vo/NegativeQueryVo.java b/src/main/java/com/biutag/supervision/pojo/vo/NegativeQueryVo.java index c623f85..e4c42cf 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/NegativeQueryVo.java +++ b/src/main/java/com/biutag/supervision/pojo/vo/NegativeQueryVo.java @@ -1,6 +1,8 @@ package com.biutag.supervision.pojo.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; @@ -192,5 +194,11 @@ public class NegativeQueryVo { // 整改情况 private String rectifyDesc; + @Schema(description = "下发单位id") + @TableField("issuingDepartId") + private String issuingDepartId; + @Schema(description = "下发单位名字") + @TableField("issuingDepartName") + private String issuingDepartName; } diff --git a/src/main/java/com/biutag/supervision/service/NegativeQueryService.java b/src/main/java/com/biutag/supervision/service/NegativeQueryService.java index fdca3e7..57cbe4a 100644 --- a/src/main/java/com/biutag/supervision/service/NegativeQueryService.java +++ b/src/main/java/com/biutag/supervision/service/NegativeQueryService.java @@ -173,6 +173,10 @@ public class NegativeQueryService { }); } } + if (StrUtil.isNotBlank(param.getIssuingDepartId())){ + List allNodeIds = departService.getAllNodeIds(param.getIssuingDepartId()); + queryWrapper.in(Negative::getIssuingDepartId, allNodeIds); + } if (CollectionUtil.isNotEmpty(param.getThreeLevelCode())){ String codes = param.getThreeLevelCode().stream() .map(code -> "'" + code + "'")