From 8b8ecaf63f03fe636c22ce9e8d8e7acd2a5e8255 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: Tue, 08 Jul 2025 16:41:44 +0800
Subject: [PATCH] 排序改造
---
multi-system/src/main/java/com/gkhy/exam/system/service/impl/SysDeptServiceImpl.java | 124 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 114 insertions(+), 10 deletions(-)
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SysDeptServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SysDeptServiceImpl.java
index acf7d43..6b941f5 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SysDeptServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/SysDeptServiceImpl.java
@@ -6,13 +6,17 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.gkhy.exam.common.api.CommonPage;
import com.gkhy.exam.common.constant.UserConstant;
import com.gkhy.exam.common.domain.TreeSelect;
import com.gkhy.exam.common.domain.entity.SysDept;
import com.gkhy.exam.common.domain.entity.SysRole;
import com.gkhy.exam.common.exception.ApiException;
+import com.gkhy.exam.common.utils.NaturalOrderComparator;
+import com.gkhy.exam.common.utils.PageUtils;
import com.gkhy.exam.common.utils.SecurityUtils;
import com.gkhy.exam.common.utils.SpringUtils;
+import com.gkhy.exam.system.domain.SysDeptManage;
import com.gkhy.exam.system.domain.SysDeptResponsibility;
import com.gkhy.exam.system.domain.SysFunctionalDistribution;
import com.gkhy.exam.system.domain.vo.*;
@@ -28,6 +32,7 @@
import java.time.LocalDateTime;
import java.util.*;
+import java.util.function.Function;
import java.util.stream.Collectors;
/**
@@ -50,7 +55,32 @@
@Autowired
private SysFunctionalDistributionMapper sysFunctionalDistributionMapper;
public static final String[] DEPT_ROOT = {"4.1", "4.2", "4.3", "4.4", "5.1", "5.2", "5.3","6.1", "6.2", "6.3",
- "7.1.1", "7.1.2", "7.1.3", "7.1.4", "7.1.5", "7.1.6"};
+ "7.1.1", "7.1.2", "7.1.3", "7.1.4", "7.1.5", "7.1.6","7.2", "7.3", "7.4", "7.5", "7.6","8.1","8.2","8.2.1","8.2.2", "8.2.3", "8.2.4", "8.3", "8.3.1", "8.3.2", "8.3.3", "8.3.4", "8.3.5", "8.3.6", "8.3.7", "8.3.8", "8.4",
+ "8.4.1", "8.4.2", "8.4.3", "8.5", "8.5.1", "8.5.2", "8.5.3", "8.5.4", "8.5.5", "8.5.6", "8.5.7", "8.6","8.7","9.1","9.1.1","9.1.2","9.1.3","9.2", "9.3","10.1"
+ ,"10.2", "10.3"};
+
+ @Override
+ public CommonPage selectDeptPageList(SysDept req) {
+ PageUtils.startPage();
+ List<DeptVo> deptVos = deptMapper.selectDeptList(req);
+ if (ObjectUtil.isNotEmpty(deptVos)){
+ for (DeptVo deptVo : deptVos) {
+ List<CaluseVO1> caluseVO1List = deptVo.getCaluseVO1List();
+ if (ObjectUtil.isNotEmpty(caluseVO1List)){
+ caluseVO1List.sort(Comparator.comparing(CaluseVO1::getClauseNum, new NaturalOrderComparator()));
+ }
+
+ }
+ }
+ int i = deptMapper.selectDeptListCount(req);
+ CommonPage<DeptVo> deptVoCommonPage = CommonPage.restPage(deptVos);
+ int totalPage = (int) Math.ceil((double) i / deptVoCommonPage.getPageSize());
+ deptVoCommonPage.setTotalPage(totalPage);
+ deptVoCommonPage.setTotal(Long.valueOf( i));
+ return deptVoCommonPage;
+
+ }
+
/**
* 查询部门管理数据
*
@@ -64,7 +94,17 @@
if (dept.getCompanyId() == null){
dept.setCompanyId(SecurityUtils.getCompanyId());
}
- return deptMapper.selectDeptList(dept);
+ List<DeptVo> deptVos = deptMapper.selectDeptList(dept);
+ if (ObjectUtil.isNotEmpty(deptVos)){
+ for (DeptVo deptVo : deptVos) {
+ List<CaluseVO1> caluseVO1List = deptVo.getCaluseVO1List();
+ if (ObjectUtil.isNotEmpty(caluseVO1List)){
+ caluseVO1List.sort(Comparator.comparing(CaluseVO1::getClauseNum, new NaturalOrderComparator()));
+ }
+
+ }
+ }
+ return deptVos;
}
@Override
@@ -79,11 +119,56 @@
* @return 部门树信息集合
*/
@Override
- public List<TreeSelect> selectDeptTreeList(SysDept dept)
+ public List<SysDept> selectDeptTreeList(SysDept dept)
{
List<SysDept> depts = SpringUtils.getAopProxy(this).getOutDeptList(dept);
- return buildDeptTreeSelect(depts);
+
+ List<SysDeptManage> allManage = deptMapper.getAllManage(dept.getCompanyId());
+ // 构建父部门到子部门的映射
+ Map<Long, List<Long>> parentToChildrenMap = new HashMap<>();
+ for (SysDeptManage responsibility : allManage) {
+ parentToChildrenMap.computeIfAbsent(responsibility.getDeptId(), k -> new ArrayList<>())
+ .add(responsibility.getSubDeptId());
+ }
+
+ // 构建部门ID到部门对象的映射
+ Map<Long, SysDept> deptMap = depts.stream()
+ .collect(Collectors.toMap(SysDept::getDeptId, Function.identity()));
+
+
+ return buildDeptTree(depts,parentToChildrenMap, deptMap);
}
+
+ public List<SysDept> buildDeptTree(List<SysDept> allDepts, Map<Long, List<Long>> parentToChildrenMap, Map<Long, SysDept> deptMap) {
+ List<SysDept> rootNodes = new ArrayList<>();
+
+ for (SysDept dept : allDepts) {
+ if (!deptMap.values().stream()
+ .anyMatch(d -> parentToChildrenMap.containsValue(dept.getDeptId()))) {
+ // 如果没有其他部门将它作为子部门，则为根节点
+ rootNodes.add(dept);
+ }
+ }
+
+ for (SysDept root : rootNodes) {
+ buildChildren(root, parentToChildrenMap, deptMap);
+ }
+
+ return rootNodes;
+ }
+
+ private void buildChildren(SysDept parent, Map<Long, List<Long>> parentToChildrenMap, Map<Long, SysDept> deptMap) {
+ List<Long> childIds = parentToChildrenMap.getOrDefault(parent.getDeptId(), Collections.emptyList());
+
+ List<SysDept> children = childIds.stream()
+ .map(deptMap::get)
+ .filter(Objects::nonNull)
+ .peek(child -> buildChildren(child, parentToChildrenMap, deptMap))
+ .collect(Collectors.toList());
+
+ parent.setChildren(children);
+ }
+
/**
* 构建前端所需要树结构
@@ -155,6 +240,9 @@
.eq(SysDeptResponsibility::getDelFlag, UserConstant.ENABLE)
.orderByAsc(SysDeptResponsibility::getClauseNum);
List<SysDeptResponsibility> sysDeptResponsibilities = deptResponsibilityMapper.selectList(lambdaQueryWrapper);
+ if (ObjectUtil.isNotEmpty(sysDeptResponsibilities)){
+ sysDeptResponsibilities.sort(Comparator.comparing(SysDeptResponsibility::getClauseNum, new NaturalOrderComparator()));
+ }
deptDetialVo.setSysDeptResponsibilitys(sysDeptResponsibilities);
return deptDetialVo ;
@@ -288,9 +376,28 @@
//处理条款
batchSaveCaluse(sysDept.getDeptId(), dept.getCompanyId(), dept.getCaluseVO1List());
+ List<Long> childDeptIds = dept.getChildDeptIds();
+ bacthInsertManager(sysDept.getDeptId(), childDeptIds, dept.getCompanyId());
}
return sysDept.getDeptId().byteValue();
+ }
+
+ private void bacthInsertManager(Long deptId, List<Long> managerIds,Long companyId) {
+ deptMapper.deleteMangeBatch(deptId);
+ if (managerIds != null && !managerIds.isEmpty())
+ {
+ List<SysDeptManage> sysDeptManagers = new ArrayList<>();
+ for (Long managerId : managerIds)
+ {
+ SysDeptManage sysDeptManage = new SysDeptManage();
+ sysDeptManage.setDeptId(deptId);
+ sysDeptManage.setSubDeptId(managerId);
+ sysDeptManage.setCompanyId(companyId);
+ sysDeptManagers.add(sysDeptManage);
+ }
+ deptMapper.insetMangeBatch(sysDeptManagers);
+ }
}
@Override
@@ -325,9 +432,7 @@
@Override
public List<SysFunctionalDistribution> getFunctionalDistributionList(Long companyId) {
- if (companyId != null){
- companyId = SecurityUtils.getCompanyId();
- }
+
return sysFunctionalDistributionMapper.selectListVo(companyId);
}
@@ -342,6 +447,7 @@
sysFunctionalDistributionMapper.delByCompanyId(companyId);
SysDept sysDept = new SysDept();
sysDept.setCompanyId(companyId);
+ sysDept.setResponsType("1");
List<DeptVo> deptVos = deptMapper.selectDeptList(sysDept);
if (deptVos != null && !deptVos.isEmpty()){
List<SysFunctionalDistribution> sysFunctionalDistributions = new ArrayList<>();
@@ -383,9 +489,7 @@
}
}
int i = sysFunctionalDistributionMapper.batchUpdate(list);
- if (i < 1){
- throw new ApiException("保存失败！");
- }
+
return 1;
}
--
Gitblit v1.9.2