From 9f6292334cf2634772b8ef147255f8d207fde15f Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 02 四月 2025 14:30:30 +0800
Subject: [PATCH] 标准库功能修改备份开发
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
index 6ae6729..9c8951e 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
@@ -202,7 +202,7 @@
}).collect(Collectors.toList());
List<BasicTreeDto> factoryList = new ArrayList<>();
factoryList.add(new BasicTreeDto(BasicTreeEnums.FACTORY_TYPE.getCode(),"涓ぉ绉戞妧","1",laboratoryTreeDtoList));
- return laboratoryTreeDtoList;
+ return factoryList;
}
@@ -266,7 +266,7 @@
for (Model model : modelList) {
BasicTreeDto basicTreeDto = new BasicTreeDto();
basicTreeDto.setLevel(BasicTreeEnums.MODEL_TYPE.getCode());
- basicTreeDto.setValue(String.valueOf(model.getId()));
+ basicTreeDto.setValue(model.getModelName());
basicTreeDto.setLabel(model.getModelName());
basicTreeDto.setChildren(null);
if(model.getProductId() != null) {
@@ -293,7 +293,7 @@
Product::getObjectId,
Collectors.mapping(product -> {
BasicTreeDto basicTreeDto = new BasicTreeDto();
- basicTreeDto.setValue(String.valueOf(product.getId()));
+ basicTreeDto.setValue(product.getName());
basicTreeDto.setLabel(product.getName());
basicTreeDto.setLevel(BasicTreeEnums.PRODUCT_TYPE.getCode());
basicTreeDto.setChildren(productModelMap.get(product.getId()));
@@ -303,8 +303,9 @@
// 瀵规娴嬪璞″厛鎸夌収瀹為獙瀹ゅ湪鎸夌収妫�鏌ュ璞＄被鍒垎绫�
List<BasicTreeDto> testProjectBasicTreeList = structureTestObjectList.stream().map(structureTestObject -> {
BasicTreeDto basicTreeDto = new BasicTreeDto();
- basicTreeDto.setValue(String.valueOf(structureTestObject.getId()));
+ basicTreeDto.setValue(structureTestObject.getSpecimenName());
basicTreeDto.setLabel(structureTestObject.getSpecimenName());
+ basicTreeDto.setLevel(BasicTreeEnums.STRUCTURE_TEST_OBJECT_TYPE.getCode());
List<BasicTreeDto> children = new ArrayList<>();
if (!CollectionUtils.isEmpty(productMap.get(structureTestObject.getId()))) {
children.addAll(productMap.get(structureTestObject.getId()));
--
Gitblit v1.9.3