From dd7c70b90ee95efd1435765e693e29252fce06d9 Mon Sep 17 00:00:00 2001
From: buaixuexideshitongxue <2936013465@qq.com>
Date: Fri, 16 Jan 2026 10:33:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2--=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=B7=BB=E5=8A=A0=E2=80=98=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E7=B1=BB=E5=9E=8B=E2=80=99=20=E2=80=98=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E7=BB=93=E6=9E=9C=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/param/NegativeQueryParam.java            |  3 +++
 .../supervision/service/NegativeQueryService.java | 15 +++++++++++++++
 2 files changed, 18 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 6ba2549..f5995fa 100644
--- a/src/main/java/com/biutag/supervision/pojo/param/NegativeQueryParam.java
+++ b/src/main/java/com/biutag/supervision/pojo/param/NegativeQueryParam.java
@@ -101,5 +101,8 @@ public class NegativeQueryParam extends BasePage {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private List<Date> mailTime = new ArrayList<>();
 
+    @Schema(description = "问题类型")
+    private List<String> threeLevelCode;
+
 
 }
diff --git a/src/main/java/com/biutag/supervision/service/NegativeQueryService.java b/src/main/java/com/biutag/supervision/service/NegativeQueryService.java
index 681d595..71b114c 100644
--- a/src/main/java/com/biutag/supervision/service/NegativeQueryService.java
+++ b/src/main/java/com/biutag/supervision/service/NegativeQueryService.java
@@ -173,6 +173,21 @@ public class NegativeQueryService {
                 });
             }
         }
+        if (CollectionUtil.isNotEmpty(param.getThreeLevelCode())){
+            queryWrapper.exists(
+                    "SELECT 1 FROM negative_problem_relation npr " +
+                            "WHERE npr.negativeId = negative.id AND npr.threeLevelCode IN (" +
+                            String.join(",", param.getThreeLevelCode()) + ")"
+            );
+        }
+        if (CollectionUtil.isNotEmpty(param.getHandleResultCode())){
+            queryWrapper.exists(
+                    "SELECT 1 FROM negative_blame nb " +
+                            "WHERE nb.negativeId = negative.id AND nb.handleResultCode IN (" +
+                           String.join(",", param.getHandleResultCode()) + ")"
+            );
+            queryWrapper.in(Negative::getProcessingStatus,List.of("completed", "approval"));
+        }
         // 排序
         queryWrapper.orderBy("crtTime".equals(param.getOrderProp()), OrderEnum.ascending.name().equals(param.getOrder()), Negative::getCrtTime)
                 .orderBy("discoveryTime".equals(param.getOrderProp()), OrderEnum.ascending.name().equals(param.getOrder()), Negative::getDiscoveryTime);;