From 3e7f9420dded0969e2f96560a78de7b215551813 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 01 四月 2025 16:55:25 +0800
Subject: [PATCH] 可靠性计划产品型号,零件号选择

---
 basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 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 6c18db1..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
@@ -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