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

---
 .../njcn/supervision/pojo/param/survey/SurveyPlanParam.java | 6 ++++++
 .../njcn/supervision/pojo/param/survey/SurveyTestParam.java | 6 ++++++
 .../service/plan/impl/SupervisionPlanPOServiceImpl.java     | 2 ++
 .../service/survey/impl/SurveyPlanServiceImpl.java          | 4 ++++
 .../service/survey/impl/SurveyTestServiceImpl.java          | 5 +++++
 5 files changed, 23 insertions(+)

diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyPlanParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyPlanParam.java
index 35fec375b..d44924814 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyPlanParam.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyPlanParam.java
@@ -95,6 +95,12 @@ public class SurveyPlanParam implements Serializable {
          */
         String deptIndex;
 
+        /**
+         * 计划状态(1:审批中；2：审批通过；3：审批不通过；4：已取消)
+         */
+        @ApiModelProperty(value = "计划状态")
+        private Integer status;
+
     }
 
 }
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java
index 9bba69554..9aa29e213 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyTestParam.java
@@ -102,6 +102,12 @@ public class SurveyTestParam implements Serializable {
     @EqualsAndHashCode(callSuper = true)
     public static class SurveyTestQueryParam extends BaseParam {
 
+        /**
+         * 测试审批状态(1:审批中；2：审批通过；3：审批不通过；4：已取消)
+         */
+        @ApiModelProperty(value = "测试审批状态")
+        private Integer status;
+
     }
 
 }
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 c0eb6f06c..347aeecdb 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,6 +212,8 @@ public class SupervisionPlanPOServiceImpl extends ServiceImpl<SupervisionPlanPOM
             lambdaQueryWrapper.orderByDesc(SupervisionPlanPO::getCreateTime);
         }
 
+       // lambdaQueryWrapper.eq(Objects.nonNull(supvPlanParam.getStatus(),SupervisionPlanPO::getStatus,supvPlanParam.getStatus()));
+
         //获取当前用户部门所有同事的id，查看该部门下所有的数据
         List<String> colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData();
         lambdaQueryWrapper.in(SupervisionPlanPO::getCreateBy,colleaguesIds);
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java
index d5aaef40f..5e7502153 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java
@@ -88,6 +88,10 @@ public class SurveyPlanServiceImpl extends ServiceImpl<SurveyPlanMapper, SurveyP
                 surveyPlanVOQueryWrapper.in("supervision_survey_plan.dept_id", deptIds);
             }
 
+            if (Objects.nonNull(surveyPlanQueryParam.getStatus())) {
+                surveyPlanVOQueryWrapper.in("supervision_survey_plan.status", surveyPlanQueryParam.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 062a4b0cf..7637b5758 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
@@ -106,6 +106,11 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
                     return new Page<>();
                 }
             }
+
+            if (Objects.nonNull(surveyTestQueryParam.getStatus())) {
+                surveyTestVOQueryWrapper.in("supervision_survey_plan.status", surveyTestQueryParam.getStatus());
+            }
+
         }
         //获取当前用户部门所有同事的id，查看该部门下所有的数据
         List<String> colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData();