From 4fd5d9a85afdbe21b52168b50ced081432585962 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 10 Aug 2022 16:28:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=BE=85=E5=8A=9Eid=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=B5=81=E7=A8=8B=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/modules/project/enums/JumpLinkEnum.java     | 3 +++
 .../modules/wkflow/controller/workFlowController.java    | 7 +++++++
 .../modules/wkflow/feginClient/WorkFlowFeignClient.java  | 8 ++++++++
 .../wkflow/feginClient/impl/WorkFlowFeignClientImpl.java | 9 +++++++++
 4 files changed, 27 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java
index 54aa3225b..85f2b4d9f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/JumpLinkEnum.java
@@ -19,6 +19,9 @@ public enum JumpLinkEnum {
     DESIGN_AFFIRM_LINK("设计符合性确认链接","4","/ProjectDetails?id=","&type=103"),
     TASK_AFFIRM_LINK("任务确认链接","2","/ProcessCenter",""),
     COMPLIANCE_PROCESS_DETAIL_LINK("符合性流程明细页路由","2","/taskListProcess",""),
+
+    PROBLEM_KNOWLEDGE_BASE_DETAIL("问题知识库，详情页","","/problemKnowledgeBaseView",""),
+    PROBLEM_KNOWLEDGE_BASE("问题知识库，列表页","","/problemknowledgeBase",""),
     ;
 
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java
index f3abd5757..a8b8f4fa9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java
@@ -214,4 +214,11 @@ public class workFlowController {
     public Result startTaskToConfirmProcess(@RequestBody JSONObject jsonObject){
         return  workFlowFeignClient.startTaskToConfirmProcess(jsonObject);
     }
+
+    @AutoLog(value = "根据taskId删除流程")
+    @ApiOperation(value="根据taskId删除流程", notes="根据taskId删除流程")
+    @GetMapping("/deleteProcessInstanceByTaskId")
+    public Result<String> deleteProcessInstanceByTaskId(@RequestParam("taskId")String taskId){
+        return workFlowFeignClient.deleteProcessInstance(taskId);
+    }
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java
index 401da0f62..aa9bdd61b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java
@@ -156,4 +156,12 @@ public interface WorkFlowFeignClient {
 
     @RequestMapping(value = "/bat-wkflow/task/completeLawsTechnologyEvaluationTaskByPids",method = RequestMethod.GET)
     Result<String> completeLawsTechnologyEvaluationTaskByPids(@RequestParam("actiProcInstIds") String actiProcInstIds);
+
+    /**
+     * 根据待办id删除流程
+     * @param taskId
+     * @return
+     */
+    @RequestMapping(value = "/bat-wkflow/deleteProcessInstanceByTaskId",method = RequestMethod.GET)
+    Result<String> deleteProcessInstanceByTaskId(@RequestParam("taskId") String taskId);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java
index 707089e60..ae1940c04 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java
@@ -177,4 +177,13 @@ public class WorkFlowFeignClientImpl{
         Result<String> stringWrapper = workFlowFeignClient.startTaskToConfirmProcess(jsonObject.toString());
         return Result.OK(stringWrapper.getResult());
     }
+
+    /**
+     * 根据待办id删除流程
+     * @param taskId
+     * @return
+     */
+    public Result<String> deleteProcessInstanceByTaskId(@RequestParam("taskId")String taskId){
+        return workFlowFeignClient.deleteProcessInstance(taskId);
+    }
 }