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 { @ApiOperation(value = "获取所有企标计划给流程") @GetMapping("getAllPlansByWk") - public List getAllPlansByWk(){ - List esRevisePlans = iEsRevisePlanService.getAllPlansByWk(); + public List getAllPlansByWk(String esName){ + List 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 { int delPlans(String ids);//批量删除 List getDataByName(EsRevisePlan esRevisePlan); - List getAllPlansByWk(); + List 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 getAllPlansByWk() { + public List getAllPlansByWk(String esName) { QueryWrapper queryWrapper = new QueryWrapper<>(); - List 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 planStatus = new ArrayList<>(); + planStatus.add("1"); + planStatus.add("2"); + queryWrapper.lambda().in(EsRevisePlan::getPlanStatus, planStatus); + } + return esRevisePlanDao.selectList(queryWrapper); } }