From eb975b40828b3a930fb38b75c739a7385b14ee12 Mon Sep 17 00:00:00 2001 From: zhuo <2089219845@qq.com> Date: 星期四, 03 四月 2025 14:48:57 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/radio_frequency' into radio_frequency --- basic-server/src/main/java/com/ruoyi/basic/service/CapacityScopeService.java | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 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 c34de55..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,10 +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.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; @@ -45,5 +46,11 @@ List<TestItemDto> getItemTree(); void importPartExcel(List<StructureTestObjectData> list); + + List<TestItemDto> getItemTreeProduct(StructureTestObjectDto structureTestObjectDto); + + List<Model> getProductTypes(ModelDto modelDto); + + List<ProductPart> getPartNoList(ProductPartDto productPartDto); } -- Gitblit v1.9.3