From 9784433b1404acb3232f2b27eb621bd57428c1b6 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 09 八月 2023 17:51:50 +0800
Subject: [PATCH] 不合格反馈与不合格评审
---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java | 51 +++------------------------------------------------
1 files changed, 3 insertions(+), 48 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 feb1a9e..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
@@ -47,15 +47,11 @@
//鏌ヨ鐗╂枡淇℃伅
@Override
- public List<Material> selectMaterialLimit(int pageSize, int countSize, int type) {
+ public List<Map> selectMaterialLimit(int pageSize, int countSize, int type) {
return materialMapper.selectMaterialLimit((pageSize - 1) * countSize,pageSize * countSize, type);
}
- //鏍规嵁鐗╂枡id鏌ヨ鐗╂枡淇℃伅
- @Override
- public Map selectMaterialById(String materialId) {
- return materialMapper.selectMaterialById(materialId);
- }
+
@Override
public Integer deleteMaterialInformation(Integer materialId) {
@@ -102,47 +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<>();
- MyUtil.PrintLog(standardMap.get("id").toString());
- 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