Merge remote-tracking branch 'origin/master'

luohairen

2024-12-26 2a5a028e5f5d1cbab9a0bdb26ce6c48a5184ef49

Merge remote-tracking branch 'origin/master'

 flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java

@@ -1124,12 +1124,15 @@
                    .processInstanceId(procInsId)
                    .finished()
                    .list();
            //获取所有任务节点信息(扩展)
            List<HistoricTaskInstance> taskList = historyService.createHistoricTaskInstanceQuery()
            //获取所有历史任务节点信息(扩展)
            List<HistoricTaskInstance> taskHistoryList = historyService.createHistoricTaskInstanceQuery()
                    .processInstanceId(procInsId)
                    .finished()
                    .list();

            //获取所有当前任务节点信息(扩展)
            List<Task> taskList = taskService.createTaskQuery()
                    .processInstanceId(procInsId)
                    .list();
            // 保存已经完成的流程节点编号
            listFinished.forEach(s -> {
                FlowViewerDto flowViewerDto = new FlowViewerDto();
@@ -1137,7 +1140,7 @@
                flowViewerDto.setCompleted(true);
                //扩展内容 已完成的用完成时间判断
                Date endTime = s.getEndTime();
                for (HistoricTaskInstance task : taskList) {
                for (HistoricTaskInstance task : taskHistoryList) {
                    if(s.getTaskId()!=null && s.getTaskId().equals(task.getId())){
                        if(task.getDueDate()!=null && endTime.after(task.getDueDate())){
                            flowViewerDto.setOvertime(true);
@@ -1164,7 +1167,7 @@
                flowViewerDto.setKey(s.getActivityId());
                flowViewerDto.setCompleted(false);
                //扩展内容 代办的通过当前时间去判断
                for (HistoricTaskInstance task : taskList) {
                for (Task task : taskList) {
                    if(s.getTaskId()!=null && s.getTaskId().equals(task.getId())){
                        if(task.getDueDate()!=null && now.after(task.getDueDate())){
                            flowViewerDto.setOvertime(true);