Merge branch 'master' into 'dev_20230216'

# Conflicts:
#   adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java

adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java

@@ -473,6 +473,8 @@ 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);
     @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/selectBusProcessNew",method = RequestMethod.GET)
     String selectBusProcessNew(@RequestParam("taskId")String taskId);
     @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/deleteReplyToenNotice",method = RequestMethod.POST)

adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java

@@ -419,6 +419,10 @@ public class workFlowFeignClientImpl {
         return workFlowFeignClient.getEsByWk(prcId);
     }
 
+    public String deleteOAByMandatory(@RequestParam("todoId") String todoId,@RequestParam("assignee") String assignee) {
+        return workFlowFeignClient.deleteOAByMandatory(todoId,assignee);
+    }
+
     public String selectBusProcessNew(@RequestParam("taskId")String taskId) {
         return workFlowFeignClient.selectBusProcessNew(taskId);
     }

adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java

@@ -975,6 +975,7 @@ public class WorkFlowController {
         return workFlowFeignClient.selectBusProcessNew(taskId);
     }
 
+
     @ApiOperation(value = "问答中心（第一个人回答以后删除其他人的代办任务以及OA提醒）")
     @PostMapping("/deleteReplyToenNotice")
     public List<BusProcessNew> deleteReplyToenNotice(@RequestParam("taskId") String taskId,@RequestParam("answerer") String answerer) {
@@ -985,5 +986,10 @@ public class WorkFlowController {
     @GetMapping("/selectAskId")
     public String selectAskId(@RequestParam("taskId") String taskId) {
         return workFlowFeignClient.selectAskId(taskId);
+    ｝
+    @ApiOperation(value = "OA待办强制删除")
+    @GetMapping("/deleteOAByMandatory")
+    public String deleteOAByMandatory(@RequestParam("todoId") String todoId,@RequestParam("assignee") String assignee) {
+        return workFlowFeignClient.deleteOAByMandatory(todoId,assignee);
     }
 }