From babad96a12818cb9e2c7f0df7e32f57fbfdda011 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Mon, 21 Nov 2022 19:48:04 +0800
Subject: [PATCH] =?UTF-8?q?174-=E7=AE=A1=E6=8E=A7=E6=B5=81=E7=A8=8B,?=
 =?UTF-8?q?=E6=89=B9=E5=87=86=E8=8A=82=E7=82=B9=E8=8E=B7=E5=8F=96=E4=BC=81?=
 =?UTF-8?q?=E6=A0=87=E8=AE=A1=E5=88=92ID=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EsRevisePlanController.java       |  4 ++--
 .../service/IEsRevisePlanService.java            |  2 +-
 .../service/impl/EsRevisePlanServiceImpl.java    | 16 +++++++++++-----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java
index 4de951b9..a8058830 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java
@@ -48,8 +48,8 @@ public class EsRevisePlanController extends BaseController<EsRevisePlan> {
 
     @ApiOperation(value = "获取所有企标计划给流程")
     @GetMapping("getAllPlansByWk")
-    public List<EsRevisePlan> getAllPlansByWk(){
-        List<EsRevisePlan> esRevisePlans = iEsRevisePlanService.getAllPlansByWk();
+    public List<EsRevisePlan> getAllPlansByWk(String esName){
+        List<EsRevisePlan> esRevisePlans = iEsRevisePlanService.getAllPlansByWk(esName);
         return esRevisePlans;
     }
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java
index 73bba267..6d727bd3 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java
@@ -27,5 +27,5 @@ public interface IEsRevisePlanService extends IService<EsRevisePlan> {
     int delPlans(String ids);//批量删除
     List<EsRevisePlan> getDataByName(EsRevisePlan esRevisePlan);
 
-    List<EsRevisePlan> getAllPlansByWk();
+    List<EsRevisePlan> getAllPlansByWk(String esName);
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
index 8f51a591..a7b22344 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
@@ -207,12 +207,18 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
     }
 
     @Override
-    public List<EsRevisePlan> getAllPlansByWk() {
+    public List<EsRevisePlan> getAllPlansByWk(String esName) {
         QueryWrapper<EsRevisePlan> queryWrapper = new QueryWrapper<>();
-        List<String> planStatus = new ArrayList<>();
-        planStatus.add("1");
-        planStatus.add("2");
-        queryWrapper.lambda().in(EsRevisePlan::getPlanStatus, planStatus);
+
+        if (StringUtils.isNotBlank(esName)) {
+            queryWrapper.lambda().eq(EsRevisePlan::getEsName, esName);
+        } else {
+            List<String> planStatus = new ArrayList<>();
+            planStatus.add("1");
+            planStatus.add("2");
+            queryWrapper.lambda().in(EsRevisePlan::getPlanStatus, planStatus);
+        }
+
         return esRevisePlanDao.selectList(queryWrapper);
     }
 }