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 draftWrapper = new LambdaQueryWrapper<>(); - draftWrapper.eq(ProcessDraft::getPrcType, processTypeEnum.getValue()); draftWrapper.eq(ProcessDraft::getUserId, userId); draftWrapper.eq(ProcessDraft::getId, draftId); return processDraftService.getOne(draftWrapper);