From a3fa685014ca577779c47aa540a7735ae58fb30d Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期一, 26 五月 2025 11:49:18 +0800
Subject: [PATCH] 工具入库申请功能
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsClassifyServiceImpl.java | 54 ++++++++++++++++++++----------------------------------
1 files changed, 20 insertions(+), 34 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsClassifyServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsClassifyServiceImpl.java
index 8cabb60..d19e690 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsClassifyServiceImpl.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsClassifyServiceImpl.java
@@ -78,7 +78,7 @@
return this.baseMapper.queryPageList(page, queryWrapper);
}
public List<CommonGenericTree> loadTree() {
- List<ToolsClassify> toolsClassifyList = this.list();
+ List<ToolsClassify> toolsClassifyList = this.lambdaQuery().orderByAsc(ToolsClassify::getId).list();
List<CommonGenericTree> commonGenericTreeList = loadTree(toolsClassifyList);
return commonGenericTreeList;
}
@@ -88,20 +88,15 @@
List<CommonGenericTree> list = new ArrayList<>();
Map<String, CommonGenericTree> map = new HashMap<>();
CommonGenericTree<ToolsClassify> node = new CommonGenericTree<>();
- node.setKey("-1");
- node.setTitle("宸ュ叿鍒嗙被");
- node.setRField1("");
- node.setRField2("");
- node.setEntity(new ToolsClassify().setId("-1").setClassifyId("0").setTypeName("宸ュ叿鍒嗙被").setLeafFlag("2"));
- list.add(node);
if (CollectionUtils.isNotEmpty(toolsClassifyList)) {
CommonGenericTree<ToolsClassify> tcNode;
+ CommonGenericTree<ToolsClassify> childNode;
for (ToolsClassify tc : toolsClassifyList) {
- if (StrUtils.isBlankOrNull(tc.getParentId()) || tc.getParentId().equals("-1")) {
+ ToolsClassify child = tc;
+ if (StrUtils.isBlankOrNull(tc.getParentId())) {
tcNode = new CommonGenericTree<>();
tcNode.setKey(tc.getId());
tcNode.setTitle(tc.getClassifyId() + "/" + tc.getTypeName());
- tcNode.setParentId(node.getKey());
tcNode.setIcon("");
tcNode.setType(1);
tcNode.setValue(tc.getId());
@@ -109,32 +104,23 @@
tcNode.setRField1(tc.getClassifyId());
tcNode.setRField2(getBaseParent(tc.getId(), 0).getClassifyId());
tcNode.setEntity(tc);
- node.addChildren(tcNode);
+ list.add(tcNode);
map.put(tc.getId(), tcNode);
- }
- }
- CommonGenericTree<ToolsClassify> childNode;
- for (ToolsClassify tc : toolsClassifyList) {
- ToolsClassify child = tc;
- if (map.containsKey(child.getParentId())) {
- if (StrUtils.isBlankOrNull(tc.getParentId()) || tc.getParentId().equals("-1")) {
- toolsClassify = tc;
- } else {
- tcNode = map.get(child.getParentId());
- childNode = new CommonGenericTree<>();
- childNode.setKey(tc.getId());
- childNode.setTitle(tc.getClassifyId() + "/" + tc.getTypeName());
- childNode.setParentId(tc.getParentId());
- childNode.setIcon("");
- childNode.setType(0);
- childNode.setValue(tc.getId());
- childNode.setDisabled(CommonConstant.STATUS_0.equals(tc.getStatus()) ? true : false);
- childNode.setRField1(tc.getClassifyId());
- childNode.setRField2(getBaseParent(tc.getId(), 0).getClassifyId());
- childNode.setEntity(tc);
- tcNode.addChildren(childNode);
- map.put(child.getId(), childNode);
- }
+ } else {
+ tcNode = map.get(child.getParentId());
+ childNode = new CommonGenericTree<>();
+ childNode.setKey(tc.getId());
+ childNode.setTitle(tc.getClassifyId() + "/" + tc.getTypeName());
+ childNode.setParentId(tc.getParentId());
+ childNode.setIcon("");
+ childNode.setType(0);
+ childNode.setValue(tc.getId());
+ childNode.setDisabled(CommonConstant.STATUS_0.equals(tc.getStatus()) ? true : false);
+ childNode.setRField1(tc.getClassifyId());
+ childNode.setRField2(getBaseParent(tc.getId(), 0).getClassifyId());
+ childNode.setEntity(tc);
+ tcNode.addChildren(childNode);
+ map.put(child.getId(), childNode);
}
}
}
--
Gitblit v1.9.3