From 23855599412c4d61b38d78f0f3abd3430a48b5b1 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 25 六月 2025 11:51:38 +0800
Subject: [PATCH] Merge branch 'mdc_hyjs_master'

---
 lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/WorkTaskServiceImplVo.java |   35 +++++++++++++++++++++++++++++++++++
 1 files changed, 35 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/WorkTaskServiceImplVo.java b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/WorkTaskServiceImplVo.java
new file mode 100644
index 0000000..ee8f6ea
--- /dev/null
+++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/WorkTaskServiceImplVo.java
@@ -0,0 +1,35 @@
+package org.jeecg.modules.flowable.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+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.flowable.engine.history.HistoricActivityInstance;
+import org.jeecg.modules.flowable.apithird.business.service.impl.FlowMyBusinessServiceImpl;
+import org.jeecg.modules.flowable.domain.vo.FlowMy;
+import org.jeecg.modules.flowable.domain.vo.WorkTaskDataVo;
+import org.jeecg.modules.flowable.mapper.IWorkTaskVoMapper;
+import org.jeecg.modules.flowable.service.IWorkTaskServiceVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class WorkTaskServiceImplVo extends ServiceImpl<IWorkTaskVoMapper, WorkTaskDataVo> implements IWorkTaskServiceVo {
+    @Autowired
+    FlowMyBusinessServiceImpl flowMyBusinessService;
+    @Override
+    public IPage<WorkTaskDataVo> toTaskBySelf(FlowMy flowMy, Page page) {
+        IPage<WorkTaskDataVo> workTaskDataVoIPage=baseMapper.taskBySelf(flowMy,page);
+        workTaskDataVoIPage.getRecords().forEach(workTaskDataVo -> {
+            HistoricActivityInstance historicActivityInstance=flowMyBusinessService.getPreviousNode(workTaskDataVo.getId());
+            if (historicActivityInstance != null){
+                workTaskDataVo.setPreNode(historicActivityInstance.getActivityName());
+                workTaskDataVo.setPreNodeAssignee(historicActivityInstance.getAssignee());
+            }
+            if (StrUtil.isEmpty(workTaskDataVo.getAssignee())){
+                workTaskDataVo.setAssignee(flowMy.getUsername());
+            }
+        });
+        return workTaskDataVoIPage;
+    }
+}

--
Gitblit v1.9.3