From 001876ed79400dcf36e0558c1e744e0693ee9020 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 04 三月 2025 10:53:21 +0800
Subject: [PATCH] 流程日志bug、流程推进全部事项分页bug
---
business/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java
index 2d31b69..2d0b6d7 100644
--- a/business/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProcessLogServiceImpl.java
@@ -58,7 +58,7 @@
* @param eventDataJson json鎵╁睍鍐呭
*/
@Override
- public void add(String taskId, String flowInsId, ProcessLogEventTypeEnum eventType, Long projectId, String eventDataJson) {
+ public void add(String taskId, String flowInsId, ProcessLogEventTypeEnum eventType, String projectId, String eventDataJson) {
ProcessLog log = new ProcessLog();
log.setTaskId(taskId);
log.setProcessInsId(flowInsId);
@@ -137,6 +137,30 @@
return CollectionUtils.isNotEmpty(list);
}
+ @Override
+ public Boolean taskIsHangup(String taskId, String processInsId) {
+ Long num = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(ProcessLog::getProcessInsId, processInsId)
+ .eq(ProcessLog::getTaskId, taskId)
+ .in(ProcessLog::getEventType, ProcessLogEventTypeEnum.HANGUP, ProcessLogEventTypeEnum.CANCEL_HANGUP)
+ .count();
+ return num % 2 != 0;
+ }
+
+ @Override
+ public Boolean taskIsTeamwork(String taskId, String processInsId) {
+ ProcessLog log = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(ProcessLog::getProcessInsId, processInsId)
+ .eq(ProcessLog::getTaskId, taskId)
+ .eq(ProcessLog::getEventType, ProcessLogEventTypeEnum.TEAM_WORK)
+ .one();
+ if (Objects.isNull(log)) {
+ return Boolean.FALSE;
+ } else {
+ // 鍒ゆ柇鍗忓悓浜烘槸鍚﹀叏閮ㄥ畬鎴愪簡鍗忓悓銆俆ODO
+ }
+ return null;
+ }
@Override
public Result projectProcessLogPage(ProcessLogQuery query) {
--
Gitblit v1.8.0