From 01af9cb1c94e459184ad4d9836662094f14bac7e Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 16 四月 2024 00:15:27 +0800
Subject: [PATCH] 增加标准对于产品标准的区分，修复若干其她bug
---
cnas-server/src/main/java/com/yuanchu/mom/service/impl/CapacityScopeServiceImpl.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 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..8652c20 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,10 +1,12 @@
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.exception.ErrorException;
import com.yuanchu.mom.mapper.StructureItemParameterMapper;
import com.yuanchu.mom.mapper.StructureTestObjectMapper;
import com.yuanchu.mom.pojo.StructureItemParameter;
@@ -15,6 +17,7 @@
import org.springframework.stereotype.Service;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -45,6 +48,9 @@
@Override
public int addItemParameter(StructureItemParameter itemParameter) {
+ if (itemParameter.getBsm().equals("")||itemParameter.getBsm()==null){
+ itemParameter.setBsm("0");
+ }
return structureItemParameterMapper.insert(itemParameter);
}
@@ -62,7 +68,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 +76,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 +92,10 @@
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));
+ }
}
--
Gitblit v1.9.3