From 25dc8eace099a8265cecfa952209b835eb9a346d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 13 十一月 2024 17:14:28 +0800
Subject: [PATCH] 检验下单选择样品的时候不用原本那个接口,去掉两层,直接从天线和无源器件开始选
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java | 17 +++++++++++++++++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 2 +-
inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java | 1 +
inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java | 2 +-
4 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
index 7284046..92e2acc 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
@@ -46,7 +46,7 @@
@ApiOperation(value = "鑾峰彇鏍囧噯鏍�(妫�楠屼笅鍗�)")
@GetMapping("/selectStandardTreeList2")
public Result selectStandardTreeList2() {
- return Result.success(standardTreeService.selectStandardTreeList());
+ return Result.success(standardTreeService.selectStandardTreeList2());
}
@ValueClassify("鏍囧噯搴�")
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java
index d39ed07..abd212f 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java
@@ -19,6 +19,7 @@
public interface StandardTreeService extends IService<StandardTree> {
List<FactoryDto> selectStandardTreeList();
+ List<SampleTypeDto> selectStandardTreeList2();
int addStandardTree(StandardTree standardTree);
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
index 2d9d7b8..b3021ea 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
@@ -138,7 +138,7 @@
//鎸夌収鐢佃矾璇曢獙--杈愬皠璇曢獙--娓╂箍搴﹁瘯楠�--鐜璇曢獙杩涜鎺掑簭
// 瀹氫箟鑷畾涔夋帓搴忓櫒
Comparator<StandardProductList> testTypeComparator = (o1, o2) -> {
- String[] order = {"鐢佃矾璇曢獙", "杈愬皠璇曢獙", "娓╂箍搴﹁瘯楠�", "鐜璇曢獙"};
+ String[] order = {"鐢佃矾璇曢獙", "杈愬皠璇曢獙", "娓╂箍搴﹁瘯楠�", "鐜璇曢獙","鍔熺巼璇曢獙"};
int index1 = -1;
int index2 = -1;
// 鎵惧嚭涓や釜瀵硅薄 鍦ㄨ嚜瀹氫箟椤哄簭鏁扮粍涓殑浣嶇疆
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
index c2ec01a..c728dec 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
@@ -71,6 +71,23 @@
}
@Override
+ public List<SampleTypeDto> selectStandardTreeList2() {
+ List<SampleTypeDto> sampleTypeDtos= new ArrayList<>();
+ List<FactoryDto> factoryDtos = standardTreeMapper.selectStandardTreeList();
+ for (FactoryDto factoryDto : factoryDtos) {
+ for (LaboratoryDto laboratoryDto : factoryDto.getChildren()) {
+ for (SampleTypeDto sampleTypeDto : laboratoryDto.getChildren()) {
+ if (sampleTypeDto.getChildren().size() == 0) {
+ sampleTypeDto.setChildren(standardTreeMapper.getStandardTree3(sampleTypeDto.getValue()));
+ }
+ sampleTypeDtos.add(sampleTypeDto);
+ }
+ }
+ }
+ return sampleTypeDtos;
+ }
+
+ @Override
@Transactional(rollbackFor = Exception.class)
public int addStandardTree(StandardTree standardTree) {
StandardTree tree = standardTreeMapper.selectOne(Wrappers.<StandardTree>lambdaQuery()
--
Gitblit v1.9.3