DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix -- 修复流程图显示异常bug

Browse Source
This commit is contained in:
hewenqiang
2022-02-11 10:10:05 +08:00
parent f0fb432504
commit 3022396404
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowDefinitionController.java
View File

@@ -95,7 +95,7 @@ public class FlowDefinitionController extends BaseController {
try { try {
return R.ok(flowDefinitionService.readXml(definitionId), null); return R.ok(flowDefinitionService.readXml(definitionId), null);
} catch (Exception e) { } catch (Exception e) {
return R.fail("加载xml文件异常", null); return R.fail("加载xml文件异常");
} }
} }

1
ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/FlowTaskServiceImpl.java
View File

@@ -694,6 +694,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
for (HistoricActivityInstance histIns : list) { for (HistoricActivityInstance histIns : list) {
if (StringUtils.isNotBlank(histIns.getTaskId())) { if (StringUtils.isNotBlank(histIns.getTaskId())) {
FlowTaskDto flowTask = new FlowTaskDto(); FlowTaskDto flowTask = new FlowTaskDto();
flowTask.setProcDefId(histIns.getProcessDefinitionId());
flowTask.setTaskId(histIns.getTaskId()); flowTask.setTaskId(histIns.getTaskId());
flowTask.setTaskName(histIns.getActivityName()); flowTask.setTaskName(histIns.getActivityName());
flowTask.setCreateTime(histIns.getStartTime()); flowTask.setCreateTime(histIns.getStartTime());

1
ruoyi-ui/src/views/workflow/task/finished/index.vue
View File

@@ -206,6 +206,7 @@ export default {
handleFlowRecord(row){ handleFlowRecord(row){
this.$router.push({ path: '/task/record/index', this.$router.push({ path: '/task/record/index',
query: { query: {
definitionId: row.procDefId,
procInsId: row.procInsId, procInsId: row.procInsId,
deployId: row.deployId, deployId: row.deployId,
taskId: row.taskId, taskId: row.taskId,