Merge remote-tracking branch 'origin/master'

zss

2024-04-16 2298b0125d761930e07ec7b482146fda32887725

 cnas-server/src/main/java/com/yuanchu/mom/service/impl/CapacityScopeServiceImpl.java

@@ -6,6 +6,7 @@
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.dto.PageTestObjectDto;
import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.mapper.StructureItemParameterMapper;
import com.yuanchu.mom.mapper.StructureTestObjectMapper;
import com.yuanchu.mom.pojo.StructureItemParameter;
@@ -47,6 +48,9 @@

    @Override
    public int addItemParameter(StructureItemParameter itemParameter) {
        if (itemParameter.getBsm().equals("")||itemParameter.getBsm()==null){
            itemParameter.setBsm("0");
        }
        return structureItemParameterMapper.insert(itemParameter);
    }

@@ -72,7 +76,10 @@

    @Override
    public int addTestObject(StructureTestObject testObject) {
        System.out.println(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);
    }

@@ -88,7 +95,7 @@

    @Override
    public List<StructureTestObject> selectTestObjectByName() {
        return structureTestObjectMapper.selectList(Wrappers.<StructureTestObject>lambdaQuery().select(StructureTestObject::getSpecimenName));
        return structureTestObjectMapper.selectList(Wrappers.<StructureTestObject>lambdaQuery().select(StructureTestObject::getSpecimenName,StructureTestObject::getId));
    }
}