diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java b/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java index 40631994..5c714238 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java @@ -17,6 +17,7 @@ import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.enums.FinishFlagEnum; import com.jero.modules.activiti.enums.ProcessStatusEnum; import com.jero.modules.activiti.process.common.common.DraftCommon; +import com.jero.modules.activiti.process.common.entity.CommonVO; import com.jero.modules.activiti.process.common.entity.ProcessDraft; import com.jero.modules.activiti.process.common.entity.ProcessSnapshot; import com.jero.modules.activiti.process.common.service.ActFlowCommonService; @@ -283,8 +284,9 @@ public class WorkCenterController { */ @AutoLog(value = "快照保存") @ApiOperation(value="快照跳转", notes="快照保存") - @GetMapping("/snapshotSave") - public Result snapshotSave(@RequestBody @ApiParam("快照Id") ProcessInfoVO processInfoVO) { + @PostMapping("/snapshotSave") + public Result snapshotSave(@RequestBody CommonVO commonVO) { + ProcessInfoVO processInfoVO = actFlowCommonService.transProcessInfoVO(commonVO); processHandleService.saveToSnapshot(processInfoVO, CurrentUserUtil.getId()); return Result.OK(); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/CommonVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/CommonVO.java index 48cc3ee3..382af931 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/CommonVO.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/CommonVO.java @@ -100,4 +100,8 @@ public class CommonVO { @ApiModelProperty(value = "草稿信息json字符串") private String infoJsonStr; + /**流程类型*/ + @ApiModelProperty(value = "流程类型") + private Integer prcType; + } 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 719e71f3..22863d9b 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 @@ -505,4 +505,23 @@ public class ActFlowCommonService { draftWrapper.eq(ProcessSnapshot::getId, snapshotId); return processSnapshotService.getOne(draftWrapper); } + + public ProcessInfoVO transProcessInfoVO(CommonVO common) { + ProcessInfoVO processInfoVO = new ProcessInfoVO<>(); + BasicProcessInfoDTO basicProcessInfoDTO = new BasicProcessInfoDTO(); + basicProcessInfoDTO.setProcessDescription(common.getProcessDescription()); + basicProcessInfoDTO.setProcessDueDate(common.getDueTime()); + basicProcessInfoDTO.setProcessName(common.getPrcName()); + basicProcessInfoDTO.setProcessType(common.getPrcType()); + basicProcessInfoDTO.setProcessDefinitionId(common.getProcessDefinitionId()); + basicProcessInfoDTO.setProcessInstanceId(common.getProcessInstanceId()); + processInfoVO.setBasicProcessInfoDTO(basicProcessInfoDTO); + BasicTaskInfoDTO basicTaskInfoDTO = new BasicTaskInfoDTO(); + basicTaskInfoDTO.setHandleFile(common.getCommitFile()); + basicTaskInfoDTO.setHandleText(common.getCommitText()); + basicTaskInfoDTO.setTaskId(common.getTaskId()); + processInfoVO.setBasicTaskInfoDTO(basicTaskInfoDTO); + processInfoVO.setInfoJsonStr(common.getInfoJsonStr()); + return processInfoVO; + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java index d12a9bb1..9cb38f5c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java @@ -105,6 +105,7 @@ public class ProcessEsEnableServiceImpl extends ServiceImpl