From bb572ededd8f82714477cf54e6dc4e5218c53d70 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 10 Jul 2024 17:17:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=80=9A=E7=94=A8=E8=8D=89=E7=A8=BF?=
 =?UTF-8?q?=E5=8A=9E=E7=90=86=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ESProcessCommonController.java   | 17 ++++++++++++++++-
 .../common/service/ActFlowCommonService.java    |  3 +--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/controller/ESProcessCommonController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/controller/ESProcessCommonController.java
index b1e209c6..b23f222a 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/controller/ESProcessCommonController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/controller/ESProcessCommonController.java
@@ -8,7 +8,10 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 
@@ -41,5 +44,17 @@ public class ESProcessCommonController {
     }
 
 
+    /**
+     * 草稿办理
+     * @param draftId
+     */
+    @AutoLog(value = "草稿办理")
+    @ApiOperation(value="草稿办理", notes="草稿办理")
+    @GetMapping("/draftHandle")
+    @Translation
+    public Result<?> draftHandle(@RequestParam("draftId") @ApiParam("草稿Id") String draftId) {
+        return Result.OK(actFlowCommonService.getExistDraft(draftId));
+    }
+
 
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
index 2a46d3fa..4518df99 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
@@ -323,10 +323,9 @@ public class ActFlowCommonService {
         return standTypeVO;
     }
 
-    public ProcessDraft getExistDraft(String draftId, ProcessTypeEnum processTypeEnum) {
+    public ProcessDraft getExistDraft(String draftId) {
         String userId = UserUtils.getUserId();
         LambdaQueryWrapper<ProcessDraft> draftWrapper = new LambdaQueryWrapper<>();
-        draftWrapper.eq(ProcessDraft::getPrcType, processTypeEnum.getValue());
         draftWrapper.eq(ProcessDraft::getUserId, userId);
         draftWrapper.eq(ProcessDraft::getId, draftId);
         return processDraftService.getOne(draftWrapper);