From ecaf6326139d524e71c96b7fa459f452f8498065 Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期日, 28 四月 2024 07:33:12 +0800 Subject: [PATCH] 标准库刷新检验项目 --- cnas-server/src/main/java/com/yuanchu/mom/service/impl/CapacityScopeServiceImpl.java | 35 +++++++++++++++++++++++++++++++++-- 1 files changed, 33 insertions(+), 2 deletions(-) diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/CapacityScopeServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/CapacityScopeServiceImpl.java index 0965a15..8b8770a 100644 --- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/CapacityScopeServiceImpl.java +++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/CapacityScopeServiceImpl.java @@ -1,20 +1,25 @@ package com.yuanchu.mom.service.impl; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yuanchu.mom.common.GetLook; import com.yuanchu.mom.common.PrintChina; import com.yuanchu.mom.dto.PageTestObjectDto; +import com.yuanchu.mom.dto.TestItemDto; +import com.yuanchu.mom.exception.ErrorException; import com.yuanchu.mom.mapper.StructureItemParameterMapper; import com.yuanchu.mom.mapper.StructureTestObjectMapper; import com.yuanchu.mom.pojo.StructureItemParameter; import com.yuanchu.mom.pojo.StructureTestObject; import com.yuanchu.mom.service.CapacityScopeService; +import com.yuanchu.mom.service.StandardTreeService; import com.yuanchu.mom.utils.QueryWrappers; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -33,6 +38,8 @@ private StructureTestObjectMapper structureTestObjectMapper; + private StandardTreeService standardTreeService; + @Override public Map<String, Object> selectItemParameterList(Page page, StructureItemParameter itemParameter) { Map<String, Object> map = new HashMap<>(); @@ -45,7 +52,11 @@ @Override public int addItemParameter(StructureItemParameter itemParameter) { - return structureItemParameterMapper.insert(itemParameter); + if (itemParameter.getBsm().equals("")||itemParameter.getBsm()==null){ + itemParameter.setBsm("0"); + } + int insert = structureItemParameterMapper.insert(itemParameter); + return insert; } @Override @@ -62,7 +73,7 @@ public Map<String, Object> selectTestObjectList(Page page, PageTestObjectDto pageTestObjectDto) { Map<String, Object> map = new HashMap<>(); map.put("head", PrintChina.printChina(PageTestObjectDto.class)); - Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectItemParameterList"); + Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectTestObjectList"); if(map1.get("look")==1) pageTestObjectDto.setCreateUser(map1.get("userId")); map.put("body", structureTestObjectMapper.selectTestObjectList(page, QueryWrappers.queryWrappers(pageTestObjectDto))); return map; @@ -70,6 +81,10 @@ @Override public int addTestObject(StructureTestObject testObject) { + Long count = structureTestObjectMapper.selectCount(Wrappers.<StructureTestObject>lambdaQuery().eq(StructureTestObject::getSpecimenName, testObject.getSpecimenName())); + if(count.compareTo(0L) > 0){ + throw new ErrorException("妫�楠屽璞′笉鑳介噸澶�"); + } return structureTestObjectMapper.insert(testObject); } @@ -82,5 +97,21 @@ public int upTestObject(StructureTestObject testObject) { return structureTestObjectMapper.updateById(testObject); } + + @Override + public List<StructureTestObject> selectTestObjectByName() { + return structureTestObjectMapper.selectList(Wrappers.<StructureTestObject>lambdaQuery().select(StructureTestObject::getSpecimenName,StructureTestObject::getId)); + } + + //璁惧閲岄潰閫夋嫨妫�楠岄」鐩�(鏍戝舰缁撴瀯) + @Override + public List<Map<String, Object>> getInsProduction() { + return structureItemParameterMapper.getInsProduction(); + } + + @Override + public List<TestItemDto> getItemTree() { + return structureItemParameterMapper.getItemTree(); + } } -- Gitblit v1.9.3