From 46cbb47dcc47099b9a29e8006f14af63f678c7b0 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 24 四月 2026 11:25:44 +0800
Subject: [PATCH] 标准库：查看新增和更新人信息
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 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 51bd971..25921b1 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
@@ -19,12 +19,14 @@
import com.ruoyi.basic.service.StandardProductListService;
import com.ruoyi.basic.service.StandardTreeService;
import com.ruoyi.basic.service.StructureTestObjectService;
+import com.ruoyi.basic.vo.StandardTreeVO;
import com.ruoyi.common.exception.base.BaseException;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
import java.util.Map;
@@ -53,12 +55,9 @@
List<FactoryDto> factoryDtos = standardTreeMapper.selectStandardTreeList();
for (FactoryDto factoryDto : factoryDtos) {
for (LaboratoryDto laboratoryDto : factoryDto.getChildren()) {
- laboratoryDto.getChildren().sort((o1, o2) -> (o1.getSort() == null ? 0 : o1.getSort())
- - (o2.getSort() == null ? 0 : o2.getSort()));
+ laboratoryDto.getChildren().sort(Comparator.comparingInt(o -> (o.getSort() == null ? 0 : o.getSort())));
for (SampleTypeDto sampleTypeDto : laboratoryDto.getChildren()) {
-// if (sampleTypeDto.getChildren().size() == 0) {
sampleTypeDto.getChildren().addAll(standardTreeMapper.getStandardTree3(sampleTypeDto.getValue()));
-// }
}
}
}
@@ -184,18 +183,15 @@
}
// 淇敼鏍囧噯鏁版楠岄」鐩�
- LambdaUpdateWrapper<StandardTree> wrapper = Wrappers.<StandardTree>lambdaUpdate()
- .eq(StandardTree::getFactory, standardTree.getFactory())
- .eq(StandardTree::getLaboratory, standardTree.getLaboratory())
- .eq(StandardTree::getSampleType, standardTree.getSampleType())
- .eq(StandardTree::getModel, standardTree.getOldModel())
- .set(StandardTree::getModel, standardTree.getModel());
- if (StringUtils.isNotBlank(standardTree.getSample()) && !standardTree.getSample().equals("null")) {
- wrapper.eq(StandardTree::getSample, standardTree.getSample());
- } else {
- wrapper.isNull(StandardTree::getSample);
- }
- return standardTreeMapper.update(null, wrapper);
+ StandardTree updateEntity = new StandardTree();
+ updateEntity.setId(standardTree.getId());
+ updateEntity.setModel(standardTree.getModel());
+ return standardTreeMapper.updateById(updateEntity);
+ }
+
+ @Override
+ public StandardTreeVO selectStandardTreeById(Integer standardTreeId) {
+ return standardTreeMapper.selectStandardTreeById(standardTreeId);
}
--
Gitblit v1.9.3