流程日志查询bug、督办日志bug

xiangpei

2025-03-04 3cbfc1624bb7a23a4dfa62ec4558578b00be56b3

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

@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.common.base.Result;
import com.ycl.common.constant.ProcessConstants;
import com.ycl.common.core.domain.AjaxResult;
import com.ycl.common.core.domain.entity.SysDept;
@@ -27,10 +28,8 @@
import com.ycl.domain.entity.ProjectProcess;
import com.ycl.domain.entity.SysForm;
import com.ycl.domain.json.RejectData;
import com.ycl.domain.vo.DoFormDetailVO;
import com.ycl.domain.vo.FlowQueryVo;
import com.ycl.domain.vo.FlowTaskVo;
import com.ycl.domain.vo.FormDetailVO;
import com.ycl.domain.query.ProcessLogQuery;
import com.ycl.domain.vo.*;
import com.ycl.event.event.TaskLogEvent;
import com.ycl.factory.FlowServiceFactory;
import com.ycl.flow.CustomProcessDiagramGenerator;
@@ -1304,11 +1303,11 @@
                }
            }
            // 判断任务是否存在特殊操作(如跳过、转办等)，需要在前端展示出来
            List<ProcessLog> logList = new LambdaQueryChainWrapper<>(processLogService.getBaseMapper())
                    .eq(ProcessLog::getTaskDefKey, node.getBeforeNodeDefId())
                    .eq(ProcessLog::getProcessInsId, finalProcessInsId)
                    .orderByDesc(ProcessLog::getGmtCreate)
                    .list();
            ProcessLogQuery query = new ProcessLogQuery();
            query.setTaskDefKey(node.getUserTask().getId());
            query.setProcessInsId(finalProcessInsId);
            Result result = processLogService.projectProcessLogPage(query);
            List<ProcessLogVO> logList = (List<ProcessLogVO>) result.get("data");
            DoFormDetailVO vo = new DoFormDetailVO();
            BeanUtils.copyProperties(node, vo);
            if (CollectionUtils.isNotEmpty(logList)) {
@@ -1375,11 +1374,11 @@
                    }
                }
                // 判断任务是否存在特殊操作(如跳过、转办等)，需要在前端展示出来
                List<ProcessLog> logList = new LambdaQueryChainWrapper<>(processLogService.getBaseMapper())
                        .eq(ProcessLog::getTaskId, hisTask.getId())
                        .eq(ProcessLog::getProcessInsId, hisTask.getProcessInstanceId())
                        .orderByDesc(ProcessLog::getGmtCreate)
                        .list();
                ProcessLogQuery query = new ProcessLogQuery();
                query.setTaskDefKey(node.getUserTask().getId());
                query.setProcessInsId(hisTask.getProcessInstanceId());
                Result result = processLogService.projectProcessLogPage(query);
                List<ProcessLogVO> logList = (List<ProcessLogVO>) result.get("data");
                DoFormDetailVO vo = new DoFormDetailVO();
                BeanUtils.copyProperties(node, vo);
                if (CollectionUtils.isNotEmpty(logList)) {
@@ -1427,11 +1426,11 @@
                    }
                }
                // 判断任务是否存在特殊操作(如跳过、转办等)，需要在前端展示出来
                List<ProcessLog> logList = new LambdaQueryChainWrapper<>(processLogService.getBaseMapper())
                        .eq(ProcessLog::getTaskId, task.getId())
                        .eq(ProcessLog::getProcessInsId, task.getProcessInstanceId())
                        .orderByDesc(ProcessLog::getGmtCreate)
                        .list();
                ProcessLogQuery query = new ProcessLogQuery();
                query.setTaskDefKey(node.getUserTask().getId());
                query.setProcessInsId(task.getProcessInstanceId());
                Result result = processLogService.projectProcessLogPage(query);
                List<ProcessLogVO> logList = (List<ProcessLogVO>) result.get("data");
                DoFormDetailVO vo = new DoFormDetailVO();
                BeanUtils.copyProperties(node, vo);
                if (CollectionUtils.isNotEmpty(logList)) {