From b4410694f18bca164ed787a1240473798301fd65 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Thu, 23 Mar 2023 13:54:18 +0800 Subject: [PATCH] =?UTF-8?q?OA=E5=BC=BA=E5=88=B6=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/FeignClient/workFlowFeignClient.java | 2 ++ .../com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java | 4 ++++ .../com/adc/da/workFlow/controller/WorkFlowController.java | 5 +++++ 3 files changed, 11 insertions(+) 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 19d0f7f5..fb45a655 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 @@ -473,4 +473,6 @@ public interface workFlowFeignClient { void setRelation(@RequestParam("esPlanId")String esPlanId,@RequestParam("prcId") String prcId, @RequestParam("finish") String finish); @RequestMapping(value = "/bat-wkflow/esTechRelation/getEsByWk",method = RequestMethod.GET) String getEsByWk(@RequestParam("prcId")String prcId); + @RequestMapping(value = "/bat-wkflow/deleteOAByMandatory",method = RequestMethod.GET) + String deleteOAByMandatory(@RequestParam("todoId") String todoId,@RequestParam("assignee") String assignee); } 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 fa997022..3ade5857 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 @@ -418,4 +418,8 @@ public class workFlowFeignClientImpl { public String getEsByWk(@RequestParam("prcId")String prcId) { return workFlowFeignClient.getEsByWk(prcId); } + + public String deleteOAByMandatory(@RequestParam("todoId") String todoId,@RequestParam("assignee") String assignee) { + return workFlowFeignClient.deleteOAByMandatory(todoId,assignee); + } } 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 3c6c4c82..04445785 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 @@ -953,4 +953,9 @@ public class WorkFlowController { return workFlowFeignClient.getEsByWk(prcId); } + @ApiOperation(value = "OA待办强制删除") + @GetMapping("/deleteOAByMandatory") + public String deleteOAByMandatory(@RequestParam("todoId") String todoId,@RequestParam("assignee") String assignee) { + return workFlowFeignClient.deleteOAByMandatory(todoId,assignee); + } }