diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index ff88272a..ab26227f 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -53,6 +53,9 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/oaTaskExec/execTask",method = RequestMethod.GET) Map execTask(@RequestParam("todoId") String todoId); + @RequestMapping(value = "/bat-wkflow/esPrcRelation/acceptTask",method = RequestMethod.GET) + Integer acceptTask(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("taskId") String taskId); + @RequestMapping(value = "/bat-wkflow/task/get_verify_by_instance",method = RequestMethod.GET) Map get_verify_by_instance(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId); diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index 5f0c3a90..f0caf3ae 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java @@ -80,6 +80,11 @@ public class workFlowFeignClientImpl { return stringWrapper; } + public Integer acceptTack(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("taskId") String taskId){ + Integer integerWrapper = workFlowFeignClient.acceptTask(nowEsId,oaFlag,taskId); + return integerWrapper; + } + public Map get_verify_by_instance(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){ Map stringWrapper = workFlowFeignClient.get_verify_by_instance(taskId,pId); return stringWrapper; diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index a7b91966..d0f604ae 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -243,6 +243,12 @@ public class WorkFlowController { return workFlowFeignClient.execTask(todoId); } + @ApiOperation(value = "管控流程接收任务") + @GetMapping("/acceptTack") + public Integer acceptTack(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("taskId") String taskId) { + return workFlowFeignClient.acceptTack(nowEsId,oaFlag,taskId); + } + @ApiOperation(value = "流程实例明细验证是否完成") @GetMapping("/get_verify_by_instance") public Map activiti_define_start1(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){ diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 22da1a26..1fb38073 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -59,6 +59,8 @@ public class WebMvcConfig implements WebMvcConfigurer { addInterceptor.excludePathPatterns("/api/lawss/sarLawsInfo/exportStandardsInfoExcel"); // 提供自动发起复审流程 复审数据 addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStandState/getSarBussionessStandStateProcessList"); + // 提供企标计划数据 + addInterceptor.excludePathPatterns("/api/esRevisePlan/es-revise-plan/getAllPlansByWk"); //pcms项目数据下发开放接口 addInterceptor.excludePathPatterns("/api/sarStandProjectLibrary/save"); addInterceptor.excludePathPatterns("/api/sar-stand-project-team/save"); 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 576f387a..4de951b9 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 @@ -46,6 +46,13 @@ public class EsRevisePlanController extends BaseController { return Result.success(pageInfo); } + @ApiOperation(value = "获取所有企标计划给流程") + @GetMapping("getAllPlansByWk") + public List getAllPlansByWk(){ + List esRevisePlans = iEsRevisePlanService.getAllPlansByWk(); + return esRevisePlans; + } + @ApiOperation(value = "多条件查询企标计划") @PostMapping("queryAllPlans") public ResponseMessage queryAllPlans(EsRevisePlan esRevisePlan){ 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 17ca1694..73bba267 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 @@ -26,4 +26,6 @@ public interface IEsRevisePlanService extends IService { int delPlan(String id);//删除 int delPlans(String ids);//批量删除 List getDataByName(EsRevisePlan esRevisePlan); + + List getAllPlansByWk(); } 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 cfd9a84c..8f51a591 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 @@ -205,4 +205,14 @@ public class EsRevisePlanServiceImpl extends ServiceImpl getDataByName(EsRevisePlan esRevisePlan) { return esRevisePlanDao.selectPageByName(esRevisePlan); } + + @Override + public List getAllPlansByWk() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + List planStatus = new ArrayList<>(); + planStatus.add("1"); + planStatus.add("2"); + queryWrapper.lambda().in(EsRevisePlan::getPlanStatus, planStatus); + return esRevisePlanDao.selectList(queryWrapper); + } }