From 0939f20e4afbc5dd6c4723b4b65567a9d9f81fd9 Mon Sep 17 00:00:00 2001
From: cdf <857448963@qq.com>
Date: Wed, 5 Jun 2024 16:07:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=8A=B6=E6=80=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/leaflet/impl/WarningLeafletServiceImpl.java        | 1 +
 .../service/plan/impl/SupervisionPlanPOServiceImpl.java        | 2 +-
 .../supervision/service/survey/impl/SurveyTestServiceImpl.java | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java
index 28c10d651..60759f224 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java
@@ -198,6 +198,7 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
         warningLeafletVOQueryWrapper.in("supervision_warning_leaflet.Create_By", colleaguesIds)
                 .eq("supervision_warning_leaflet.state",DataStateEnum.ENABLE.getCode())
                 .eq("supervision_warning_leaflet.leaflet_type", LeafletTypeEnum.ALARM.getCode())
+                .eq(Objects.nonNull(warningLeafletQueryParam.getStatus()),"supervision_warning_leaflet.status",warningLeafletQueryParam.getStatus())
                 .orderByDesc("supervision_warning_leaflet.Update_Time");
         Page<WarningLeafletVO> warningLeafletVOPage = this.baseMapper.alarmPageData(new Page<>(PageFactory.getPageNum(warningLeafletQueryParam), PageFactory.getPageSize(warningLeafletQueryParam)), warningLeafletVOQueryWrapper);
         //目前仅知道现场测试超标会有附件
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionPlanPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionPlanPOServiceImpl.java
index 347aeecdb..a5f88edf6 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionPlanPOServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/plan/impl/SupervisionPlanPOServiceImpl.java
@@ -212,7 +212,7 @@ public class SupervisionPlanPOServiceImpl extends ServiceImpl<SupervisionPlanPOM
             lambdaQueryWrapper.orderByDesc(SupervisionPlanPO::getCreateTime);
         }
 
-       // lambdaQueryWrapper.eq(Objects.nonNull(supvPlanParam.getStatus(),SupervisionPlanPO::getStatus,supvPlanParam.getStatus()));
+       lambdaQueryWrapper.eq(Objects.nonNull(supvPlanParam.getStatus()),SupervisionPlanPO::getStatus,supvPlanParam.getStatus());
 
         //获取当前用户部门所有同事的id，查看该部门下所有的数据
         List<String> colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData();
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java
index 7637b5758..14ed82660 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java
@@ -107,8 +107,9 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
                 }
             }
 
+
             if (Objects.nonNull(surveyTestQueryParam.getStatus())) {
-                surveyTestVOQueryWrapper.in("supervision_survey_plan.status", surveyTestQueryParam.getStatus());
+                surveyTestVOQueryWrapper.eq("supervision_survey_test.status", surveyTestQueryParam.getStatus());
             }
 
         }