From 9563594760a226250f7f317019792949c0606eb7 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 14 二月 2025 09:51:16 +0800
Subject: [PATCH] 日志保存任务名
---
business/src/main/java/com/ycl/event/event/TaskLogEvent.java | 7 ++++++-
business/src/main/java/com/ycl/event/listener/ProcessLogEventListener.java | 1 +
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java | 7 ++++---
business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java | 2 ++
flowable/src/main/java/com/ycl/domain/entity/ProcessLog.java | 3 +++
5 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/business/src/main/java/com/ycl/event/event/TaskLogEvent.java b/business/src/main/java/com/ycl/event/event/TaskLogEvent.java
index dc3e3a4..0a72952 100644
--- a/business/src/main/java/com/ycl/event/event/TaskLogEvent.java
+++ b/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;
}
}
diff --git a/business/src/main/java/com/ycl/event/listener/ProcessLogEventListener.java b/business/src/main/java/com/ycl/event/listener/ProcessLogEventListener.java
index 879e30f..c044cd8 100644
--- a/business/src/main/java/com/ycl/event/listener/ProcessLogEventListener.java
+++ b/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()));
diff --git a/business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java b/business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
index ca2edcc..268b945 100644
--- a/business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
+++ b/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())));
}
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
index c85f46e..ee3e6d6 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/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("鎿嶄綔鎴愬姛");
}
diff --git a/flowable/src/main/java/com/ycl/domain/entity/ProcessLog.java b/flowable/src/main/java/com/ycl/domain/entity/ProcessLog.java
index 641ccad..bf684aa 100644
--- a/flowable/src/main/java/com/ycl/domain/entity/ProcessLog.java
+++ b/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;
--
Gitblit v1.8.0