fuliqi
2025-02-14 9563594760a226250f7f317019792949c0606eb7
日志保存任务名
5个文件已修改
20 ■■■■ 已修改文件
business/src/main/java/com/ycl/event/event/TaskLogEvent.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/event/listener/ProcessLogEventListener.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flowable/src/main/java/com/ycl/domain/entity/ProcessLog.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/event/event/TaskLogEvent.java
@@ -37,6 +37,10 @@
     * 任务id
     */
    private String taskId;
    /**
     * 任务名
     */
    private String taskName;
    /**
     * 事件类型
@@ -58,7 +62,7 @@
     * @param taskId 任务id
     * @param otherData 其它数据
     */
    public TaskLogEvent(Object source,Long id,Long userId, Long projectId, String processInsId, String taskId, ProcessLogEventTypeEnum eventType, Object otherData) {
    public TaskLogEvent(Object source,Long id,Long userId, Long projectId, String processInsId, String taskId, String taskName,ProcessLogEventTypeEnum eventType, Object otherData) {
        super(source);
        this.id = id;
        this.userId = userId;
@@ -66,6 +70,7 @@
        this.processInsId = processInsId;
        this.eventType = eventType;
        this.taskId = taskId;
        this.taskName = taskName;
        this.otherData = otherData;
    }
}
business/src/main/java/com/ycl/event/listener/ProcessLogEventListener.java
@@ -34,6 +34,7 @@
        log.setProcessInsId(event.getProcessInsId());
        log.setProjectId(event.getProjectId());
        log.setTaskId(event.getTaskId());
        log.setTaskName(event.getTaskName());
        log.setUserId(SecurityUtils.getUserId());
        if (Objects.nonNull(event.getOtherData())) {
            log.setEventDataJson(JSON.toJSONString(event.getOtherData()));
business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
@@ -178,6 +178,7 @@
                projectProcess.getProjectId(),
                projectProcess.getProcessInsId(),
                taskId,
                task.getName(),
                ProcessLogEventTypeEnum.FINISHED,
                null));
        return AjaxResult.success("提交成功");
@@ -318,6 +319,7 @@
                projectProcess.getProjectId(),
                projectProcess.getProcessInsId(),
                flowTaskVo.getTaskId(),
                task.getName(),
                ProcessLogEventTypeEnum.REJECT,
                new RejectData(flowTaskVo.getComment())));
    }
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -611,7 +611,7 @@
        jsonData.setAfterHandlerIds(afterHandlerIds);
        jsonData.setAfterHandlerType(form.getPeopleType());
        // 发布转办事件
        publisher.publishEvent(new TaskLogEvent(this, null,SecurityUtils.getUserId(), form.getProjectId(), form.getProcessInsId(), task.getId(), ProcessLogEventTypeEnum.DELEGATE, jsonData));
        publisher.publishEvent(new TaskLogEvent(this, null,SecurityUtils.getUserId(), form.getProjectId(), form.getProcessInsId(), task.getId(), task.getName(),ProcessLogEventTypeEnum.DELEGATE, jsonData));
        return Result.ok("转办成功");
    }
@@ -622,7 +622,7 @@
        Task task = taskService.createTaskQuery().taskId(form.getTaskId()).processInstanceId(form.getProcessInsId()).singleResult();
        if (Objects.nonNull(task)) {
            // 添加跳过日志
            publisher.publishEvent(new TaskLogEvent(this, null,SecurityUtils.getUserId(), form.getProjectId(), form.getProcessInsId(), form.getTaskId(), ProcessLogEventTypeEnum.JUMP, new JumpData(form.getDesc())));
            publisher.publishEvent(new TaskLogEvent(this, null,SecurityUtils.getUserId(), form.getProjectId(), form.getProcessInsId(), form.getTaskId(), task.getName(),ProcessLogEventTypeEnum.JUMP, new JumpData(form.getDesc())));
            // 查出该任务绑定的表单
            Map<String, Object> data = new HashMap<>(1);
@@ -640,6 +640,7 @@
    @Override
    public Result taskSupervise(TaskSuperviseForm form) {
        Task task = taskService.createTaskQuery().taskId(form.getTaskId()).singleResult();
        SuperviseData jsonData = new SuperviseData();
        jsonData.setCreateTime(new Date());
        jsonData.setContent(form.getContent());
@@ -665,7 +666,7 @@
        }
        dataList.add(jsonData);
        //添加督办日志
        publisher.publishEvent(new TaskLogEvent(this, processLog.getId(), processLog.getUserId(), form.getProjectId(), form.getProcessInsId(), form.getTaskId(), ProcessLogEventTypeEnum.SUPERVISE, dataList));
        publisher.publishEvent(new TaskLogEvent(this, processLog.getId(), processLog.getUserId(), form.getProjectId(), form.getProcessInsId(), form.getTaskId(), task.getName(),ProcessLogEventTypeEnum.SUPERVISE, dataList));
        return Result.ok("操作成功");
    }
flowable/src/main/java/com/ycl/domain/entity/ProcessLog.java
@@ -22,6 +22,9 @@
    /** 任务id */
    private String taskId;
    @TableField("task_name")
    /** 任务名 */
    private String taskName;
    @TableField("event_type")
    /** 事件日志类型 */
    private ProcessLogEventTypeEnum eventType;