From 43a8301f04a6ea7891ef16861734163b2646e07f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 14 一月 2026 18:05:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java
index 8772531..b54617f 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java
@@ -2,15 +2,22 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.basic.dto.ProductModelDto;
+import com.ruoyi.basic.mapper.ProductMapper;
+import com.ruoyi.basic.mapper.ProductModelMapper;
+import com.ruoyi.basic.pojo.Product;
+import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.production.dto.ProductStructureDto;
import com.ruoyi.production.mapper.ProductStructureMapper;
import com.ruoyi.production.pojo.ProductStructure;
import com.ruoyi.production.service.ProductStructureService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.HashMap;
import java.util.List;
@Service
@@ -20,10 +27,21 @@
@Autowired
private ProductStructureMapper productStructureMapper;
+ @Autowired
+ private ProductModelMapper productModelMapper;
+ @Autowired
+ private ProductMapper productMapper;
@Override
- public List<ProductStructureDto> listByproductModelId(Long productModelId) {
- return productStructureMapper.listByproductModelId( productModelId);
+ public ProductModelDto listByproductModelId(Long productModelId) {
+ ProductModel productModel = productModelMapper.selectById(productModelId);
+ Product product = productMapper.selectById(productModel.getProductId());
+ ProductModelDto productModelDto = new ProductModelDto();
+ BeanUtils.copyProperties(productModel,productModelDto);
+ productModelDto.setProductName(product.getProductName());
+ List<ProductStructureDto> productStructureDtos = productStructureMapper.listByproductModelId(productModelId);
+ productModelDto.setProductStructureList(productStructureDtos);
+ return productModelDto;
}
@Override
--
Gitblit v1.9.3