回退评论优化

flow-workflow/flow-workflow-biz/src/main/java/com/flow/service/impl/FlowTaskServiceImpl.java

@@ -21,7 +21,6 @@ import com.flow.flowable.cmd.GetMultiInstanceRootExecution;
 import com.flow.flowable.cmd.JumpActivityCmd;
 import com.flow.flowable.utils.ProcessElementUtil;
 import com.flow.model.*;
-import com.flow.service.FlowActivityService;
 import com.flow.service.FlowDefineService;
 import com.flow.service.FlowInstanceService;
 import com.flow.service.FlowTaskService;
@@ -62,8 +61,6 @@ public class FlowTaskServiceImpl extends BaseServiceImpl<FlowTaskDao, FlowTask>
     @Autowired
     private FlowInstanceService flowInstanceService;
     @Autowired
-    private FlowActivityService flowActivityService;
-    @Autowired
     private ManagementService managementService;
     @Autowired
     private RepositoryService repositoryService;
@@ -185,16 +182,22 @@ public class FlowTaskServiceImpl extends BaseServiceImpl<FlowTaskDao, FlowTask>
     public void reject(RejectTaskForm taskForm) {
         Task task = this.comment(taskForm);
         this.updateStatus(task.getId(), ProcessStatus.REJECT);
+        FlowDefine flowDefine = flowDefineService.getDefine(task.getProcessDefinitionId());
+        if (Objects.nonNull(flowDefine)) {
+            Node node = flowDefine.findFlowNodeOfType(Node.class, taskForm.getTargetNode());
+            if (Objects.nonNull(node)) {
+                taskService.addComment(
+                        task.getId(),
+                        task.getProcessInstanceId(),
+                        String.format("<span>退回至 <span class='color-error'>%s</span></span>", node.getName())
+                );
+            }
+        }
         // 回退节点
         managementService.executeCommand(new JumpActivityCmd(
                 task.getProcessInstanceId(),
                 taskForm.getTargetNode()
         ));
-        taskService.addComment(
-                task.getId(),
-                task.getProcessInstanceId(),
-                String.format("<span>退回至 <span class='color-error'>%s</span></span>", task.getName())
-        );
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -441,6 +444,7 @@ public class FlowTaskServiceImpl extends BaseServiceImpl<FlowTaskDao, FlowTask>
                             .collect(Collectors.toList());
                     return new FlowComment(comment, attachments);
                 })
+                .sorted(Comparator.comparing(FlowComment::getTime))
                 .collect(Collectors.toList());
     }