From 504333e56f249d16e71e8ac2a435cf2212040c23 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期二, 27 五月 2025 17:32:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/service/impl/FlowMyBusinessServiceImpl.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/service/impl/FlowMyBusinessServiceImpl.java b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/service/impl/FlowMyBusinessServiceImpl.java
index 1cf4f7f..99720f2 100644
--- a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/service/impl/FlowMyBusinessServiceImpl.java
+++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/service/impl/FlowMyBusinessServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.collections4.CollectionUtils;
import org.flowable.engine.HistoryService;
import org.flowable.engine.history.HistoricActivityInstance;
import org.jeecg.modules.flowable.apithird.business.dto.FlowMyBusinessDto;
@@ -18,6 +19,7 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -37,14 +39,14 @@
public HistoricActivityInstance getPreviousNode(String taskId) {
// 鑾峰彇褰撳墠浠诲姟鐨勬墽琛屽疄渚� ID
- String executionId = historyService.createHistoricTaskInstanceQuery()
+ String processInstanceId = historyService.createHistoricTaskInstanceQuery()
.taskId(taskId)
.singleResult()
- .getExecutionId();
+ .getProcessInstanceId();
// 鏌ヨ鍘嗗彶娲诲姩瀹炰緥
List<HistoricActivityInstance> historicActivityInstances = historyService.createHistoricActivityInstanceQuery()
- .executionId(executionId)
+ .processInstanceId(processInstanceId)
.activityType("userTask")
.finished()
.orderByHistoricActivityInstanceEndTime()
@@ -135,9 +137,28 @@
}
@Override
+ public FlowMyBusiness getFlowMyBusiness(String instanceId, String taskId) {
+ List<FlowMyBusiness> businessList = super.list(
+ new QueryWrapper<FlowMyBusiness>().eq("process_instance_id", instanceId).eq("task_id", taskId));
+ return businessList.isEmpty() ? null : businessList.get(0);
+ }
+
+ @Override
public FlowMyBusiness selectByDataId(String dataId) {
List<FlowMyBusiness> businessList = super.list(
new QueryWrapper<FlowMyBusiness>().eq("data_id", dataId));
return businessList.isEmpty() ? null : businessList.get(0);
}
+
+ @Override
+ public List<FlowMyBusiness> selectListByDataId(String dataId) {
+ //濡傛灉淇濆瓨鏁版嵁鍓嶆湭璋冪敤蹇呰皟鐨凢lowCommonService.initActBusiness鏂规硶锛屽氨浼氭湁闂
+ LambdaQueryWrapper<FlowMyBusiness> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(FlowMyBusiness::getDataId, dataId);
+ List<FlowMyBusiness> list = flowMyBusinessMapper.selectList(queryWrapper);
+ if(CollectionUtils.isEmpty(list)){
+ return Collections.emptyList();
+ }
+ return list;
+ }
}
--
Gitblit v1.9.3