DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

流程+任务分发+报销功能完成

Browse Source
This commit is contained in:
86156
2025-02-23 16:24:29 +08:00
parent f54dc4aa3e
commit 330036b272
33 changed files with 1669 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java
View File

@@ -345,6 +345,7 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce
taskVo.setCreateTime(task.getCreateTime());
taskVo.setProcDefId(task.getProcessDefinitionId());
taskVo.setTaskName(task.getName());
// 流程定义信息
ProcessDefinition pd = repositoryService.createProcessDefinitionQuery()
.processDefinitionId(task.getProcessDefinitionId())
@@ -353,7 +354,7 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce
taskVo.setProcDefName(pd.getName());
taskVo.setProcDefVersion(pd.getVersion());
taskVo.setProcInsId(task.getProcessInstanceId());
taskVo.setCategory(pd.getCategory());
// 流程发起人信息
HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
.processInstanceId(task.getProcessInstanceId())
@@ -479,6 +480,7 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce
WfTaskVo flowTask = new WfTaskVo();
// 当前流程信息
flowTask.setTaskId(histTask.getId());
flowTask.setCategory(histTask.getCategory());
// 审批人员信息
flowTask.setCreateTime(histTask.getCreateTime());
flowTask.setFinishTime(histTask.getEndTime());
@@ -496,6 +498,7 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce
flowTask.setProcDefVersion(pd.getVersion());
flowTask.setProcInsId(histTask.getProcessInstanceId());
flowTask.setHisProcInsId(histTask.getProcessInstanceId());
flowTask.setCategory(pd.getCategory());
// 流程发起人信息
HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
@@ -518,9 +521,6 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce
}
page.setTotal(taskInstanceQuery.count());
page.setRecords(hisTaskList);
// Map<String, Object> result = new HashMap<>();
// result.put("result",page);
// result.put("finished",true);
return TableDataInfo.build(page);
}
@@ -632,9 +632,12 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce
public String startClaim(Map<String, Object> variables) {
try {
ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery()
.processDefinitionCategory("claim").singleResult();
return startProcess(processDefinition, variables);
List<ProcessDefinition> processDefinition = repositoryService.createProcessDefinitionQuery()
.processDefinitionCategory("claim").list();
// 拿到最新版本的模型
return startProcess(processDefinition.get(processDefinition.size()-1), variables);
} catch (Exception e) {
e.printStackTrace();
throw new ServiceException("流程启动错误");
@@ -697,6 +700,7 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce
@Override
public WfDetailVo queryProcessDetail(String procInsId, String taskId) {
WfDetailVo detailVo = new WfDetailVo();
// 获取流程实例
HistoricProcessInstance historicProcIns = historyService.createHistoricProcessInstanceQuery()
.processInstanceId(procInsId)
@@ -715,6 +719,8 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce
detailVo.setTaskFormData(currTaskFormData(historicProcIns.getDeploymentId(), taskIns));
}
// 获取Bpmn模型信息
System.out.println("--------------------------");
System.out.println(historicProcIns);
InputStream inputStream = repositoryService.getProcessModel(historicProcIns.getProcessDefinitionId());
String bpmnXmlStr = StrUtil.utf8Str(IoUtil.readBytes(inputStream, false));
BpmnModel bpmnModel = ModelUtils.getBpmnModel(bpmnXmlStr);
@@ -971,6 +977,7 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce
} else if (identityLink.getGroupId().startsWith(TaskConstants.DEPT_GROUP_PREFIX)) {
Long deptId = Long.parseLong(StringUtils.stripStart(identityLink.getGroupId(), TaskConstants.DEPT_GROUP_PREFIX));
SysDept dept = deptService.selectDeptById(deptId);
System.out.println(dept);
stringBuilder.append(dept.getDeptName()).append(",");
}
}