From 9253cb6be1350140769b290db640c517c0c1dbbc Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 03 七月 2025 15:07:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/impl/EamBaseRepairDepartImpl.java | 235 ++++++++++++++++++++++++++++------------------------------
1 files changed, 114 insertions(+), 121 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/impl/EamBaseRepairDepartImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/impl/EamBaseRepairDepartImpl.java
index 248dce6..38a4fe4 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/impl/EamBaseRepairDepartImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/impl/EamBaseRepairDepartImpl.java
@@ -10,10 +10,7 @@
import org.jeecg.common.util.FillRuleUtil;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.base.entity.EamBaseRepairDepart;
-import org.jeecg.modules.eam.base.entity.EamBaseRepairDepartUser;
-import org.jeecg.modules.eam.base.mapper.EamBaseRepairDepartUserMapper;
import org.jeecg.modules.eam.base.service.IEamBaseRepairDepartService;
-import org.jeecg.modules.system.entity.*;
import org.jeecg.modules.eam.base.mapper.EamBaseRepairDepartMapper;
import org.jeecg.modules.eam.base.model.EamBaseRepairDepartTreeModel;
import org.jeecg.modules.eam.base.model.RepairDepartIdModel;
@@ -25,7 +22,6 @@
import javax.annotation.Resource;
import java.util.*;
-import java.util.stream.Collectors;
/**
* @Author: Lius
@@ -38,9 +34,6 @@
@Resource
private SysUserMapper sysUserMapper;
- @Resource
- private EamBaseRepairDepartUserMapper repairDepartUserMapper;
-
/**
* queryTreeList 瀵瑰簲 queryTreeList 鏌ヨ鎵�鏈夌殑缁翠慨閮ㄩ棬鐝粍鏁版嵁,浠ユ爲缁撴瀯褰㈠紡鍝嶅簲缁欏墠绔�
*/
@@ -52,7 +45,7 @@
query.orderByAsc(EamBaseRepairDepart::getDepartOrder);
List<EamBaseRepairDepart> list = this.list(query);
//璁剧疆鐢ㄦ埛id锛岃鍓嶅彴鏄剧ず
- this.setUserIdsByProList(list);
+// this.setUserIdsByProList(list);
//璋冪敤wrapTreeDataToTreeList鏂规硶鐢熸垚鏍戠姸鏁版嵁
return FindsRepairDepartsChildrenUtil.wrapTreeDataToTreeList(list);
}
@@ -157,7 +150,7 @@
this.checkChildrenExists(id, idList);
boolean result = this.removeByIds(idList);
//鏍规嵁缁翠慨閮ㄩ棬鐝粍id鍒犻櫎鐢ㄦ埛涓庣淮淇儴闂ㄧ彮缁勫叧绯�
- repairDepartUserMapper.delete(new LambdaQueryWrapper<EamBaseRepairDepartUser>().in(EamBaseRepairDepartUser::getDepartId, idList));
+// repairDepartUserMapper.delete(new LambdaQueryWrapper<EamBaseRepairDepartUser>().in(EamBaseRepairDepartUser::getDepartId, idList));
//鏍规嵁缁翠慨閮ㄩ棬鐝粍id鍒犻櫎缁翠慨閮ㄩ棬鐝粍涓庤澶囧叧绯�
// repairDepartEquipmentMapper.delete(new LambdaQueryWrapper<SysMaintainDepartEquipment>().in(SysMaintainDepartEquipment::getMaintainDepartId, idList));
return result;
@@ -176,71 +169,71 @@
}
this.removeByIds(idList);
//鏍规嵁缁翠慨閮ㄩ棬鐝粍id鍒犻櫎鐢ㄦ埛涓庣淮淇儴闂ㄧ彮缁勫叧绯�
- repairDepartUserMapper.delete(new LambdaQueryWrapper<EamBaseRepairDepartUser>().in(EamBaseRepairDepartUser::getDepartId, idList));
+// repairDepartUserMapper.delete(new LambdaQueryWrapper<EamBaseRepairDepartUser>().in(EamBaseRepairDepartUser::getDepartId, idList));
//鏍规嵁缁翠慨閮ㄩ棬鐝粍id鍒犻櫎缁翠慨閮ㄩ棬鐝粍涓庤澶囧叧绯�
// repairDepartEquipmentMapper.delete(new LambdaQueryWrapper<SysMaintainDepartEquipment>().in(SysMaintainDepartEquipment::getMaintainDepartId, idList));
}
- /**
- * 鏍规嵁id鏌ヨ涓嬬骇缁翠慨閮ㄩ棬鐝粍
- */
- @Override
- public List<EamBaseRepairDepart> queryRepDepByPid(String pid) {
- return this.baseMapper.queryRepDepByPid(pid);
- }
-
- /**
- * 鏍规嵁鐢ㄦ埛id鑾峰彇缁翠慨閮ㄩ棬鐝粍涓嬫媺鏍戦�夐」
- */
- @Override
- public List<RepairDepartIdModel> loadMaintainDepartTreeOptions(String userId) {
- //鑾峰彇鎵�鏈夌淮淇儴闂ㄧ彮缁勬暟鎹�
- List<EamBaseRepairDepart> repairDepartList = this.baseMapper.selectList(new LambdaQueryWrapper<EamBaseRepairDepart>().eq(EamBaseRepairDepart::getDelFlag, CommonConstant.DEL_FLAG_0.toString()).orderByAsc(EamBaseRepairDepart::getDepartOrder));
- //鏍规嵁鐢ㄦ埛id鑾峰彇鎷ユ湁鐨勭淮淇儴闂ㄧ彮缁勪俊鎭泦鍚�
- List<String> repairDepartIds = repairDepartUserMapper.queryRepairDepartIdsByUserId(userId);
- List<String> allMaintainDepartIds = new ArrayList<>();
- //鎵惧埌鎵�鏈夌淮淇儴闂ㄧ彮缁刬d鐨勪笂绾d
- if (repairDepartIds != null && !repairDepartIds.isEmpty()) {
- for (String repairDepartId : repairDepartIds) {
- this.getAllMaintainDepartIds(repairDepartList, repairDepartId, allMaintainDepartIds);
- }
- }
- //杩囨护缁翠慨閮ㄩ棬鐝粍鏁版嵁
- List<EamBaseRepairDepart> list = repairDepartList.stream().filter((EamBaseRepairDepart eamBaseRepairDepart) -> allMaintainDepartIds.contains(eamBaseRepairDepart.getId())).collect(Collectors.toList());
- return FindsRepairDepartsChildrenUtil.wrapTreeDataToMaintainDepartIdTreeList(list);
- }
-
- /**
- * 閫掑綊鏌ヨ鎵�鏈夊瓙鑺傜偣id
- */
- @Override
- public List<String> recursionChildren(String repairDepartId) {
- return this.baseMapper.recursionChildren(repairDepartId);
- }
-
- /**
- * 鏍规嵁鐢ㄦ埛id鍜岃溅闂磇d鑾峰彇鐢ㄦ埛鎷ユ湁鐨勮溅闂磇d
- * @param userId
- * @param repairDepartId
- * @return
- */
- @Override
- public String findFirstMaintainDepart(String userId, String repairDepartId) {
- return this.baseMapper.findFirstMaintain(userId, repairDepartId);
- }
-
- /**
- * 鏍规嵁鐢ㄦ埛id鏌ヨ鐢ㄦ埛缁翠慨閮ㄩ棬鐝粍鏉冮檺
- */
- @Override
- public String findThreeMaintainDepartId(String userId) {
- return this.baseMapper.findThreeMaintainId(userId);
- }
-
- @Override
- public EamBaseRepairDepart findMaintainDepartList(String equipmentId) {
- return this.baseMapper.findMaintainList(equipmentId);
- }
+// /**
+// * 鏍规嵁id鏌ヨ涓嬬骇缁翠慨閮ㄩ棬鐝粍
+// */
+// @Override
+// public List<EamBaseRepairDepart> queryRepDepByPid(String pid) {
+// return this.baseMapper.queryRepDepByPid(pid);
+// }
+//
+// /**
+// * 鏍规嵁鐢ㄦ埛id鑾峰彇缁翠慨閮ㄩ棬鐝粍涓嬫媺鏍戦�夐」
+// */
+// @Override
+// public List<RepairDepartIdModel> loadMaintainDepartTreeOptions(String userId) {
+// //鑾峰彇鎵�鏈夌淮淇儴闂ㄧ彮缁勬暟鎹�
+// List<EamBaseRepairDepart> repairDepartList = this.baseMapper.selectList(new LambdaQueryWrapper<EamBaseRepairDepart>().eq(EamBaseRepairDepart::getDelFlag, CommonConstant.DEL_FLAG_0.toString()).orderByAsc(EamBaseRepairDepart::getDepartOrder));
+// //鏍规嵁鐢ㄦ埛id鑾峰彇鎷ユ湁鐨勭淮淇儴闂ㄧ彮缁勪俊鎭泦鍚�
+// List<String> repairDepartIds = repairDepartUserMapper.queryRepairDepartIdsByUserId(userId);
+// List<String> allMaintainDepartIds = new ArrayList<>();
+// //鎵惧埌鎵�鏈夌淮淇儴闂ㄧ彮缁刬d鐨勪笂绾d
+// if (repairDepartIds != null && !repairDepartIds.isEmpty()) {
+// for (String repairDepartId : repairDepartIds) {
+// this.getAllMaintainDepartIds(repairDepartList, repairDepartId, allMaintainDepartIds);
+// }
+// }
+// //杩囨护缁翠慨閮ㄩ棬鐝粍鏁版嵁
+// List<EamBaseRepairDepart> list = repairDepartList.stream().filter((EamBaseRepairDepart eamBaseRepairDepart) -> allMaintainDepartIds.contains(eamBaseRepairDepart.getId())).collect(Collectors.toList());
+// return FindsRepairDepartsChildrenUtil.wrapTreeDataToMaintainDepartIdTreeList(list);
+// }
+//
+// /**
+// * 閫掑綊鏌ヨ鎵�鏈夊瓙鑺傜偣id
+// */
+// @Override
+// public List<String> recursionChildren(String repairDepartId) {
+// return this.baseMapper.recursionChildren(repairDepartId);
+// }
+//
+// /**
+// * 鏍规嵁鐢ㄦ埛id鍜岃溅闂磇d鑾峰彇鐢ㄦ埛鎷ユ湁鐨勮溅闂磇d
+// * @param userId
+// * @param repairDepartId
+// * @return
+// */
+// @Override
+// public String findFirstMaintainDepart(String userId, String repairDepartId) {
+// return this.baseMapper.findFirstMaintain(userId, repairDepartId);
+// }
+//
+// /**
+// * 鏍规嵁鐢ㄦ埛id鏌ヨ鐢ㄦ埛缁翠慨閮ㄩ棬鐝粍鏉冮檺
+// */
+// @Override
+// public String findThreeMaintainDepartId(String userId) {
+// return this.baseMapper.findThreeMaintainId(userId);
+// }
+//
+// @Override
+// public EamBaseRepairDepart findMaintainDepartList(String equipmentId) {
+// return this.baseMapper.findMaintainList(equipmentId);
+// }
/**
* delete 鏂规硶璋冪敤 閫掑綊鏌ユ壘瀛愰泦id
@@ -257,56 +250,56 @@
}
}
- /**
- * 鑾峰彇鎵�鏈夌殑缁翠慨閮ㄩ棬鐝粍id锛堝寘鍚墍鏈変笂绾э級
- */
- private void getAllMaintainDepartIds(List<EamBaseRepairDepart> repairDepartList, String repairDepartId, List<String> allMaintainDepartIds) {
- if (!allMaintainDepartIds.contains(repairDepartId)) {
- allMaintainDepartIds.add(repairDepartId);
- }
- for (EamBaseRepairDepart eamBaseRepairDepart : repairDepartList) {
- if (StringUtils.isEmpty(eamBaseRepairDepart.getParentId())) {
- continue;
- }
- if (repairDepartId.equals(eamBaseRepairDepart.getId())) {
- if (!allMaintainDepartIds.contains(eamBaseRepairDepart.getParentId())) {
- allMaintainDepartIds.add(eamBaseRepairDepart.getParentId());
- getAllMaintainDepartIds(repairDepartList, eamBaseRepairDepart.getParentId(), allMaintainDepartIds);
- }
- }
- }
- }
-
- /**
- * 閫氳繃缁翠慨閮ㄩ棬鐝粍闆嗗悎涓虹淮淇儴闂ㄧ彮缁勮缃敤鎴穒d锛岀敤浜庡墠鍙板睍绀�
- */
- private void setUserIdsByProList(List<EamBaseRepairDepart> repairDepartList) {
- //鏌ヨ璐熻矗閮ㄩ棬涓嶄负绌虹殑鎯呭喌
- LambdaQueryWrapper<SysUser> query = new LambdaQueryWrapper<>();
- query.isNotNull(SysUser::getDepartIds);
- List<SysUser> users = sysUserMapper.selectList(query);
- Map<String, Object> map = new HashMap(5);
- //鍏堝惊鐜竴閬嶆壘鍒颁笉鍚岀殑璐熻矗缁翠慨閮ㄩ棬鐝粍id
- for (SysUser user : users) {
- String repairDepartIds = user.getRepairDepartIds();
- if (StringUtils.isNotBlank(repairDepartIds)) {
- String[] repairDepartIdArray = repairDepartIds.split(",");
- for (String repairDepartId : repairDepartIdArray) {
- if (map.containsKey(repairDepartId)) {
- String userIds = map.get(repairDepartId) + "," + user.getId();
- map.put(repairDepartId, userIds);
- } else {
- map.put(repairDepartId, user.getId());
- }
- }
- }
- }
- //寰幆缁翠慨閮ㄩ棬鐝粍闆嗗悎鎵惧埌缁翠慨閮ㄩ棬鐝粍id瀵瑰簲鐨勮礋璐ｇ敤鎴�
- for (EamBaseRepairDepart eamBaseRepairDepart : repairDepartList) {
- if (map.containsKey(eamBaseRepairDepart.getId())) {
- eamBaseRepairDepart.setDirectorUserIds(map.get(eamBaseRepairDepart.getId()).toString());
- }
- }
- }
+// /**
+// * 鑾峰彇鎵�鏈夌殑缁翠慨閮ㄩ棬鐝粍id锛堝寘鍚墍鏈変笂绾э級
+// */
+// private void getAllMaintainDepartIds(List<EamBaseRepairDepart> repairDepartList, String repairDepartId, List<String> allMaintainDepartIds) {
+// if (!allMaintainDepartIds.contains(repairDepartId)) {
+// allMaintainDepartIds.add(repairDepartId);
+// }
+// for (EamBaseRepairDepart eamBaseRepairDepart : repairDepartList) {
+// if (StringUtils.isEmpty(eamBaseRepairDepart.getParentId())) {
+// continue;
+// }
+// if (repairDepartId.equals(eamBaseRepairDepart.getId())) {
+// if (!allMaintainDepartIds.contains(eamBaseRepairDepart.getParentId())) {
+// allMaintainDepartIds.add(eamBaseRepairDepart.getParentId());
+// getAllMaintainDepartIds(repairDepartList, eamBaseRepairDepart.getParentId(), allMaintainDepartIds);
+// }
+// }
+// }
+// }
+//
+// /**
+// * 閫氳繃缁翠慨閮ㄩ棬鐝粍闆嗗悎涓虹淮淇儴闂ㄧ彮缁勮缃敤鎴穒d锛岀敤浜庡墠鍙板睍绀�
+// */
+// private void setUserIdsByProList(List<EamBaseRepairDepart> repairDepartList) {
+// //鏌ヨ璐熻矗閮ㄩ棬涓嶄负绌虹殑鎯呭喌
+// LambdaQueryWrapper<SysUser> query = new LambdaQueryWrapper<>();
+// query.isNotNull(SysUser::getDepartIds);
+// List<SysUser> users = sysUserMapper.selectList(query);
+// Map<String, Object> map = new HashMap(5);
+// //鍏堝惊鐜竴閬嶆壘鍒颁笉鍚岀殑璐熻矗缁翠慨閮ㄩ棬鐝粍id
+// for (SysUser user : users) {
+// String repairDepartIds = user.getRepairDepartIds();
+// if (StringUtils.isNotBlank(repairDepartIds)) {
+// String[] repairDepartIdArray = repairDepartIds.split(",");
+// for (String repairDepartId : repairDepartIdArray) {
+// if (map.containsKey(repairDepartId)) {
+// String userIds = map.get(repairDepartId) + "," + user.getId();
+// map.put(repairDepartId, userIds);
+// } else {
+// map.put(repairDepartId, user.getId());
+// }
+// }
+// }
+// }
+// //寰幆缁翠慨閮ㄩ棬鐝粍闆嗗悎鎵惧埌缁翠慨閮ㄩ棬鐝粍id瀵瑰簲鐨勮礋璐ｇ敤鎴�
+// for (EamBaseRepairDepart eamBaseRepairDepart : repairDepartList) {
+// if (map.containsKey(eamBaseRepairDepart.getId())) {
+// eamBaseRepairDepart.setDirectorUserIds(map.get(eamBaseRepairDepart.getId()).toString());
+// }
+// }
+// }
}
--
Gitblit v1.9.3