From 578bfcb3f58c5458d2c60fe37c3e56ebcda98e18 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 05 三月 2025 15:15:03 +0800
Subject: [PATCH] 标准功能搬迁
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/CapacityScopeServiceImpl.java | 31 +++++++++----------------------
1 files changed, 9 insertions(+), 22 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/CapacityScopeServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CapacityScopeServiceImpl.java
similarity index 87%
rename from basic-server/src/main/java/com/ruoyi/inspect/service/impl/CapacityScopeServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/basic/service/impl/CapacityScopeServiceImpl.java
index bf763cf..6bc9025 100644
--- a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/CapacityScopeServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CapacityScopeServiceImpl.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.service.impl;
+package com.ruoyi.basic.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
@@ -7,15 +7,15 @@
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.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.inspect.dto.PageTestObjectDto;
-import com.ruoyi.inspect.dto.TestItemDto;
-import com.ruoyi.inspect.mapper.*;
-import com.ruoyi.inspect.pojo.*;
-import com.ruoyi.inspect.service.CapacityScopeService;
-import com.ruoyi.inspect.service.StandardProductListService;
-import com.ruoyi.inspect.service.StructureItemParameterService;
+import com.ruoyi.basic.service.StandardProductListService;
+import com.ruoyi.basic.service.StructureItemParameterService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
@@ -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