修改记录信息

jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowTaskServiceImpl.java

@@ -447,22 +447,28 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                 .collect(Collectors.groupingBy(Attachment::getTaskId));
         List<HistoricActivityInstance> list = historyService.createHistoricActivityInstanceQuery().processInstanceId(processInstanceId).orderByHistoricActivityInstanceStartTime().asc().list();
         List<TaskDetailVO> taskDetailVOS= new ArrayList<>();
+        String userStart = historicProcessInstance.getStartUserId();
+
+//                    taskDetailVO.setUserId(user.getUserId().toString());
 
         for (HistoricActivityInstance historicActivityInstance : list) {
             if("startEvent".equals(historicActivityInstance.getActivityType())){
+
                 TaskDetailVO taskDetailVO= new TaskDetailVO();
                 taskDetailVO.setTaskId(historicActivityInstance.getTaskId());
                 taskDetailVO.setActivityId(historicActivityInstance.getActivityId());
                 taskDetailVO.setName("流程开始");
                 taskDetailVO.setTaskStatusWrapper("发起");
+//                taskDetailVO.setUserId(JSONObject.parseObject(userStart, UserInfo.class).getUserId().toString());
+//                taskDetailVO.setUserName(JSONObject.parseObject(userStart, UserInfo.class).getRealName().toString());
+
                 taskDetailVO.setCreateTime(historicActivityInstance.getStartTime());
                 taskDetailVO.setEndTime(historicActivityInstance.getEndTime());
-                if (historicActivityInstance.getAssignee()!=null)
+                if (userStart!=null||!userStart.isEmpty())
                 {
-                    SysUser user=   sysUserService.getById(historicActivityInstance.getAssignee());
+                    SysUser user=   sysUserService.getById(userStart);
                     taskDetailVO.setUserId(user.getUserId().toString());
                     taskDetailVO.setUserName(user.getRealName());
-
                 }
 
                 taskDetailVOS.add(taskDetailVO);
@@ -542,20 +548,20 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         BpmnModel bpmnModel = repositoryService.getBpmnModel(processDefinition.getId());
         Collection<FlowElement> flowElements = bpmnModel.getMainProcess().getFlowElements();
 
-        // 遍历所有任务节点和结束节点，如果不在已有任务列表中，则添加到结果中
-        for (FlowElement flowElement : flowElements) {
-
-            if (flowElement instanceof UserTask &&
-                    !taskDetailVOS.stream().anyMatch(task -> task.getActivityId().equals(flowElement.getId()))) {
-                TaskDetailVO taskDetailVO = new TaskDetailVO();
-                taskDetailVO.setActivityId(flowElement.getId());
-                taskDetailVO.setName(flowElement.getName());
-                // 其他属性的设置，根据需要进行修改
-
-                // 将任务节点或结束节点添加到结果列表
-                taskDetailVOS.add(taskDetailVO);
-            }
-        }
+//        // 遍历所有任务节点和结束节点，如果不在已有任务列表中，则添加到结果中
+//        for (FlowElement flowElement : flowElements) {
+//
+//            if (flowElement instanceof UserTask &&
+//                    !taskDetailVOS.stream().anyMatch(task -> task.getActivityId().equals(flowElement.getId()))) {
+//                TaskDetailVO taskDetailVO = new TaskDetailVO();
+//                taskDetailVO.setActivityId(flowElement.getId());
+//                taskDetailVO.setName(flowElement.getName());
+//                // 其他属性的设置，根据需要进行修改
+//
+//                // 将任务节点或结束节点添加到结果列表
+//                taskDetailVOS.add(taskDetailVO);
+//            }
+//        }
         // 根据 processInstanceId 查询正在执行的任务
         List<Task> list1 = taskService.createTaskQuery()
                 .processInstanceId(processInstanceId)