From 5864e92e24a5fee0a5fed15b505933ac10df5cf4 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 19 三月 2025 17:53:21 +0800
Subject: [PATCH] 1.零件绑定 2.给对象绑定车间 3.检验对象导入模板讨论及联调导入功能 4.检验对象查询优化
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/CapacityScopeServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CapacityScopeServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CapacityScopeServiceImpl.java
index 4b436aa..5fa1c5b 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CapacityScopeServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CapacityScopeServiceImpl.java
@@ -51,12 +51,12 @@
@Override
public IPage<StructureItemParameter> selectItemParameterList(Page page, StructureItemParameter itemParameter) {
- return structureItemParameterMapper.selectItemParameterList(page, QueryWrappers.queryWrappers(itemParameter));
+ return structureItemParameterMapper.selectItemParameterList(page, QueryWrappers.queryWrappers(itemParameter));
}
@Override
public int addItemParameter(StructureItemParameter itemParameter) {
- if (itemParameter.getBsm().equals("")||itemParameter.getBsm()==null){
+ if (itemParameter.getBsm().equals("") || itemParameter.getBsm() == null) {
itemParameter.setBsm("0");
}
int insert = structureItemParameterMapper.insert(itemParameter);
@@ -75,15 +75,15 @@
@Override
public IPage<PageTestObjectDto> selectTestObjectList(Page page, PageTestObjectDto pageTestObjectDto) {
- String partNo = pageTestObjectDto.getPartNo();
- pageTestObjectDto.setPartNo(null);
- return structureTestObjectMapper.selectTestObjectList(page, QueryWrappers.queryWrappers(pageTestObjectDto),partNo);
+ String specimenName = pageTestObjectDto.getSample();
+ pageTestObjectDto.setSample(null);
+ return structureTestObjectMapper.selectTestObjectList(page, QueryWrappers.queryWrappers(pageTestObjectDto), specimenName);
}
@Override
public int addTestObject(StructureTestObject testObject) {
Long count = structureTestObjectMapper.selectCount(Wrappers.<StructureTestObject>lambdaQuery().eq(StructureTestObject::getSpecimenName, testObject.getSpecimenName()));
- if(count.compareTo(0L) > 0){
+ if (count.compareTo(0L) > 0) {
throw new BaseException("妫�楠屽璞′笉鑳介噸澶�");
}
@@ -121,7 +121,7 @@
// 鏌ヨ鎵�鏈夊璞′竴鏍风殑妫�楠岄」鐩�
List<StandardProductList> standardProductLists = standardProductListService.list(Wrappers.<StandardProductList>lambdaUpdate()
.eq(StandardProductList::getSampleType, oldTestObject.getSpecimenName()));
- if (CollectionUtils.isNotEmpty(standardProductLists)){
+ if (CollectionUtils.isNotEmpty(standardProductLists)) {
for (StandardProductList standardProductList : standardProductLists) {
// 淇敼鎵�鏈夌殑瀵硅薄鍚嶇О鍜屾暟鍨嬬粨鏋�
standardProductList.setSampleType(testObject.getSpecimenName());
@@ -159,7 +159,7 @@
Long count = structureTestObjectMapper.selectCount(Wrappers.<StructureTestObject>lambdaQuery()
.eq(StructureTestObject::getSpecimenName, testObject.getSpecimenName())
.ne(StructureTestObject::getId, testObject.getId()));
- if(count.compareTo(0L) > 0){
+ if (count.compareTo(0L) > 0) {
throw new BaseException("妫�楠屽璞′笉鑳介噸澶�");
}
@@ -168,7 +168,7 @@
@Override
public List<StructureTestObject> selectTestObjectByName() {
- return structureTestObjectMapper.selectList(Wrappers.<StructureTestObject>lambdaQuery().select(StructureTestObject::getSpecimenName,StructureTestObject::getId));
+ return structureTestObjectMapper.selectList(Wrappers.<StructureTestObject>lambdaQuery().select(StructureTestObject::getSpecimenName, StructureTestObject::getId));
}
//璁惧閲岄潰閫夋嫨妫�楠岄」鐩�(鏍戝舰缁撴瀯)
--
Gitblit v1.9.3