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 0c4cb4f5..7435cb01 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 @@ -54,6 +54,13 @@ public class EsRevisePlanController extends BaseController { return esRevisePlans; } + @ApiOperation(value = "获取所有企标计划给流程(还未填写企业技术标准)") + @GetMapping("getAllPlansByWkInfo") + public List getAllPlansByWkInfo(){ + List esRevisePlans = iEsRevisePlanService.getAllPlansByWkInfo(); + return esRevisePlans; + } + @ApiOperation(value = "多条件查询企标计划") @PostMapping("queryAllPlans") public ResponseMessage queryAllPlans(EsRevisePlan esRevisePlan){ @@ -96,7 +103,6 @@ public class EsRevisePlanController extends BaseController { case "标准法规部高级经理审核": score=Double.valueOf(evaluationScore) * 0.15; break; - default: score=Double.valueOf(evaluationScore); } last.add(score); 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 562ac4b4..21febadf 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 @@ -31,4 +31,7 @@ public interface IEsRevisePlanService extends IService { List getAllPlansByWk(String esName); Object oaUpdatePlans(String esId, Date date, String s);//Ao时间 发送次数 修改 + + List getAllPlansByWkInfo(); + } 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 b9c81b0b..e6590ca4 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 @@ -239,4 +239,13 @@ public class EsRevisePlanServiceImpl extends ServiceImpl getAllPlansByWkInfo() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + List planStatus = new ArrayList<>(); + planStatus.add("6"); + queryWrapper.lambda().in(EsRevisePlan::getPlanStatus, planStatus); + return esRevisePlanDao.selectList(queryWrapper); + } }