From aa6c38896a069278a09c2905e97a0bdeb4a74abe Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 15 Dec 2023 11:02:44 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B0=81=E5=AD=98=E8=8D=89=E7=A8=BF?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/common/service/ActFlowCommonService.java | 1 - .../esArchive/controller/ESArchiveController.java | 10 +++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) 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 7e6bd8f7..b844cd89 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 @@ -352,7 +352,6 @@ public class ActFlowCommonService { draftWrapper.eq(ProcessDraft::getPrcType, processTypeEnum.getValue()); draftWrapper.eq(ProcessDraft::getUserId, userId); draftWrapper.eq(ProcessDraft::getId, draftId); - draftWrapper.eq(ProcessDraft::getProjectId, businessId); return processDraftService.getOne(draftWrapper); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/controller/ESArchiveController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/controller/ESArchiveController.java index 98af0ebe..7a6d8c11 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/controller/ESArchiveController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/controller/ESArchiveController.java @@ -3,6 +3,8 @@ package com.jero.modules.activiti.process.esArchive.controller; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.Translation; +import com.jero.modules.activiti.enums.ProcessTypeEnum; +import com.jero.modules.activiti.process.common.entity.ProcessDraft; import com.jero.modules.activiti.process.common.entity.TransferVO; import com.jero.modules.activiti.process.common.service.ActFlowCommonService; import com.jero.modules.activiti.process.esAbolish.entity.vo.ESAbolishDataVO; @@ -36,6 +38,9 @@ public class ESArchiveController { @Resource private IProcessHandleService processHandleService; + @Resource + private ActFlowCommonService actFlowCommonService; + /** * 新增企标封存申请 * @@ -82,9 +87,8 @@ public class ESArchiveController { @ApiOperation(value="企标封存流程-草稿办理", notes="企标封存流程-草稿办理") @GetMapping("/draftHandle") @Translation - public Result draftHandle(@RequestParam("draftId") @ApiParam("草稿Id") String draftId, - @RequestParam("projectId") @ApiParam("业务数据Id") String projectId) { - return Result.OK(archiveService.getDraftData(draftId, projectId)); + public Result draftHandle(@RequestParam("draftId") @ApiParam("草稿Id") String draftId) { + return Result.OK(actFlowCommonService.getExistDraft(draftId, null, ProcessTypeEnum.ES_ARCHIVE)); } /**