From 86adbb1544142dcfb48333dade822f81640607a6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 01 九月 2023 13:50:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java b/standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java
index 331d83d..4ccc9d7 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java
@@ -23,17 +23,22 @@
@Resource
private ProductMapper productMapper;
- @Override
- public List<ProductDto> selectTreeProduct(String specifications, String project) {
- return productMapper.selectTreeProduct(specifications, project);
- }
-
+ //鏍规嵁鍨嬪彿id鏌ヨ椤圭洰(鎶�鏈寚鏍�)
@Override
public List<Map<String, Object>> selectProductList(Integer specificationsId) {
- LambdaQueryWrapper<Product> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Product::getSpecificationsId, specificationsId);
- wrapper.select(Product::getName, Product::getFather, Product::getRequired, Product::getInternal, Product::getUnit);
- return productMapper.selectMaps(wrapper);
+ return productMapper.selectProductList(specificationsId);
+ }
+
+ //鏍规嵁鍨嬪彿id鏌ヨ鎵�鏈夌増鏈�
+ @Override
+ public List<Integer> selectVerByPro(Integer specificationsId) {
+ return productMapper.selectVerByPro(specificationsId);
+ }
+
+ //鍙充晶鏁版嵁灞曠ず-->鎶�鏈寚鏍�(妫�楠岄」鐩�)
+ @Override
+ public List<Map<String, Object>> selectAllPro(Integer specificationsId, Integer version,String message) {
+ return productMapper.selectAllPro(specificationsId,version,message);
}
}
--
Gitblit v1.9.3