fix: 快照保存操作失败

This commit is contained in:
2024-08-07 14:08:04 +08:00
parent 251f2cd0d1
commit 99aa4d44b1
4 changed files with 28 additions and 2 deletions
@@ -17,6 +17,7 @@ import com.jero.modules.activiti.entity.ProcessApprovalRecord;
import com.jero.modules.activiti.enums.FinishFlagEnum; import com.jero.modules.activiti.enums.FinishFlagEnum;
import com.jero.modules.activiti.enums.ProcessStatusEnum; import com.jero.modules.activiti.enums.ProcessStatusEnum;
import com.jero.modules.activiti.process.common.common.DraftCommon; 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.ProcessDraft;
import com.jero.modules.activiti.process.common.entity.ProcessSnapshot; import com.jero.modules.activiti.process.common.entity.ProcessSnapshot;
import com.jero.modules.activiti.process.common.service.ActFlowCommonService; import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
@@ -283,8 +284,9 @@ public class WorkCenterController {
*/ */
@AutoLog(value = "快照保存") @AutoLog(value = "快照保存")
@ApiOperation(value="快照跳转", notes="快照保存") @ApiOperation(value="快照跳转", notes="快照保存")
@GetMapping("/snapshotSave") @PostMapping("/snapshotSave")
public Result<?> snapshotSave(@RequestBody @ApiParam("快照Id") ProcessInfoVO processInfoVO) { public Result<?> snapshotSave(@RequestBody CommonVO commonVO) {
ProcessInfoVO processInfoVO = actFlowCommonService.transProcessInfoVO(commonVO);
processHandleService.saveToSnapshot(processInfoVO, CurrentUserUtil.getId()); processHandleService.saveToSnapshot(processInfoVO, CurrentUserUtil.getId());
return Result.OK(); return Result.OK();
} }
@@ -100,4 +100,8 @@ public class CommonVO {
@ApiModelProperty(value = "草稿信息json字符串") @ApiModelProperty(value = "草稿信息json字符串")
private String infoJsonStr; private String infoJsonStr;
/**流程类型*/
@ApiModelProperty(value = "流程类型")
private Integer prcType;
} }
@@ -505,4 +505,23 @@ public class ActFlowCommonService {
draftWrapper.eq(ProcessSnapshot::getId, snapshotId); draftWrapper.eq(ProcessSnapshot::getId, snapshotId);
return processSnapshotService.getOne(draftWrapper); 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;
}
} }
@@ -105,6 +105,7 @@ public class ProcessEsEnableServiceImpl extends ServiceImpl<ProcessEsEnableMappe
// 手动翻译 // 手动翻译
String jsonData = translationAspect.manualParseDictText(this.getHandleData(taskId), this.getUserMap(variables)); String jsonData = translationAspect.manualParseDictText(this.getHandleData(taskId), this.getUserMap(variables));
// 保存第一个节点的快照 // 保存第一个节点的快照
common.setTaskId(taskId);
ProcessInfoVO processInfoVO = processHandleService.transProcessInfoVO(common, ProcessTypeEnum.ES_ENABLE); ProcessInfoVO processInfoVO = processHandleService.transProcessInfoVO(common, ProcessTypeEnum.ES_ENABLE);
processHandleService.saveToSnapshot(processInfoVO, userId); processHandleService.saveToSnapshot(processInfoVO, userId);
// 强制撤回 // 强制撤回