新增状态管理查询

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;
+
     }
 
 }

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;
+
     }
 
 }

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);

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();

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();