跳过不添加完成的日志

xiangpei

2025-03-05 4ed0390da011027b646d907d8b8ad625bb8d4518

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

@@ -24,7 +24,6 @@
import com.ycl.domain.dto.FlowTaskDto;
import com.ycl.domain.dto.FlowViewerDto;
import com.ycl.domain.entity.ProcessCoding;
import com.ycl.domain.entity.ProcessLog;
import com.ycl.domain.entity.ProjectProcess;
import com.ycl.domain.entity.SysForm;
import com.ycl.domain.json.RejectData;
@@ -76,7 +75,6 @@

import java.io.InputStream;
import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
@@ -137,11 +135,12 @@
     *
     * @param taskId    任务id
     * @param variables 表单数据
     * @param addLog
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult completeSubmitForm(String taskId, Map<String, Object> variables) {
    public AjaxResult completeSubmitForm(String taskId, Map<String, Object> variables, Boolean addLog) {
        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
        if (Objects.isNull(task)) {
            return AjaxResult.error("任务不存在");
@@ -175,15 +174,17 @@
            taskService.complete(taskId, newV);
        }
        // 保存日志
        publisher.publishEvent(new TaskLogEvent(this, null,
                SecurityUtils.getUserId(),
                projectProcess.getProjectId(),
                projectProcess.getProcessInsId(),
                taskId,
                task.getTaskDefinitionKey(),
                task.getName(),
                ProcessLogEventTypeEnum.FINISHED,
                null));
        if (addLog) {
            publisher.publishEvent(new TaskLogEvent(this, null,
                    SecurityUtils.getUserId(),
                    projectProcess.getProjectId(),
                    projectProcess.getProcessInsId(),
                    taskId,
                    task.getTaskDefinitionKey(),
                    task.getName(),
                    ProcessLogEventTypeEnum.FINISHED,
                    null));
        }
        return AjaxResult.success("提交成功");
    }

@@ -1304,7 +1305,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 +1376,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 +1428,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");