From e2c5017787d7fc5eea2afb8bc84bca0db054ad8c Mon Sep 17 00:00:00 2001 From: chenrui <1187576398@qq.com> Date: 星期三, 09 四月 2025 17:46:36 +0800 Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency --- basic-server/src/main/java/com/ruoyi/basic/service/CapacityScopeService.java | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/CapacityScopeService.java b/basic-server/src/main/java/com/ruoyi/basic/service/CapacityScopeService.java index ef27aea..0a48424 100644 --- a/basic-server/src/main/java/com/ruoyi/basic/service/CapacityScopeService.java +++ b/basic-server/src/main/java/com/ruoyi/basic/service/CapacityScopeService.java @@ -3,11 +3,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.basic.dto.PageTestObjectDto; -import com.ruoyi.basic.dto.StructureTestObjectDto; -import com.ruoyi.basic.dto.TestItemDto; +import com.ruoyi.basic.dto.*; import com.ruoyi.basic.excel.StructureTestObjectData; +import com.ruoyi.basic.pojo.Model; +import com.ruoyi.basic.pojo.ProductPart; import com.ruoyi.basic.pojo.StructureItemParameter; import com.ruoyi.basic.pojo.StructureTestObject; @@ -48,5 +48,9 @@ void importPartExcel(List<StructureTestObjectData> list); List<TestItemDto> getItemTreeProduct(StructureTestObjectDto structureTestObjectDto); + + List<Model> getProductTypes(ModelDto modelDto); + + List<ProductPart> getPartNoList(ProductPartDto productPartDto); } -- Gitblit v1.9.3