From 4c563cb7274be53e15f8ce5537ef6e57e15b6458 Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期二, 02 四月 2024 18:01:31 +0800 Subject: [PATCH] 检验报告 --- inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java | 38 +++++++++++++++++++++++++++++++------- 1 files changed, 31 insertions(+), 7 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java index 805c36f..85c5b37 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java @@ -78,32 +78,51 @@ public Map<String, List<?>> selectsStandardMethodByFLSSM(String tree) { String[] trees = tree.split(" - "); List<StandardMethodList> standardMethodLists = null; - List<StandardProductList> standardProductLists = null; switch (trees.length){ case 5: standardMethodLists = standardMethodListMapper.selectStandardMethodLists(trees[0],trees[1],trees[2],trees[3],trees[4]); - standardProductLists = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getFactory, trees[0]).eq(StandardProductList::getLaboratory, trees[1]).eq(StandardProductList::getSampleType, trees[2]).eq(StandardProductList::getSample, trees[3]).eq(StandardProductList::getModel, trees[4])); break; case 4: standardMethodLists = standardMethodListMapper.selectStandardMethodLists(trees[0],trees[1],trees[2],trees[3],null); - standardProductLists = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getFactory, trees[0]).eq(StandardProductList::getLaboratory, trees[1]).eq(StandardProductList::getSampleType, trees[2]).eq(StandardProductList::getSample, trees[3])); break; case 3: standardMethodLists = standardMethodListMapper.selectStandardMethodLists(trees[0],trees[1],trees[2],null,null); - standardProductLists = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getFactory, trees[0]).eq(StandardProductList::getLaboratory, trees[1]).eq(StandardProductList::getSampleType, trees[2])); break; case 2: standardMethodLists = standardMethodListMapper.selectStandardMethodLists(trees[0],trees[1],null,null,null); - standardProductLists = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getFactory, trees[0]).eq(StandardProductList::getLaboratory, trees[1])); break; case 1: standardMethodLists = standardMethodListMapper.selectStandardMethodLists(trees[0],null,null,null,null); - standardProductLists = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getFactory, trees[0])); break; } Map<String, List<?>> map = new HashMap<>(); map.put("standardMethodList", standardMethodLists); - map.put("standardProductList", standardProductLists); + return map; + } + + @Override + public Map<String, List<?>> selectsStandardMethodByFLSSM2(String tree) { + String[] trees = tree.split(" - "); + List<StandardMethodList> standardMethodLists = null; + switch (trees.length){ + case 5: + standardMethodLists = standardMethodListMapper.selectStandardMethodLists2(trees[0],trees[1],trees[2],trees[3],trees[4]); + break; + case 4: + standardMethodLists = standardMethodListMapper.selectStandardMethodLists2(trees[0],trees[1],trees[2],trees[3],null); + break; + case 3: + standardMethodLists = standardMethodListMapper.selectStandardMethodLists2(trees[0],trees[1],trees[2],null,null); + break; + case 2: + standardMethodLists = standardMethodListMapper.selectStandardMethodLists2(trees[0],trees[1],null,null,null); + break; + case 1: + standardMethodLists = standardMethodListMapper.selectStandardMethodLists2(trees[0],null,null,null,null); + break; + } + Map<String, List<?>> map = new HashMap<>(); + map.put("standardMethodList", standardMethodLists); return map; } @@ -113,6 +132,11 @@ standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id)); return standardMethodListMapper.deleteById(id); } + + @Override + public List<StandardMethodList> selectStandardMethodEnum() { + return standardMethodListMapper.selectList(Wrappers.<StandardMethodList>lambdaQuery().select(StandardMethodList::getId,StandardMethodList::getCode,StandardMethodList::getName)); + } } -- Gitblit v1.9.3