From d4c5f8e7bf9b2bb48922396d1be5b2f274d8effb Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 08 七月 2025 16:43:21 +0800
Subject: [PATCH] 修改
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/FindsBaseFactorysChildrenUtil.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/util/FindsBaseFactorysChildrenUtil.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/FindsBaseFactorysChildrenUtil.java
similarity index 77%
rename from lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/util/FindsBaseFactorysChildrenUtil.java
rename to lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/FindsBaseFactorysChildrenUtil.java
index 3b812f2..4221a0b 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/util/FindsBaseFactorysChildrenUtil.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/FindsBaseFactorysChildrenUtil.java
@@ -1,10 +1,10 @@
-package org.jeecg.modules.eam.base.util;
+package org.jeecg.modules.system.util;
import cn.hutool.core.util.StrUtil;
import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.eam.base.entity.BaseFactory;
-import org.jeecg.modules.eam.base.model.EamBaseFactoryTreeModel;
-import org.jeecg.modules.eam.base.model.WorkShopIdModel;
+import org.jeecg.modules.system.entity.BaseFactory;
+import org.jeecg.modules.system.model.EamBaseFactoryIdModel;
+import org.jeecg.modules.system.model.EamBaseFactoryTreeModel;
import java.util.ArrayList;
import java.util.List;
@@ -22,7 +22,7 @@
* 璇ユ柟娉曟槸s灏咮aseFactory绫诲瀷鐨刲ist闆嗗悎杞崲鎴怑amBaseFactoryTreeModel绫诲瀷鐨勯泦鍚�
*/
public static List<EamBaseFactoryTreeModel> wrapTreeDataToTreeList(List<BaseFactory> recordList) {
- List<WorkShopIdModel> idList = new ArrayList<>();
+ List<EamBaseFactoryIdModel> idList = new ArrayList<>();
List<EamBaseFactoryTreeModel> records = new ArrayList<>();
for (int i = 0; i < recordList.size(); i++) {
BaseFactory BaseFactory = recordList.get(i);
@@ -40,17 +40,17 @@
* queryTreeList鐨勫瓙鏂规硶 ====1=====
* 璇ユ柟娉曟槸鎵惧埌骞跺皝瑁呴《绾х埗绫荤殑鑺傜偣鍒癟reeList闆嗗悎
*/
- public static List<EamBaseFactoryTreeModel> findChildren(List<EamBaseFactoryTreeModel> recordList, List<WorkShopIdModel> workShopIdModelList) {
+ public static List<EamBaseFactoryTreeModel> findChildren(List<EamBaseFactoryTreeModel> recordList, List<EamBaseFactoryIdModel> EamBaseFactoryIdModelList) {
List<EamBaseFactoryTreeModel> treeList = new ArrayList<>();
for (int i = 0; i < recordList.size(); i++) {
EamBaseFactoryTreeModel branch = recordList.get(i);
if (oConvertUtils.isEmpty(branch.getParentId())) {
treeList.add(branch);
- WorkShopIdModel WorkShopIdModel = new WorkShopIdModel().convert(branch);
- workShopIdModelList.add(WorkShopIdModel);
+ EamBaseFactoryIdModel EamBaseFactoryIdModel = new EamBaseFactoryIdModel().convert(branch);
+ EamBaseFactoryIdModelList.add(EamBaseFactoryIdModel);
}
}
- getGrandChildren(treeList, recordList, workShopIdModelList);
+ getGrandChildren(treeList, recordList, EamBaseFactoryIdModelList);
return treeList;
}
@@ -58,15 +58,15 @@
* queryTreeList鐨勫瓙鏂规硶====3====
*璇ユ柟娉曟槸鎵惧埌椤剁骇鐖剁被涓嬬殑鎵�鏈夊瓙鑺傜偣闆嗗悎骞跺皝瑁呭埌TreeList闆嗗悎
*/
- private static void getGrandChildren(List<EamBaseFactoryTreeModel> treeList, List<EamBaseFactoryTreeModel> recordList, List<WorkShopIdModel> idList) {
+ private static void getGrandChildren(List<EamBaseFactoryTreeModel> treeList, List<EamBaseFactoryTreeModel> recordList, List<EamBaseFactoryIdModel> idList) {
for (int i = 0; i < treeList.size(); i++) {
EamBaseFactoryTreeModel model = treeList.get(i);
- WorkShopIdModel idModel = idList.get(i);
+ EamBaseFactoryIdModel idModel = idList.get(i);
for (int i1 = 0; i1 < recordList.size(); i1++) {
EamBaseFactoryTreeModel m = recordList.get(i1);
if (m.getParentId() != null && m.getParentId().equals(model.getId())) {
model.getChildren().add(m);
- WorkShopIdModel pim = new WorkShopIdModel().convert(m);
+ EamBaseFactoryIdModel pim = new EamBaseFactoryIdModel().convert(m);
idModel.setSelectable(false);
idModel.getChildren().add(pim);
}
@@ -95,8 +95,8 @@
/**
* 鑾峰彇 DepartIdModel
*/
- public static List<WorkShopIdModel> wrapTreeDataToProductionIdTreeList(List<BaseFactory> recordList) {
- List<WorkShopIdModel> idList = new ArrayList<>();
+ public static List<EamBaseFactoryIdModel> wrapTreeDataToProductionIdTreeList(List<BaseFactory> recordList) {
+ List<EamBaseFactoryIdModel> idList = new ArrayList<>();
List<EamBaseFactoryTreeModel> records = new ArrayList<>();
for (int i = 0; i < recordList.size(); i++) {
BaseFactory BaseFactory = recordList.get(i);
--
Gitblit v1.9.3