QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: scc流程回显报错

Browse Source
This commit is contained in:
mzaxd
2024-07-15 16:17:56 +08:00
parent 5a717601e6
commit e123823ff5
2 changed files with 9 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
+2 -2
View File
@@ -136,7 +136,7 @@ public class ActFlowCommonService {
* @param taskId * @param taskId
*/ */
public void updateApprovalInfo(BasicTaskInfoDTO processTask, String taskId) { public void updateApprovalInfo(BasicTaskInfoDTO processTask, String taskId) {
ProcessApprovalRecord approvalRecord = processApprovalRecordService.getToDoByTaskId(taskId); ProcessApprovalRecord approvalRecord = processApprovalRecordService.getByTaskId(taskId);
approvalRecord.setCommitText(processTask.getHandleText()); approvalRecord.setCommitText(processTask.getHandleText());
approvalRecord.setCommitFile(processTask.getHandleFile()); approvalRecord.setCommitFile(processTask.getHandleFile());
approvalRecord.setFinishFlag(FinishFlagEnum.COMPLETE.getValue()); approvalRecord.setFinishFlag(FinishFlagEnum.COMPLETE.getValue());
@@ -149,7 +149,7 @@ public class ActFlowCommonService {
} }
public ProcessApprovalRecord getNodeIdByTaskId(String taskId) { public ProcessApprovalRecord getNodeIdByTaskId(String taskId) {
return processApprovalRecordService.getToDoByTaskId(taskId); return processApprovalRecordService.getByTaskId(taskId);
} }
/** /**
laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
+7 -2
View File
@@ -180,11 +180,15 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
public void approveTask(ProcessInfoVO<ProcessSccVO> processInfoVO, boolean pass) { public void approveTask(ProcessInfoVO<ProcessSccVO> processInfoVO, boolean pass) {
BasicTaskInfoDTO processTask = processInfoVO.getBasicTaskInfoDTO(); BasicTaskInfoDTO processTask = processInfoVO.getBasicTaskInfoDTO();
String taskId = processTask.getTaskId(); String taskId = processTask.getTaskId();
String prcId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
BasicProcessInfoDTO processInfo = new BasicProcessInfoDTO();
processInfo.setProcessInstanceId(prcId);
processInfoVO.setBasicProcessInfoDTO(processInfo);
// TODO 找到主流程Id
// 获取task // 获取task
if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) { if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
throw new JeroBootException("taskId为空或任务不存在"); throw new JeroBootException("taskId为空或任务不存在");
} }
String userId = actFlowCommonService.getOriginTaskAssignee(taskId);
Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
// 获取执行id // 获取执行id
String executionId = task.getExecutionId(); String executionId = task.getExecutionId();
@@ -226,7 +230,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
} }
// 保存快照 // 保存快照
processHandleService.saveToSnapshot(processInfoVO, userId); processHandleService.saveToSnapshot(processInfoVO, curUserId);
// 审批节点 // 审批节点
actFlowCommonService.completeTask(taskId, curUserId); actFlowCommonService.completeTask(taskId, curUserId);
} }
@@ -352,6 +356,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
String xmlNodeId = record.getNodeId(); String xmlNodeId = record.getNodeId();
// 设置流程信息 // 设置流程信息
switch (xmlNodeId) { switch (xmlNodeId) {
case STANDARD_ENGINEER_START:
case DEPT_USER_DISTRIBUTE: case DEPT_USER_DISTRIBUTE:
processSccVO.setStandardInfo(scc); processSccVO.setStandardInfo(scc);
processSccVO.setDetailInfoList(detailList); processSccVO.setDetailInfoList(detailList);