From 7e7ac7b568d7b79a65c755bd47d0868835adc8f8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 06 三月 2025 10:53:01 +0800
Subject: [PATCH] 容缺接口
---
business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
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 f943d23..b39a37e 100644
--- a/business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
+++ b/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");
--
Gitblit v1.8.0