From 72a7deb95e2e48dade03e54b90a7498f226af1fc Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 09 一月 2025 14:57:34 +0800
Subject: [PATCH] 转办逻辑完善
---
flowable/src/main/java/com/ycl/domain/query/FlowLogQuery.java | 0
flowable/src/main/java/com/ycl/service/impl/FlowLogServiceImpl.java | 12 ++++++++++++
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java | 2 +-
flowable/src/main/java/com/ycl/service/FlowLogService.java | 9 +++++++++
flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java | 15 +++++++++------
flowable/src/main/java/com/ycl/mapper/FlowLogMapper.java | 0
flowable/src/main/resources/mapper/FlowLogMapper.xml | 0
flowable/src/main/java/com/ycl/controller/FlowLogController.java | 0
flowable/src/main/java/com/ycl/domain/entity/FlowLog.java | 0
flowable/src/main/java/com/ycl/domain/vo/FlowLogVO.java | 0
10 files changed, 31 insertions(+), 7 deletions(-)
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 dc5b220..9e7bda4 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -538,7 +538,7 @@
jsonData.setAfterHandlerIds(afterHandlerIds);
jsonData.setAfterHandlerType(form.getPeopleType());
// 娣诲姞鏃ュ織
- flowLogService.add(task.getId(), form.getProcessInsId(), FlowLogEventTypeEnum.DELEGATE, form.getProjectId(), JSON.toJSONString(jsonData));
+ flowLogService.add(task.getId(), task.getProcessInstanceId(), FlowLogEventTypeEnum.DELEGATE, form.getProjectId(), JSON.toJSONString(jsonData));
return Result.ok("杞姙鎴愬姛");
}
diff --git a/business/src/main/java/com/ycl/controller/FlowLogController.java b/flowable/src/main/java/com/ycl/controller/FlowLogController.java
similarity index 100%
rename from business/src/main/java/com/ycl/controller/FlowLogController.java
rename to flowable/src/main/java/com/ycl/controller/FlowLogController.java
diff --git a/business/src/main/java/com/ycl/domain/entity/FlowLog.java b/flowable/src/main/java/com/ycl/domain/entity/FlowLog.java
similarity index 100%
rename from business/src/main/java/com/ycl/domain/entity/FlowLog.java
rename to flowable/src/main/java/com/ycl/domain/entity/FlowLog.java
diff --git a/business/src/main/java/com/ycl/domain/query/FlowLogQuery.java b/flowable/src/main/java/com/ycl/domain/query/FlowLogQuery.java
similarity index 100%
rename from business/src/main/java/com/ycl/domain/query/FlowLogQuery.java
rename to flowable/src/main/java/com/ycl/domain/query/FlowLogQuery.java
diff --git a/business/src/main/java/com/ycl/domain/vo/FlowLogVO.java b/flowable/src/main/java/com/ycl/domain/vo/FlowLogVO.java
similarity index 100%
rename from business/src/main/java/com/ycl/domain/vo/FlowLogVO.java
rename to flowable/src/main/java/com/ycl/domain/vo/FlowLogVO.java
diff --git a/business/src/main/java/com/ycl/mapper/FlowLogMapper.java b/flowable/src/main/java/com/ycl/mapper/FlowLogMapper.java
similarity index 100%
rename from business/src/main/java/com/ycl/mapper/FlowLogMapper.java
rename to flowable/src/main/java/com/ycl/mapper/FlowLogMapper.java
diff --git a/business/src/main/java/com/ycl/service/FlowLogService.java b/flowable/src/main/java/com/ycl/service/FlowLogService.java
similarity index 84%
rename from business/src/main/java/com/ycl/service/FlowLogService.java
rename to flowable/src/main/java/com/ycl/service/FlowLogService.java
index da784df..1c2727f 100644
--- a/business/src/main/java/com/ycl/service/FlowLogService.java
+++ b/flowable/src/main/java/com/ycl/service/FlowLogService.java
@@ -58,4 +58,13 @@
* @return
*/
Result all();
+
+ /**
+ * 鍒ゆ柇浠诲姟杞姙杩囨病
+ *
+ * @param processInstanceId 娴佺▼瀹炰緥id
+ * @param taskId 浠诲姟id
+ * @return
+ */
+ Boolean taskDelegation(String processInstanceId, String taskId);
}
diff --git a/business/src/main/java/com/ycl/service/impl/FlowLogServiceImpl.java b/flowable/src/main/java/com/ycl/service/impl/FlowLogServiceImpl.java
similarity index 83%
rename from business/src/main/java/com/ycl/service/impl/FlowLogServiceImpl.java
rename to flowable/src/main/java/com/ycl/service/impl/FlowLogServiceImpl.java
index 4e0bf3d..1638b47 100644
--- a/business/src/main/java/com/ycl/service/impl/FlowLogServiceImpl.java
+++ b/flowable/src/main/java/com/ycl/service/impl/FlowLogServiceImpl.java
@@ -1,6 +1,7 @@
package com.ycl.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.ycl.common.enums.business.FlowLogEventTypeEnum;
import com.ycl.domain.entity.FlowLog;
import com.ycl.mapper.FlowLogMapper;
@@ -9,6 +10,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.domain.vo.FlowLogVO;
import com.ycl.domain.query.FlowLogQuery;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;
import lombok.RequiredArgsConstructor;
import com.ycl.framework.utils.PageUtil;
@@ -106,4 +108,14 @@
.collect(Collectors.toList());
return Result.ok().data(vos);
}
+
+ @Override
+ public Boolean taskDelegation(String processInstanceId, String taskId) {
+ List<FlowLog> list = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(FlowLog::getFlowInsId, processInstanceId)
+ .eq(FlowLog::getTaskId, taskId)
+ .eq(FlowLog::getEventType, FlowLogEventTypeEnum.DELEGATE)
+ .list();
+ return CollectionUtils.isNotEmpty(list);
+ }
}
diff --git a/flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java b/flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
index 0c3771e..485553f 100644
--- a/flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
+++ b/flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
@@ -28,6 +28,7 @@
import com.ycl.flow.FindNextNodeUtil;
import com.ycl.flow.FlowableUtils;
import com.ycl.mapper.ProcessCodingMapper;
+import com.ycl.service.FlowLogService;
import com.ycl.service.IFlowTaskService;
import com.ycl.service.ISysDeployFormService;
import com.ycl.service.ISysFormService;
@@ -93,6 +94,7 @@
private final ISysFormService sysFormService;
private final TaskCommonService taskCommonService;
private final ProcessCodingMapper processCodingMapper;
+ private final FlowLogService flowLogService;
/**
* 瀹屾垚瀹℃牳浠诲姟
@@ -136,17 +138,18 @@
if (!org.springframework.util.CollectionUtils.isEmpty(variables)) {
for (String key : variables.keySet()) {
newV.put(task.getTaskDefinitionKey() + "&" + key, variables.get(key));
-// if (ProcessConstants.TASK_FORM_KEY.equals(key)) {
-// newV.put(task.getTaskDefinitionKey() + "_" + ProcessConstants.TASK_FORM_KEY, variables.get(key));
-// } else if (ProcessConstants.WIDGET_LIST.equals(key)){
-// newV.put(task.getTaskDefinitionKey() + "_" + ProcessConstants.WIDGET_LIST, variables.get(key));
-// }
}
+ }
+ taskService.addComment(taskId, task.getProcessInstanceId(), FlowComment.SUBMIT.getType(), "瀹屾垚鎻愪氦");
+ // 鍒ゆ柇褰撳墠浠诲姟鏄笉鏄浆鍔炶繃鐨�
+ Boolean delegation = flowLogService.taskDelegation(task.getProcessInstanceId(), task.getId());
+ if (delegation) {
+ taskService.resolveTask(taskId, newV);
}
// 鍏堣褰撳墠鐢ㄦ埛璁ら杩欎釜浠诲姟
taskService.claim(taskId, SecurityUtils.getUserId() + "");
- taskService.addComment(taskId, task.getProcessInstanceId(), FlowComment.SUBMIT.getType(), "瀹屾垚鎻愪氦");
taskService.complete(taskId, newV);
+
return AjaxResult.success("鎻愪氦鎴愬姛");
}
diff --git a/business/src/main/resources/mapper/FlowLogMapper.xml b/flowable/src/main/resources/mapper/FlowLogMapper.xml
similarity index 100%
rename from business/src/main/resources/mapper/FlowLogMapper.xml
rename to flowable/src/main/resources/mapper/FlowLogMapper.xml
--
Gitblit v1.8.0