From c46e5e406ced41073eced2cd7a825ea8d84a58bb Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期四, 03 七月 2025 18:55:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/WorkTaskServiceImplVo.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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
index ee8f6ea..a60047e 100644
--- 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
@@ -17,19 +17,29 @@
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);
+ IPage<WorkTaskDataVo> workTaskDataVoIPage = baseMapper.taskBySelf(flowMy, page);
workTaskDataVoIPage.getRecords().forEach(workTaskDataVo -> {
- HistoricActivityInstance historicActivityInstance=flowMyBusinessService.getPreviousNode(workTaskDataVo.getId());
- if (historicActivityInstance != null){
+ HistoricActivityInstance historicActivityInstance = flowMyBusinessService.getPreviousNode(workTaskDataVo.getId());
+ if (historicActivityInstance != null) {
workTaskDataVo.setPreNode(historicActivityInstance.getActivityName());
workTaskDataVo.setPreNodeAssignee(historicActivityInstance.getAssignee());
}
- if (StrUtil.isEmpty(workTaskDataVo.getAssignee())){
+ if (StrUtil.isEmpty(workTaskDataVo.getAssignee())) {
workTaskDataVo.setAssignee(flowMy.getUsername());
}
});
return workTaskDataVoIPage;
}
+
+ @Override
+ public Integer taskCountBySelf(String username) {
+ Integer count = baseMapper.taskCountBySelf(username);
+ if (count == null) {
+ return 0;
+ }
+ return count;
+ }
}
--
Gitblit v1.9.3