ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 封存草稿回显接口

Browse Source
This commit is contained in:
mzaxd
2023-12-15 11:02:44 +08:00
parent 05d50eaade
commit aa6c38896a
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
-1
View File
@@ -352,7 +352,6 @@ public class ActFlowCommonService {
draftWrapper.eq(ProcessDraft::getPrcType, processTypeEnum.getValue()); draftWrapper.eq(ProcessDraft::getPrcType, processTypeEnum.getValue());
draftWrapper.eq(ProcessDraft::getUserId, userId); draftWrapper.eq(ProcessDraft::getUserId, userId);
draftWrapper.eq(ProcessDraft::getId, draftId); draftWrapper.eq(ProcessDraft::getId, draftId);
draftWrapper.eq(ProcessDraft::getProjectId, businessId);
return processDraftService.getOne(draftWrapper); return processDraftService.getOne(draftWrapper);
} }
laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/controller/ESArchiveController.java
+7 -3
View File
@@ -3,6 +3,8 @@ package com.jero.modules.activiti.process.esArchive.controller;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.Translation; 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.entity.TransferVO;
import com.jero.modules.activiti.process.common.service.ActFlowCommonService; import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
import com.jero.modules.activiti.process.esAbolish.entity.vo.ESAbolishDataVO; import com.jero.modules.activiti.process.esAbolish.entity.vo.ESAbolishDataVO;
@@ -36,6 +38,9 @@ public class ESArchiveController {
@Resource @Resource
private IProcessHandleService processHandleService; private IProcessHandleService processHandleService;
@Resource
private ActFlowCommonService actFlowCommonService;
/** /**
* 新增企标封存申请 * 新增企标封存申请
* *
@@ -82,9 +87,8 @@ public class ESArchiveController {
@ApiOperation(value="企标封存流程-草稿办理", notes="企标封存流程-草稿办理") @ApiOperation(value="企标封存流程-草稿办理", notes="企标封存流程-草稿办理")
@GetMapping("/draftHandle") @GetMapping("/draftHandle")
@Translation @Translation
public Result<?> draftHandle(@RequestParam("draftId") @ApiParam("草稿Id") String draftId, public Result<?> draftHandle(@RequestParam("draftId") @ApiParam("草稿Id") String draftId) {
@RequestParam("projectId") @ApiParam("业务数据Id") String projectId) { return Result.OK(actFlowCommonService.getExistDraft(draftId, null, ProcessTypeEnum.ES_ARCHIVE));
return Result.OK(archiveService.getDraftData(draftId, projectId));
} }
/** /**