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

xiangpei

2025-03-04 3cbfc1624bb7a23a4dfa62ec4558578b00be56b3

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

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

@@ -1304,7 +1304,7 @@
            }
            // 判断任务是否存在特殊操作(如跳过、转办等)，需要在前端展示出来
            ProcessLogQuery query = new ProcessLogQuery();
            query.setTaskId(taskId);
            query.setTaskDefKey(node.getUserTask().getId());
            query.setProcessInsId(finalProcessInsId);
            Result result = processLogService.projectProcessLogPage(query);
            List<ProcessLogVO> logList = (List<ProcessLogVO>) result.get("data");
@@ -1375,7 +1375,7 @@
                }
                // 判断任务是否存在特殊操作(如跳过、转办等)，需要在前端展示出来
                ProcessLogQuery query = new ProcessLogQuery();
                query.setTaskId(hisTask.getId());
                query.setTaskDefKey(node.getUserTask().getId());
                query.setProcessInsId(hisTask.getProcessInstanceId());
                Result result = processLogService.projectProcessLogPage(query);
                List<ProcessLogVO> logList = (List<ProcessLogVO>) result.get("data");
@@ -1427,7 +1427,7 @@
                }
                // 判断任务是否存在特殊操作(如跳过、转办等)，需要在前端展示出来
                ProcessLogQuery query = new ProcessLogQuery();
                query.setTaskId(task.getId());
                query.setTaskDefKey(node.getUserTask().getId());
                query.setProcessInsId(task.getProcessInstanceId());
                Result result = processLogService.projectProcessLogPage(query);
                List<ProcessLogVO> logList = (List<ProcessLogVO>) result.get("data");

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

@@ -178,12 +178,15 @@
                } else if (ProcessLogEventTypeEnum.REJECT.equals(log.getEventType())) {
                    log.setEventDataObj(JSON.parseObject(log.getEventDataJson(), RejectData.class));
                } else if (ProcessLogEventTypeEnum.SUPERVISE.equals(log.getEventType())) {
                    SuperviseData superviseData = JSON.parseObject(log.getEventDataJson(), SuperviseData.class);
                    SysUser user = userService.selectUserById(Long.parseLong(superviseData.getSenderId()));
                    List<SuperviseData> superviseDataList = JSON.parseArray(log.getEventDataJson(), SuperviseData.class);
                    if (CollectionUtils.isNotEmpty(superviseDataList)) {
                        SysUser user = userService.selectUserById(Long.parseLong(superviseDataList.get(0).getSenderId()));
                    if (Objects.nonNull(user)) {
                        superviseData.setSenderName(user.getNickName() + "(" + (Objects.nonNull(user.getDept()) ? user.getDept().getDeptName() : "无部门") + ")");
                            superviseDataList.get(0).setSenderName(user.getNickName() + "(" + (Objects.nonNull(user.getDept()) ? user.getDept().getDeptName() : "无部门") + ")");
                    }
                    log.setEventDataObj(superviseData);
                        log.setEventDataObj(superviseDataList.get(0));
                    }

                } else if (ProcessLogEventTypeEnum.HANGUP.equals(log.getEventType())) {
                    log.setEventDataObj(JSON.parseObject(log.getEventDataJson(), HangupData.class));
                }

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

@@ -761,7 +761,7 @@
        ProcessLog processLog = new LambdaQueryChainWrapper<>(processLogService.getBaseMapper())
                .eq(ProcessLog::getTaskId, form.getTaskId())
                .eq(ProcessLog::getEventType, ProcessLogEventTypeEnum.SUPERVISE)
                .eq(ProcessLog::getProcessInsId, form.getProcessInsId())
                .eq(ProcessLog::getProcessInsId, task.getProcessInstanceId())
                .one();
        List<SuperviseData> dataList;
        if (processLog != null) {
@@ -778,7 +778,7 @@
                processLog.getId(),
                processLog.getUserId(),
                form.getProjectId(),
                form.getProcessInsId(),
                task.getProcessInstanceId(),
                form.getTaskId(),
                task.getTaskDefinitionKey(),
                task.getName(),

 flowable/src/main/java/com/ycl/domain/query/ProcessLogQuery.java

@@ -30,6 +30,11 @@
    private String taskId;

    /**
     * 任务定义key
     */
    private String taskDefKey;

    /**
     * 流程实例id
     */
    private String processInsId;

 flowable/src/main/resources/mapper/ProcessLogMapper.xml

@@ -76,6 +76,7 @@
            TFL.deleted = 0 AND TFL.process_ins_id = #{query.processInsId}
            <if test="query.taskId != null and query.taskId != ''">AND TFL.task_id = #{query.taskId}</if>
            <if test="query.projectId != null and query.projectId != ''">AND TFL.project_id = #{query.projectId}</if>
            <if test="query.taskDefKey != null and query.taskDefKey != ''">AND TFL.task_def_key = #{query.taskDefKey}</if>
        ORDER BY
            TFL.gmt_create DESC
    </select>