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

备份补充

Browse Source
This commit is contained in:
hdka
2025-03-08 18:24:00 +08:00
parent 3aca2f84dd
commit 878a8f4ca2
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,6 +40,7 @@ import com.ruoyi.workflow.mapper.WfDeployFormMapper;
import com.ruoyi.workflow.service.IWfProcessService; import com.ruoyi.workflow.service.IWfProcessService;
import com.ruoyi.workflow.service.IWfTaskService; import com.ruoyi.workflow.service.IWfTaskService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.flowable.bpmn.constants.BpmnXMLConstants; import org.flowable.bpmn.constants.BpmnXMLConstants;
import org.flowable.bpmn.model.Process; import org.flowable.bpmn.model.Process;
import org.flowable.bpmn.model.*; import org.flowable.bpmn.model.*;
@@ -66,6 +67,7 @@ import java.util.stream.Collectors;
* @author KonBAI * @author KonBAI
* @createTime 2022/3/24 18:57 * @createTime 2022/3/24 18:57
*/ */
@Slf4j
@RequiredArgsConstructor @RequiredArgsConstructor
@Service @Service
public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProcessService { public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProcessService {
@@ -207,6 +209,7 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce
taskVo.setProcDefName(hisIns.getProcessDefinitionName()); taskVo.setProcDefName(hisIns.getProcessDefinitionName());
taskVo.setProcDefVersion(hisIns.getProcessDefinitionVersion()); taskVo.setProcDefVersion(hisIns.getProcessDefinitionVersion());
taskVo.setCategory(deployment.getCategory()); taskVo.setCategory(deployment.getCategory());
// 当前所处流程 // 当前所处流程
List<Task> taskList = taskService.createTaskQuery().processInstanceId(hisIns.getId()).includeIdentityLinks().list(); List<Task> taskList = taskService.createTaskQuery().processInstanceId(hisIns.getId()).includeIdentityLinks().list();
if (CollUtil.isNotEmpty(taskList)) { if (CollUtil.isNotEmpty(taskList)) {
@@ -301,7 +304,7 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce
flowTask.setProcDefName(pd.getName()); flowTask.setProcDefName(pd.getName());
flowTask.setProcDefVersion(pd.getVersion()); flowTask.setProcDefVersion(pd.getVersion());
flowTask.setProcInsId(task.getProcessInstanceId()); flowTask.setProcInsId(task.getProcessInstanceId());
flowTask.setCategory(pd.getCategory());
// 流程发起人信息 // 流程发起人信息
HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery() HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
.processInstanceId(task.getProcessInstanceId()) .processInstanceId(task.getProcessInstanceId())
@@ -513,9 +516,10 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce
//获取部门信息(新增于2024年2月29日) //获取部门信息(新增于2024年2月29日)
SysUser sysUser = sysUserService.selectUserById(userId); SysUser sysUser = sysUserService.selectUserById(userId);
if (sysUser.getDeptId()!=null){
SysDept sysDept = sysDeptService.selectDeptById(sysUser.getDeptId()); SysDept sysDept = sysDeptService.selectDeptById(sysUser.getDeptId());
flowTask.setDeptName(sysDept.getDeptName()); flowTask.setDeptName(sysDept.getDeptName());
}
// 流程变量 // 流程变量
flowTask.setProcVars(histTask.getProcessVariables()); flowTask.setProcVars(histTask.getProcessVariables());