diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectplan/quotadeclaration/ProjectPlanBookQry.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectplan/quotadeclaration/ProjectPlanBookQry.java
index 63a05bab53f545bd5298b49f47e402803f635a22..aa15861f030fa378a85b69a0f5d85d2d25b4a4e1 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectplan/quotadeclaration/ProjectPlanBookQry.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectplan/quotadeclaration/ProjectPlanBookQry.java
@@ -36,6 +36,12 @@ public class ProjectPlanBookQry extends BaseDTO {
     @Positive(message = "鍒嗛〉鍙傛暟蹇呴』涓烘鏁存暟", groups = {pageValidGroup.class})
     private Integer pageSize;
 
+    @ApiModelProperty(value = "閮ㄩ棬缂栧彿",example = "")
+    private String departmentCode;
+
+    @ApiModelProperty(value = "椤圭洰绫诲瀷",example = "")
+    private String projectType;
+
     public interface pageValidGroup{};
 
 }
diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/prediction/QueryYBInfoServiceImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/prediction/QueryYBInfoServiceImpl.java
index f123eb2de60a7bbda1c909d2ab198d3b0f7ff3ea..235a49f193545fbfdde2c6f970d63cc783837fc8 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/prediction/QueryYBInfoServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/prediction/QueryYBInfoServiceImpl.java
@@ -1,5 +1,6 @@
 package com.seasky.projectplan.infrastructure.reader.prediction;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,6 +18,8 @@ import com.seasky.microflowapi.api.IFlow;
 import com.seasky.microflowapi.dto.FlowCanShowOut;
 import com.seasky.projectplan.application.command.prediction.SaveYBKZMoneySvr;
 import com.seasky.projectplan.application.query.prediction.QueryYBInfoService;
+import com.seasky.projectplan.domain.aggregate.common.AuditEnum;
+import com.seasky.projectplan.domain.aggregate.common.PlanTypeEnum;
 import com.seasky.projectplan.dto.incomeplan.InComePlanOut;
 import com.seasky.projectplan.dto.projectplan.quotadeclaration.*;
 import com.seasky.projectplan.dto.projectplan.rpc.PageSelectModel;
@@ -97,12 +100,20 @@ public class QueryYBInfoServiceImpl extends AbstractService<ProjectPlanBookPo, P
         }
 
         QueryWrapper<ProjectPlanBookPo> objectQueryWrapper = new QueryWrapper<>();
+        objectQueryWrapper.eq("state", AuditEnum.SHENHEWANCHENG.key());
+        objectQueryWrapper.eq("plan_type", PlanTypeEnum.ERSHANG.name());
+        if (ObjectUtil.isNotEmpty(projectPlanBookQry.getProjectName())) {
+            objectQueryWrapper.like("project_name", projectPlanBookQry.getProjectName());
+        }
         if (!(ObjectUtils.isEmpty(projectPlanBookQry.getYear()))) {
             objectQueryWrapper.eq("year", projectPlanBookQry.getYear());
         }
-        objectQueryWrapper.like("project_name", projectPlanBookQry.getProjectName());
-        objectQueryWrapper.eq("state", "瀹℃牳瀹屾垚");
-        objectQueryWrapper.eq("plan_type", "ERSHANG");
+        if (ObjectUtil.isNotEmpty(projectPlanBookQry.getDepartmentCode())) {
+            objectQueryWrapper.eq("department_code", projectPlanBookQry.getDepartmentCode());
+        }
+        if (ObjectUtil.isNotEmpty(projectPlanBookQry.getProjectType())) {
+            objectQueryWrapper.eq("project_type", projectPlanBookQry.getProjectType());
+        }
         List<ProjectPlanBookPo> planBookPoPage = projectPlanBookMapper.selectPage(page, objectQueryWrapper).getRecords();
 
         ArrayList<ProjectPlanBookOut> projectPlanBookOuts = new ArrayList<>();
@@ -147,8 +158,8 @@ public class QueryYBInfoServiceImpl extends AbstractService<ProjectPlanBookPo, P
         }
         objectQueryWrapper.in("department_code", deptCode);
         objectQueryWrapper.like("project_name", projectPlanBookQry.getProjectName());
-        objectQueryWrapper.eq("state", "瀹℃牳瀹屾垚");
-        objectQueryWrapper.eq("plan_type", "ERSHANG");
+        objectQueryWrapper.eq("state", AuditEnum.SHENHEWANCHENG.key());
+        objectQueryWrapper.eq("plan_type", PlanTypeEnum.ERSHANG.name());
         List<ProjectPlanBookPo> planBookPoPage = projectPlanBookMapper.selectPage(page, objectQueryWrapper).getRecords();
         page.setRecords(planBookPoPage);
         ArrayList<ProjectPlanBookOut> projectPlanBookOuts = new ArrayList<>();