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 | 127 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 120 insertions(+), 7 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 1b92cfb..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
@@ -1,15 +1,27 @@
package org.jeecg.modules.flowable.apithird.business.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
import org.jeecg.modules.flowable.apithird.business.mapper.FlowMyBusinessMapper;
import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
+import org.jeecg.modules.flowable.domain.dto.FlowTaskDto;
+import org.jeecg.modules.flowable.util.TimeUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
/**
* @Description: 娴佺▼涓氬姟鎵╁睍琛�
@@ -19,15 +31,40 @@
*/
@Service
public class FlowMyBusinessServiceImpl extends ServiceImpl<FlowMyBusinessMapper, FlowMyBusiness> implements IFlowMyBusinessService {
- @Autowired
+ @Resource
private FlowMyBusinessMapper flowMyBusinessMapper;
+ @Autowired
+ private HistoryService historyService;
+
+ public HistoricActivityInstance getPreviousNode(String taskId) {
+ // 鑾峰彇褰撳墠浠诲姟鐨勬墽琛屽疄渚� ID
+ String processInstanceId = historyService.createHistoricTaskInstanceQuery()
+ .taskId(taskId)
+ .singleResult()
+ .getProcessInstanceId();
+
+ // 鏌ヨ鍘嗗彶娲诲姩瀹炰緥
+ List<HistoricActivityInstance> historicActivityInstances = historyService.createHistoricActivityInstanceQuery()
+ .processInstanceId(processInstanceId)
+ .activityType("userTask")
+ .finished()
+ .orderByHistoricActivityInstanceEndTime()
+ .desc()
+ .list();
+
+ // 鍙栫涓�涓粨鏋滐紝鍗充笂涓�绾ц妭鐐�
+ if (!historicActivityInstances.isEmpty()) {
+ return historicActivityInstances.get(0);
+ }
+
+ return null;
+ }
+
+ @Transactional // 闄嶄綆闅旂绾у埆
public FlowMyBusiness getByDataId(String dataId) {
- LambdaQueryWrapper<FlowMyBusiness> flowMyBusinessLambdaQueryWrapper = new LambdaQueryWrapper<>();
- flowMyBusinessLambdaQueryWrapper.eq(FlowMyBusiness::getDataId,dataId)
- ;
//濡傛灉淇濆瓨鏁版嵁鍓嶆湭璋冪敤蹇呰皟鐨凢lowCommonService.initActBusiness鏂规硶锛屽氨浼氭湁闂
- FlowMyBusiness business = this.getOne(flowMyBusinessLambdaQueryWrapper);
+ FlowMyBusiness business = flowMyBusinessMapper.selectByDataId(dataId);
return business;
}
@@ -40,12 +77,88 @@
FlowMyBusiness business = this.getOne(flowMyBusinessLambdaQueryWrapper);
return business;
}
+
+ /**
+ * 娴佺▼-鎴戠殑宸插姙
+ * @param flowMyBusinessDto
+ * @return
+ */
+ public List<FlowTaskDto> ListMyBusiness(FlowMyBusinessDto flowMyBusinessDto){
+ return flowMyBusinessMapper.ListMyBusiness(flowMyBusinessDto);
+ }
+
/**
* 娴佺▼鎬诲彴璐�
* @param flowMyBusinessDto
* @return
*/
- public IPage<FlowMyBusinessDto> findPageList(Page page, FlowMyBusinessDto flowMyBusinessDto){
- return flowMyBusinessMapper.getPageList(page,flowMyBusinessDto);
+ public IPage<FlowMyBusinessDto> getPageList(Page page, FlowMyBusinessDto flowMyBusinessDto){
+ IPage<FlowMyBusinessDto> flowMyBusinessDtoIPage =flowMyBusinessMapper.PageList(page,flowMyBusinessDto);
+ flowMyBusinessDtoIPage.getRecords().forEach(item -> {
+ if (!("").equals(item.getTaskId())&&item.getTaskId()!=null){
+ HistoricActivityInstance historicActivityInstance = getPreviousNode(item.getTaskId());
+ if (historicActivityInstance != null){
+ item.setPreNode(historicActivityInstance.getActivityName());
+ }
+ }
+ if (item.getTodoUsers() == null){
+ item.setTodoUsers("");
+ }else {
+ //鍘婚櫎[]
+ item.setTodoUsers(item.getTodoUsers().replaceAll("\\[", "").replaceAll("\\]", ""));
+ item.setTodoUsers(item.getTodoUsers().replaceAll("\"", ""));
+ }
+
+ if (item.getDoneUsers() == null){
+ item.setDoneUsers("");
+ }else {
+ //鍘婚櫎[]
+ item.setDoneUsers(item.getDoneUsers().replaceAll("\\[", "").replaceAll("\\]", ""));
+ item.setDoneUsers(item.getDoneUsers().replaceAll("\"", ""));
+ }
+ //璁＄畻澶勭悊鏃堕暱
+ Date kssj=item.getStartTime();
+ Date jssj;
+ if (item.getEndTime() != null){
+ jssj=item.getEndTime();
+ }else {
+ jssj=new Date();
+ }
+ item.setDuration(TimeUtil.howLong(kssj, jssj,2));
+ });
+ return flowMyBusinessDtoIPage;
+ }
+
+ @Override
+ public FlowMyBusiness getFlowMyBusiness(String instanceId) {
+ List<FlowMyBusiness> businessList = super.list(
+ new QueryWrapper<FlowMyBusiness>().eq("process_instance_id", instanceId));
+ return businessList.isEmpty() ? null : businessList.get(0);
+ }
+
+ @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