From 636af7d0ed40549da7182569175e69068e5e937d Mon Sep 17 00:00:00 2001
From: “zhuo” <“zhuo@itcast.cn”>
Date: 星期三, 09 八月 2023 09:24:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java | 42 +-----------------------------------------
1 files changed, 1 insertions(+), 41 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java
index 4ac533d..4b75748 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java
@@ -98,46 +98,6 @@
@Override
public List<Map<String, Object>> getFourLevelInformation(String specificationName) {
- LambdaQueryWrapper<Material> typeWrapper = new LambdaQueryWrapper<>();
- typeWrapper.groupBy(Material::getType);
- typeWrapper.select(Material::getType);
- List<Map<String, Object>> typeMaps = materialMapper.selectMaps(typeWrapper);
- for (Map<String, Object> typeMap : typeMaps){
- LambdaQueryWrapper<Material> materialWrapper = new LambdaQueryWrapper<>();
- materialWrapper.eq(Material::getType, typeMap.get("type"));
- materialWrapper.select(Material::getId, Material::getName);
- List<Map<String, Object>> materialMaps = materialMapper.selectMaps(materialWrapper);
- if (!ObjectUtils.isEmpty(materialMaps)){
- for (Map<String, Object> materialMap : materialMaps){
- LambdaQueryWrapper<Standard> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Standard::getMaterialId, materialMap.get("id"));
- wrapper.select(Standard::getId, Standard::getName);
- List<Map<String, Object>> standardMaps = standardService.listMaps(wrapper);
- if (!ObjectUtils.isEmpty(standardMaps)){
- for (Map<String, Object> standardMap : standardMaps){
- LambdaQueryWrapper<Specifications> specificationWrapper = new LambdaQueryWrapper<>();
- specificationWrapper.eq(Specifications::getStandardId, standardMap.get("id"));
- if (!ObjectUtils.isEmpty(specificationName)){
- specificationWrapper.eq(Specifications::getName, specificationName);
- }
- specificationWrapper.select(Specifications::getId, Specifications::getName);
- List<Map<String, Object>> specificationsMaps = specificationsService.listMaps(specificationWrapper);
- if (!ObjectUtils.isEmpty(specificationsMaps)){
- standardMap.put("children", specificationsMaps);
- } else {
- standardMap.put("children", null);
- }
- }
- materialMap.put("children", standardMaps);
- } else {
- materialMap.put("children", null);
- }
- }
- typeMap.put("children", materialMaps);
- } else {
- typeMap.put("children", null);
- }
- }
- return typeMaps;
+ return materialMapper.FourTree(specificationName);
}
}
--
Gitblit v1.9.3