返回完整历史记录

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/FlowTaskController.java

@@ -64,13 +64,17 @@ public class FlowTaskController {
         return flowTaskService.finishedList(queryVo);
     }
 
-
     @ApiOperation(value = "流程历史流转记录", response = FlowTaskDto.class)
     @GetMapping(value = "/flowRecord")
     public AjaxResult flowRecord(String procInsId, String deployId) {
         return flowTaskService.flowRecord(procInsId, deployId);
     }
 
+    @ApiOperation(value = "流程历史完整流转记录", response = FlowTaskDto.class)
+    @GetMapping(value = "/flowRecordFull")
+    public AjaxResult flowRecordFull(String procInsId, String deployId) {
+        return flowTaskService.flowRecordFull(procInsId, deployId);
+    }
 
     @ApiOperation(value = "流程初始化表单", response = FlowTaskDto.class)
     @GetMapping(value = "/flowFormData")

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/IFlowTaskService.java

@@ -148,6 +148,14 @@ public interface IFlowTaskService {
      */
     AjaxResult flowRecord(String procInsId,String deployId);
 
+    /**
+     * 流程历史完整流转记录
+     *
+     * @param procInsId 流程实例Id
+     * @return
+     */
+    AjaxResult flowRecordFull(String procInsId,String deployId);
+
     /**
      * 根据任务ID查询挂载的表单信息
      *

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

@@ -989,6 +989,79 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         return AjaxResult.success(map);
     }
 
+    /**
+     * 获取历史完整流转记录
+     *
+     * @param procInsId 流程实例Id
+     * @return
+     */
+    @Override
+    public AjaxResult flowRecordFull(String procInsId, String deployId) {
+        Map<String, Object> map = new HashMap<String, Object>();
+        if (StringUtils.isNotBlank(procInsId)) {
+            List<HistoricActivityInstance> list = historyService
+                    .createHistoricActivityInstanceQuery()
+                    .processInstanceId(procInsId)
+                    .orderByHistoricActivityInstanceStartTime()
+                    .desc().list();
+            List<FlowTaskDto> hisFlowList = new ArrayList<>();
+            for (HistoricActivityInstance histIns : list) {
+                if (StringUtils.isNotBlank(histIns.getTaskId())) {
+                    FlowTaskDto flowTask = new FlowTaskDto();
+                    flowTask.setTaskId(histIns.getTaskId());
+                    flowTask.setTaskName(histIns.getActivityName());
+                    flowTask.setCreateTime(histIns.getStartTime());
+                    flowTask.setFinishTime(histIns.getEndTime());
+                    if (StringUtils.isNotBlank(histIns.getAssignee())) {
+                        SysUser sysUser = sysUserService.selectUserById(Long.parseLong(histIns.getAssignee()));
+                        flowTask.setAssigneeId(sysUser.getUserId());
+                        flowTask.setAssigneeName(sysUser.getNickName());
+                        flowTask.setDeptName(Objects.nonNull(sysUser.getDept()) ? sysUser.getDept().getDeptName() : "");
+                    }
+                    // 展示审批人员
+                    List<HistoricIdentityLink> linksForTask = historyService.getHistoricIdentityLinksForTask(histIns.getTaskId());
+                    StringBuilder stringBuilder = new StringBuilder();
+                    for (HistoricIdentityLink identityLink : linksForTask) {
+                        // 获选人,候选组/角色(多个)
+                        if ("candidate".equals(identityLink.getType())) {
+                            if (StringUtils.isNotBlank(identityLink.getUserId())) {
+                                SysUser sysUser = sysUserService.selectUserById(Long.parseLong(identityLink.getUserId()));
+                                stringBuilder.append(sysUser.getNickName()).append(",");
+                            }
+                            if (StringUtils.isNotBlank(identityLink.getGroupId())) {
+                                SysRole sysRole = sysRoleService.selectRoleById(Long.parseLong(identityLink.getGroupId()));
+                                stringBuilder.append(sysRole.getRoleName()).append(",");
+                            }
+                        }
+                    }
+                    if (StringUtils.isNotBlank(stringBuilder)) {
+                        flowTask.setCandidate(stringBuilder.substring(0, stringBuilder.length() - 1));
+                    }
+
+                    flowTask.setDuration(histIns.getDurationInMillis() == null || histIns.getDurationInMillis() == 0 ? null : getDate(histIns.getDurationInMillis()));
+                    // 获取意见评论内容
+                    List<Comment> commentList = taskService.getProcessInstanceComments(histIns.getProcessInstanceId());
+                    commentList.forEach(comment -> {
+                        if (histIns.getTaskId().equals(comment.getTaskId())) {
+                            flowTask.setComment(FlowCommentDto.builder().type(comment.getType()).comment(comment.getFullMessage()).build());
+                        }
+                    });
+                    hisFlowList.add(flowTask);
+                }
+            }
+            map.put("flowList", hisFlowList);
+        }
+        // 第一次申请获取初始化表单
+        if (StringUtils.isNotBlank(deployId)) {
+            SysForm sysForm = sysInstanceFormService.selectSysDeployFormByDeployId(deployId);
+            if (Objects.isNull(sysForm)) {
+                return AjaxResult.error("请先配置流程表单");
+            }
+            map.put("formData", JSONObject.parseObject(sysForm.getFormContent()));
+        }
+        return AjaxResult.success(map);
+    }
+
     /**
      * 根据任务ID查询挂载的表单信息
      *

oa-ui/src/api/flowable/finished.js

@@ -1,3 +1,9 @@
+/*
+ * @Author: wrh
+ * @Date: 2024-01-03 08:55:37
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-06-12 15:41:26
+ */
 import request from '@/utils/request'
 import da from "element-ui/src/locale/lang/da";
 
@@ -19,6 +25,15 @@ export function flowRecord(query) {
   })
 }
 
+// 任务流转记录
+export function flowRecordFull(query) {
+  return request({
+    url: '/flowable/task/flowRecordFull',
+    method: 'get',
+    params: query
+  })
+}
+
 // 撤回任务
 export function revokeProcess(data) {
   return request({