From 5e27c4ffaac151154ee3b4f7d3309d477e955a7f Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Tue, 18 Apr 2023 15:43:44 +0800
Subject: [PATCH] =?UTF-8?q?OA=E5=88=A0=E9=99=A4=E9=80=9A=E7=94=A8=20pid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/FeignClient/workFlowFeignClient.java   |  2 ++
 .../workFlowFeignClientImpl.java              |  4 ++++
 .../controller/WorkFlowController.java        | 19 ++++++++++++++-----
 .../src/main/resources/mysql/interfaceLog.sql |  8 +++++++-
 4 files changed, 27 insertions(+), 6 deletions(-)

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 7f97d4f5..b906b95d 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
@@ -492,4 +492,6 @@ public interface workFlowFeignClient {
     ResponseMessage<BusProcessNew> questionsAndAnswers(@RequestParam("askId") String askId, @RequestParam("answerer") String answerer);
     @RequestMapping(value = "/bat-wkflow/deleteOATask",method = RequestMethod.GET)
     String deleteOATask(@RequestParam("pId")  String pId);
+    @RequestMapping(value = "/bat-wkflow/deleteOATaskInfo",method = RequestMethod.GET)
+    String deleteOATaskInfo(@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 2824665e..f12beed2 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
@@ -450,4 +450,8 @@ public class workFlowFeignClientImpl {
     public String deleteOATask(@RequestParam("pId")  String pId) {
         return workFlowFeignClient.deleteOATask(pId);
     }
+
+    public String deleteOATaskInfo(@RequestParam("pId")  String pId) {
+        return workFlowFeignClient.deleteOATaskInfo(pId);
+    }
 }
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 931faa89..2253b693 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
@@ -536,6 +536,7 @@ public class WorkFlowController {
                         data.setShowreceive(true);
                     }
                 }
+
             }
         }
         return pageInfo;
@@ -1178,10 +1179,6 @@ public class WorkFlowController {
                      qbfsForm.put("prcCreateUser",asList.get(0));
                      qbfsForm.put("prcCreateUserName",byIdUseLevel.getUname());
 
-
-//                if(jsonObject.get("prcCreateUser")!=null){
-//                    busMes.setUserId(jsonObject.get("prcCreateUser").toString());
-//                }
                 //起草人
                 processRollBackEO.setUserId(asList.get(0));
                 processRollBackEO.setType("25");
@@ -1211,7 +1208,7 @@ public class WorkFlowController {
         return workFlowFeignClient.questionsAndAnswers(askId,answerer);
     }
 
-    @ApiOperation(value = "删除OA代办任务 pid")
+    @ApiOperation(value = "删除OA代办任务 pid（制修订专用）")
     @GetMapping("/deleteOATask")
     public String deleteOATask(@RequestParam("pIds") String pIds) {
         if(StringUtils.isNotBlank(pIds)){
@@ -1222,4 +1219,16 @@ public class WorkFlowController {
         }
         return "1";
     }
+
+    @ApiOperation(value = "删除OA代办任务 pid（通用）")
+    @GetMapping("/deleteOATaskInfo")
+    public String deleteOATaskInfo(@RequestParam("pIds") String pIds) {
+        if(StringUtils.isNotBlank(pIds)){
+            String[] split = pIds.split(",");
+            for (String pId: split){
+                workFlowFeignClient.deleteOATaskInfo(pId);
+            }
+        }
+        return "1";
+    }
 }
diff --git a/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql b/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql
index 1eefefbd..710aba6a 100644
--- a/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql
+++ b/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql
@@ -1,9 +1,15 @@
 -- 福田  需要通过第三方调用的接口
 
+-- 2023-04-18 15:22
+-- 名称  通过pid删除OA待办任务 通用接口
+-- 详情
+-- 路径 http://localhost:9090/api/lawss/activiti/deleteOATaskInfo
+-- 参数 String pIds (pIds 字符串拼接 逗号隔开)
+-- 类型 Get
 
 
 -- 2023-04-18
--- 名称  通过pid删除OA待办任务
+-- 名称  通过pid删除OA待办任务 制修订专用
 -- 详情
 -- 路径 http://localhost:9090/api/lawss/activiti/deleteOATask
 -- 参数 String pIds (pIds 字符串拼接 逗号隔开)