From 77850488e492784a5ef48687ad3b325037db45fc Mon Sep 17 00:00:00 2001 From: konbai <1527468660@qq.com> Date: Sat, 12 Mar 2022 00:01:21 +0800 Subject: [PATCH] =?UTF-8?q?fix=20--=20=E4=BF=AE=E5=A4=8D"=E6=88=91?= =?UTF-8?q?=E7=9A=84=E6=B5=81=E7=A8=8B"=E6=98=BE=E7=A4=BA=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E9=94=99=E8=AF=AFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/domain/vo/WfDefinitionVo.java | 2 +- .../service/impl/WfDefinitionServiceImpl.java | 6 ++-- .../service/impl/WfTaskServiceImpl.java | 28 +++++++++---------- .../src/views/workflow/definition/index.vue | 6 ++-- .../src/views/workflow/task/process/index.vue | 17 +++++++++-- 5 files changed, 36 insertions(+), 23 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfDefinitionVo.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfDefinitionVo.java index fd660430..056a93b9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfDefinitionVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/WfDefinitionVo.java @@ -49,7 +49,7 @@ public class WfDefinitionVo { */ @ExcelProperty(value = "分类编码") @ApiModelProperty("分类编码") - private String categoryCode; + private String category; @ApiModelProperty("版本") private Integer version; diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfDefinitionServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfDefinitionServiceImpl.java index 9c1df6d2..66766063 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfDefinitionServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfDefinitionServiceImpl.java @@ -86,7 +86,7 @@ public class WfDefinitionServiceImpl extends FlowServiceFactory implements IWfDe vo.setProcessKey(processDefinition.getKey()); vo.setProcessName(processDefinition.getName()); vo.setVersion(processDefinition.getVersion()); - vo.setCategoryCode(processDefinition.getCategory()); + vo.setCategory(processDefinition.getCategory()); vo.setDeploymentId(processDefinition.getDeploymentId()); vo.setSuspended(processDefinition.isSuspended()); WfFormVo formVo = formMapper.selectFormByDeployId(deploymentId); @@ -95,7 +95,7 @@ public class WfDefinitionServiceImpl extends FlowServiceFactory implements IWfDe vo.setFormName(formVo.getFormName()); } // 流程定义时间 - vo.setCategoryCode(deployment.getCategory()); + vo.setCategory(deployment.getCategory()); vo.setDeploymentTime(deployment.getDeploymentTime()); definitionVoList.add(vo); } @@ -125,7 +125,7 @@ public class WfDefinitionServiceImpl extends FlowServiceFactory implements IWfDe vo.setProcessKey(item.getKey()); vo.setProcessName(item.getName()); vo.setVersion(item.getVersion()); - vo.setCategoryCode(item.getCategory()); + vo.setCategory(item.getCategory()); vo.setDeploymentId(item.getDeploymentId()); vo.setSuspended(item.isSuspended()); // BeanUtil.copyProperties(item, vo); diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfTaskServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfTaskServiceImpl.java index 07439d54..c53354db 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfTaskServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfTaskServiceImpl.java @@ -424,29 +424,29 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ List historicProcessInstances = historicProcessInstanceQuery .listPage(offset, pageQuery.getPageSize()); page.setTotal(historicProcessInstanceQuery.count()); - List flowList = new ArrayList<>(); + List taskVoList = new ArrayList<>(); for (HistoricProcessInstance hisIns : historicProcessInstances) { - WfTaskVo flowTask = new WfTaskVo(); - flowTask.setCreateTime(hisIns.getStartTime()); - flowTask.setFinishTime(hisIns.getEndTime()); - flowTask.setProcInsId(hisIns.getId()); + WfTaskVo taskVo = new WfTaskVo(); + taskVo.setCreateTime(hisIns.getStartTime()); + taskVo.setFinishTime(hisIns.getEndTime()); + taskVo.setProcInsId(hisIns.getId()); // 计算耗时 if (Objects.nonNull(hisIns.getEndTime())) { long time = hisIns.getEndTime().getTime() - hisIns.getStartTime().getTime(); - flowTask.setDuration(getDate(time)); + taskVo.setDuration(getDate(time)); } else { long time = System.currentTimeMillis() - hisIns.getStartTime().getTime(); - flowTask.setDuration(getDate(time)); + taskVo.setDuration(getDate(time)); } // 流程部署实例信息 Deployment deployment = repositoryService.createDeploymentQuery() .deploymentId(hisIns.getDeploymentId()).singleResult(); - flowTask.setDeployId(hisIns.getDeploymentId()); - flowTask.setProcDefId(hisIns.getProcessDefinitionId()); - flowTask.setProcDefName(hisIns.getProcessDefinitionName()); - flowTask.setProcDefVersion(hisIns.getProcessDefinitionVersion()); - flowTask.setCategory(deployment.getCategory()); + taskVo.setDeployId(hisIns.getDeploymentId()); + taskVo.setProcDefId(hisIns.getProcessDefinitionId()); + taskVo.setProcDefName(hisIns.getProcessDefinitionName()); + taskVo.setProcDefVersion(hisIns.getProcessDefinitionVersion()); + taskVo.setCategory(deployment.getCategory()); // 当前所处流程 todo: 本地启动放开以下注释 // List taskList = taskService.createTaskQuery().processInstanceId(hisIns.getId()).list(); // if (CollectionUtils.isNotEmpty(taskList)) { @@ -455,9 +455,9 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ // List historicTaskInstance = historyService.createHistoricTaskInstanceQuery().processInstanceId(hisIns.getId()).orderByHistoricTaskInstanceEndTime().desc().list(); // flowTask.setTaskId(historicTaskInstance.get(0).getId()); // } - flowList.add(flowTask); + taskVoList.add(taskVo); } - page.setRecords(flowList); + page.setRecords(taskVoList); return TableDataInfo.build(page); } diff --git a/ruoyi-ui/src/views/workflow/definition/index.vue b/ruoyi-ui/src/views/workflow/definition/index.vue index c6ca599c..6f441ef8 100644 --- a/ruoyi-ui/src/views/workflow/definition/index.vue +++ b/ruoyi-ui/src/views/workflow/definition/index.vue @@ -81,7 +81,7 @@ @@ -200,7 +200,7 @@ - + @@ -488,7 +488,7 @@ export default { definitionId: row.definitionId, processId: row.processKey, processName: row.processName, - category: row.categoryCode + category: row.category } }) }, diff --git a/ruoyi-ui/src/views/workflow/task/process/index.vue b/ruoyi-ui/src/views/workflow/task/process/index.vue index c6c6fc17..c7285d4a 100644 --- a/ruoyi-ui/src/views/workflow/task/process/index.vue +++ b/ruoyi-ui/src/views/workflow/task/process/index.vue @@ -60,7 +60,11 @@ - + + + - + + +