From 3cc8d1cc3662d88fe7f3666fb1f99e1b19411424 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期一, 14 七月 2025 16:59:58 +0800
Subject: [PATCH] 新功能加问题修复
---
multi-system/src/main/java/com/gkhy/exam/system/service/impl/SysDeptServiceImpl.java | 209 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 144 insertions(+), 65 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 51fef94..ef9123e 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,21 +6,23 @@
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.SysFunctionalRemark;
+import com.gkhy.exam.system.domain.req.SysDeptPageReq;
import com.gkhy.exam.system.domain.vo.*;
-import com.gkhy.exam.system.mapper.SysDeptMapper;
-import com.gkhy.exam.system.mapper.SysDeptResponsibilityMapper;
-import com.gkhy.exam.system.mapper.SysFunctionalDistributionMapper;
-import com.gkhy.exam.system.mapper.SysRoleMapper;
+import com.gkhy.exam.system.mapper.*;
import com.gkhy.exam.system.service.ISysDeptService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -51,10 +53,36 @@
@Autowired
private SysFunctionalDistributionMapper sysFunctionalDistributionMapper;
+
+ @Autowired
+ private SysFunctionalRemarkMapper sysFunctionalRemarkMapper;
+
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.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(SysDeptPageReq req) {
+
+ PageUtils.startPage();
+
+ List<DeptVo> deptVos = deptMapper.selectDeptPageList(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()));
+ }
+
+ }
+ }
+
+ CommonPage<DeptVo> deptVoCommonPage = CommonPage.restPage(deptVos);
+ return deptVoCommonPage;
+
+ }
+
/**
* 查询部门管理数据
*
@@ -68,7 +96,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
@@ -83,56 +121,17 @@
* @return 部门树信息集合
*/
@Override
- public List<SysDept> selectDeptTreeList(SysDept dept)
+ public List<TreeSelect> selectDeptTreeList(SysDept dept)
{
List<SysDept> depts = SpringUtils.getAopProxy(this).getOutDeptList(dept);
- 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);
+ return buildDeptTreeSelect(depts);
}
- 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;
+ @Override
+ public List<SysDept> getParentInfo(Long deptId) {
+ return deptMapper.getParentInfo(deptId);
}
-
- 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);
- }
-
/**
* 构建前端所需要树结构
@@ -204,6 +203,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 ;
@@ -307,7 +309,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor = RuntimeException.class)
public int saveDept(SysDeptSaveDTOReq dept) {
// Long companyId = SecurityUtils.getCompanyId();
// if (!companyId.equals(dept.getCompanyId())){
@@ -319,11 +321,29 @@
if (!b){
throw new ApiException("部门名称已存在！");
}
+ SysDept newParentDept = deptMapper.selectDeptById(dept.getParentId());
+
int i = 0;
if (sysDept.getDeptId() == null){
+ if (ObjectUtil.isNotNull(newParentDept)){
+ String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getDeptId();
+ dept.setAncestors(newAncestors);
+ }
sysDept.setCreateBy(SecurityUtils.getUsername());
i = deptMapper.insertDept(sysDept);
}else {
+ if (sysDept.getParentId().equals(sysDept.getDeptId())){
+ throw new ApiException("上级部门不能是自己！");
+ }
+
+ SysDept oldDept = deptMapper.selectDeptById(dept.getDeptId());
+ if (ObjectUtil.isNotNull(newParentDept) && ObjectUtil.isNotNull(oldDept))
+ {
+ String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getDeptId();
+ String oldAncestors = oldDept.getAncestors();
+ dept.setAncestors(newAncestors);
+ updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors);
+ }
sysDept.setUpdateBy(SecurityUtils.getUsername());
sysDept.setUpdateTime(LocalDateTime.now());
i = deptMapper.updateDept(sysDept);
@@ -337,8 +357,6 @@
//处理条款
batchSaveCaluse(sysDept.getDeptId(), dept.getCompanyId(), dept.getCaluseVO1List());
- List<Long> childDeptIds = dept.getChildDeptIds();
- bacthInsertManager(sysDept.getDeptId(), childDeptIds, dept.getCompanyId());
}
return sysDept.getDeptId().byteValue();
@@ -362,7 +380,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor = RuntimeException.class)
public int saveDeptResponsibility(SysDeptResponsibilityReqVo reqVo) {
// Long companyId = SecurityUtils.getCompanyId();
// if (!companyId.equals(reqVo.getCompanyId())){
@@ -398,21 +416,32 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor = RuntimeException.class)
public int initFunctionalDistribution(Long companyId) {
-// if (!companyId.equals(SecurityUtils.getCompanyId())){
-// throw new ApiException("无权操作！");
-// }
-
sysFunctionalDistributionMapper.delByCompanyId(companyId);
+ sysFunctionalRemarkMapper.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<>();
+ Map<String, CaluseVO1> clauseNumMap = new HashMap<>();
+ Map<String, Integer> clauseNumSetNum = new HashMap<>();
+ Set<String> clauseNumSet = new HashSet<>();
for (DeptVo deptVo : deptVos) {
+ List<CaluseVO1> caluseVO1List = deptVo.getCaluseVO1List();
+ if (ObjectUtil.isNotEmpty(caluseVO1List)){
+ // 转成 Map<String, CaluseVO1>，key 是 clauseNum
+ clauseNumMap = caluseVO1List.stream()
+ .collect(Collectors.toMap(
+ CaluseVO1::getClauseNum, // key
+ Function.identity(), // value
+ (existing, replacement) -> existing // 如果有重复 key，保留现有的值
+ ));
+ }
+ //加入职能
for (String s : DEPT_ROOT) {
SysFunctionalDistribution sysFunctionalDistribution = new SysFunctionalDistribution();
sysFunctionalDistribution.setDeptId(deptVo.getDeptId());
@@ -420,12 +449,42 @@
sysFunctionalDistribution.setCreateBy(SecurityUtils.getUsername());
sysFunctionalDistribution.setCreateTime(LocalDateTime.now());
sysFunctionalDistribution.setClauseNum(s);
- sysFunctionalDistribution.setChooseLab(0);
+ if (clauseNumMap.isEmpty()){
+ sysFunctionalDistribution.setChooseLab(0);
+ }else if (clauseNumMap.containsKey(s)){
+ sysFunctionalDistribution.setChooseLab(1);
+ if (deptVo.getDeptType().equals("0")){
+ Integer i = clauseNumSetNum.get(s);
+ if (i == null){
+ i = 0;
+ clauseNumSetNum.put(s, ++i);
+ }else {
+ clauseNumSetNum.put(s, ++i);
+ clauseNumSet.add(s);
+ }
+ }
+ }else {
+ sysFunctionalDistribution.setChooseLab(0);
+ }
+
sysFunctionalDistributions.add(sysFunctionalDistribution);
}
}
int i = sysFunctionalDistributionMapper.batchInsert(sysFunctionalDistributions);
+ if (clauseNumSet.size() > 0){
+ List<SysFunctionalRemark> sysFunctionalRemarks = new ArrayList<>();
+ for (String clauseNum : clauseNumSet) {
+ SysFunctionalRemark sysFunctionalRemark = new SysFunctionalRemark();
+ sysFunctionalRemark.setCompanyId(companyId);
+ sysFunctionalRemark.setClauseNum(clauseNum);
+ sysFunctionalRemark.setRemark(" ");
+ sysFunctionalRemark.setCreateBy(SecurityUtils.getUsername());
+ sysFunctionalRemark.setCreateTime(LocalDateTime.now());
+ sysFunctionalRemarks.add(sysFunctionalRemark);
+ }
+ int j = sysFunctionalRemarkMapper.batchInsert(sysFunctionalRemarks);
+ }
if (i < 1){
throw new ApiException("初始化失败！");
}
@@ -435,6 +494,7 @@
}
@Override
+ @Transactional(rollbackFor = RuntimeException.class)
public int saveFunctionalDistribution(FunctionalDistributionVo reqVo) {
// Long companyId = SecurityUtils.getCompanyId();
// if (!companyId.equals(reqVo.getCompanyId())){
@@ -443,17 +503,36 @@
List<SysFunctionalDistribution> list = reqVo.getList();
if (list != null && !list.isEmpty())
{
- for (SysFunctionalDistribution sysFunctionalDistribution : list) {
- sysFunctionalDistribution.setCompanyId(reqVo.getCompanyId());
- sysFunctionalDistribution.setUpdateBy(SecurityUtils.getUsername());
- sysFunctionalDistribution.setUpdateTime(LocalDateTime.now());
- }
+ list.forEach(e ->{
+ e.setCompanyId(reqVo.getCompanyId());
+ e.setUpdateBy(SecurityUtils.getUsername());
+ e.setUpdateTime(LocalDateTime.now());
+ });
+ int i = sysFunctionalDistributionMapper.batchUpdate(list);
}
- int i = sysFunctionalDistributionMapper.batchUpdate(list);
+
+ List<SysFunctionalRemark> remarks = reqVo.getRemarks();
+ if (remarks != null && !remarks.isEmpty())
+ {
+ sysFunctionalRemarkMapper.delByCompanyId(reqVo.getCompanyId());
+
+ remarks.forEach(e ->{
+ e.setCompanyId(reqVo.getCompanyId());
+ e.setCreateBy(SecurityUtils.getUsername());
+ e.setCreateTime(LocalDateTime.now());
+ });
+
+ int i1 = sysFunctionalRemarkMapper.batchInsert(remarks);
+ }
return 1;
}
+ @Override
+ public List<SysFunctionalRemark> getFunctionalRemarkList(Long companyId) {
+ return sysFunctionalRemarkMapper.selectListVo(companyId);
+ }
+
private void batchSaveRespon(SysDeptResponsibilityReqVo reqVo) {
List<Long> delData = reqVo.getDelData();
--
Gitblit v1.9.2