From 1b5a723592ea63e5eec0bdeef7855b9c40e9df71 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 03 七月 2025 17:46:35 +0800
Subject: [PATCH] art:三保-设计修改
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/impl/EamBaseRepairDepartImpl.java | 84 +++++++++++++++++++++---------------------
1 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/lxzn-module-eam/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
similarity index 90%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/service/impl/EamBaseRepairDepartImpl.java
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/impl/EamBaseRepairDepartImpl.java
index 5265d23..6df251a 100644
--- a/lxzn-module-eam/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
@@ -13,11 +13,11 @@
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;
import org.jeecg.modules.eam.base.util.FindsRepairDepartsChildrenUtil;
+import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.mapper.SysUserMapper;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
@@ -124,7 +124,7 @@
String parentId = eamBaseRepairDepart.getParentId();
JSONObject formData = new JSONObject();
formData.put("parentId",parentId);
- String[] codeArray = (String[]) FillRuleUtil.executeRule(FillRuleConstant.PRODUCTION,formData);
+ String[] codeArray = (String[]) FillRuleUtil.executeRule(FillRuleConstant.REPAIRDEPART,formData);
eamBaseRepairDepart.setOrgCode(codeArray[0]);
String orgType = codeArray[1];
eamBaseRepairDepart.setOrgType(String.valueOf(orgType));
@@ -181,14 +181,14 @@
// 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<EamBaseRepairDepart> queryRepDepByPid(String pid) {
+// return this.baseMapper.queryRepDepByPid(pid);
+// }
+//
/**
* 鏍规嵁鐢ㄦ埛id鑾峰彇缁翠慨閮ㄩ棬鐝粍涓嬫媺鏍戦�夐」
*/
@@ -209,38 +209,38 @@
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<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
--
Gitblit v1.9.3