From 96a893bcc673085f7d6fe3bc5ca7dc34e7ca1db2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 12 二月 2025 17:44:25 +0800
Subject: [PATCH] flowable模块中的FlowTaskService及controller移动到business模块，完成任务和驳回任务添加日志
---
system/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java | 74 +++++++++++++++++++++++++++++++++++-
1 files changed, 71 insertions(+), 3 deletions(-)
diff --git a/system/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java b/system/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java
index a54ad3f..2230c2a 100644
--- a/system/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java
+++ b/system/src/main/java/com/ycl/system/service/impl/SysDeptServiceImpl.java
@@ -1,9 +1,11 @@
package com.ycl.system.service.impl;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
+
+import com.ycl.common.base.Result;
+import com.ycl.common.core.domain.StringTreeSelect;
+import com.ycl.system.domain.base.BaseSelect;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ycl.common.annotation.DataScope;
@@ -61,6 +63,42 @@
return buildDeptTreeSelect(depts);
}
+ @Override
+ public List<StringTreeSelect> flowDeptTree(SysDept dept) {
+ List<SysDept> depts = deptMapper.selectDeptList(dept);
+ List<StringTreeSelect> list = depts.stream().map(item -> {
+ StringTreeSelect d = new StringTreeSelect();
+ d.setId("dept:" + item.getDeptId());
+ d.setLabel(item.getDeptName());
+ d.setParentId("dept:" + item.getParentId());
+ return d;
+ }).collect(Collectors.toList());
+
+
+ Map<String, StringTreeSelect> nodeMap = new HashMap<>();
+ // 灏嗘墍鏈夎妭鐐规斁鍏ap涓紝鏂逛究鍚庣画鏌ユ壘
+ for (StringTreeSelect node : list) {
+ nodeMap.put(node.getId(), node);
+ }
+ List<StringTreeSelect> treeList = new ArrayList<>();
+ // 鏋勫缓鏍戠粨鏋�
+ for (StringTreeSelect node : list) {
+ StringTreeSelect root = null;
+ if ("dept:0".equals(node.getParentId()) || node.getParentId().isEmpty()) {
+ // 鏍硅妭鐐�
+ root = node;
+ treeList.add(root);
+ } else {
+ // 鎵惧埌鐖惰妭鐐癸紝骞跺皢褰撳墠鑺傜偣娣诲姞鍒扮埗鑺傜偣鐨刢hildren鍒楄〃涓�
+ StringTreeSelect parentNode = nodeMap.get(node.getParentId());
+ if (parentNode != null) {
+ parentNode.getChildren().add(node);
+ }
+ }
+ }
+ return treeList;
+ }
+
/**
* 鏋勫缓鍓嶇鎵�闇�瑕佹爲缁撴瀯
*
@@ -87,6 +125,8 @@
}
return returnList;
}
+
+
/**
* 鏋勫缓鍓嶇鎵�闇�瑕佷笅鎷夋爲缁撴瀯
@@ -335,4 +375,32 @@
{
return getChildList(list, t).size() > 0;
}
+
+ /**
+ * 閮ㄩ棬涓嬫媺鍒楄〃
+ * @return
+ */
+ @Override
+ public Result all(SysDept dept) {
+ List<BaseSelect> vos = deptMapper.selectDeptList(dept).stream().map(sysDept -> {
+ BaseSelect baseSelect = new BaseSelect();
+ baseSelect.setId(Integer.parseInt(sysDept.getDeptId() + ""));
+ baseSelect.setValue(sysDept.getDeptName());
+ return baseSelect;
+ }
+ ).collect(Collectors.toList());
+ return Result.ok().data(vos);
+ }
+
+
+ @Override
+ public List<StringTreeSelect> flowableAll() {
+ List<StringTreeSelect> list = deptMapper.selectDeptList(new SysDept()).stream().map(sysDept -> {
+ StringTreeSelect stringTreeSelect = new StringTreeSelect();
+ stringTreeSelect.setId("dept:" + sysDept.getDeptId());
+ stringTreeSelect.setLabel(sysDept.getDeptName());
+ return stringTreeSelect;
+ }).collect(Collectors.toList());
+ return list;
+ }
}
--
Gitblit v1.8.0