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 5d12aff1..3cf12520 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 @@ -136,7 +136,7 @@ public class ActFlowCommonService { * @param taskId */ public void updateApprovalInfo(BasicTaskInfoDTO processTask, String taskId) { - ProcessApprovalRecord approvalRecord = processApprovalRecordService.getToDoByTaskId(taskId); + ProcessApprovalRecord approvalRecord = processApprovalRecordService.getByTaskId(taskId); approvalRecord.setCommitText(processTask.getHandleText()); approvalRecord.setCommitFile(processTask.getHandleFile()); approvalRecord.setFinishFlag(FinishFlagEnum.COMPLETE.getValue()); @@ -149,7 +149,7 @@ public class ActFlowCommonService { } public ProcessApprovalRecord getNodeIdByTaskId(String taskId) { - return processApprovalRecordService.getToDoByTaskId(taskId); + return processApprovalRecordService.getByTaskId(taskId); } /** diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java index 8cb49a91..2d5c6b33 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java @@ -180,11 +180,15 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl processInfoVO, boolean pass) { BasicTaskInfoDTO processTask = processInfoVO.getBasicTaskInfoDTO(); String taskId = processTask.getTaskId(); + String prcId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId); + BasicProcessInfoDTO processInfo = new BasicProcessInfoDTO(); + processInfo.setProcessInstanceId(prcId); + processInfoVO.setBasicProcessInfoDTO(processInfo); + // TODO 找到主流程Id // 获取task if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) { throw new JeroBootException("taskId为空或任务不存在"); } - String userId = actFlowCommonService.getOriginTaskAssignee(taskId); Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); // 获取执行id String executionId = task.getExecutionId(); @@ -226,7 +230,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl