From f3bb76fa668530d5613700e57a30e6c7394d5224 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 06 三月 2025 16:50:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/CapacityScopeServiceImpl.java | 19 +++----------------
1 files changed, 3 insertions(+), 16 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 f63a161..6bc9025 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
@@ -7,13 +7,13 @@
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.ruoyi.common.exception.base.BaseException;
-import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.basic.dto.PageTestObjectDto;
import com.ruoyi.basic.dto.TestItemDto;
import com.ruoyi.basic.mapper.*;
import com.ruoyi.basic.pojo.*;
import com.ruoyi.basic.service.CapacityScopeService;
+import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.basic.service.StandardProductListService;
import com.ruoyi.basic.service.StructureItemParameterService;
import lombok.AllArgsConstructor;
@@ -40,10 +40,6 @@
private StructureTestObjectMapper structureTestObjectMapper;
private ProductMapper productMapper;
-
- private StructureTestObjectPartMapper structureTestObjectPartMapper;
-
- private ProductPartMapper productPartMapper;
private StandardProductListService standardProductListService;
@@ -77,9 +73,7 @@
@Override
public IPage<PageTestObjectDto> selectTestObjectList(Page page, PageTestObjectDto pageTestObjectDto) {
- String partNo = pageTestObjectDto.getPartNo();
- pageTestObjectDto.setPartNo(null);
- return structureTestObjectMapper.selectTestObjectList(page, QueryWrappers.queryWrappers(pageTestObjectDto),partNo);
+ return structureTestObjectMapper.selectTestObjectList(page, QueryWrappers.queryWrappers(pageTestObjectDto));
}
@Override
@@ -94,17 +88,10 @@
@Override
public int delTestObject(Integer id) {
- // 浜у嚭妫�楠屽璞′骇鍝佺淮鎶�
- structureTestObjectPartMapper.delete(Wrappers.<StructureTestObjectPart>lambdaQuery()
- .eq(StructureTestObjectPart::getTestObjectId, id));
-
// 鍒犻櫎浜у搧缁存姢鐨勯浂浠剁粦瀹�
List<Product> products = productMapper.selectList(Wrappers.<Product>lambdaQuery()
.eq(Product::getObjectId, id));
List<Integer> productIds = products.stream().map(Product::getId).collect(Collectors.toList());
- productPartMapper.delete(Wrappers.<ProductPart>lambdaQuery()
- .in(ProductPart::getProductId, productIds));
-
// 鍒犻櫎浜у搧缁存姢
productMapper.delete(Wrappers.<Product>lambdaQuery()
.in(Product::getId, productIds));
--
Gitblit v1.9.3