From 3f0e25410f5aa3f01fda3d2d6410d89dc74159f3 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 19 八月 2023 15:16:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java | 40 ++++++++++++----------------------------
1 files changed, 12 insertions(+), 28 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java
index b82da28..c27c343 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java
@@ -4,14 +4,18 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.mapper.ProductModelMapper;
+import com.yuanchu.limslaboratory.mapper.SpecificationsMapper;
import com.yuanchu.limslaboratory.pojo.Product;
import com.yuanchu.limslaboratory.mapper.ProductMapper;
+import com.yuanchu.limslaboratory.pojo.ProductModel;
import com.yuanchu.limslaboratory.service.ProductService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.limslaboratory.utils.MyUtil;
import org.springframework.beans.factory.annotation.Autowired;
import com.yuanchu.limslaboratory.service.UserService;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
@@ -34,6 +38,10 @@
@Resource
private ProductMapper productMapper;
+ @Resource
+ ProductModelMapper productModelMapper;
+
+
@Override
public void deleteProductInformation(List<Integer> SpecificationsId) {
for (Integer materialId : SpecificationsId){
@@ -44,36 +52,12 @@
}
}
+ //灞曠ず璇ュ瀷鍙蜂笅鐨勬楠岄」鐩姹�
@Override
- public IPage<Map<String, Object>> pageProductInformation(String productCodeOrName, Integer specificationsId, Page<Objects> page) {
- IPage<Map<String, Object>> iPage = productMapper.pageProductInformation(productCodeOrName, specificationsId, page);
- List<Map<String, Object>> maps = iPage.getRecords();
- maps.forEach(map -> {
- int num = Integer.parseInt(map.get("num").toString());
- boolean children = false;
- if (num > 1){
- children = true;
- } else {
- Map<String, Object> product = productMapper.selectOneChildren(map.get("father"));
- map.putAll(product);
- }
- map.put("children", children);
- map.remove("num");
- });
- return iPage;
+ @Transactional(rollbackFor = Exception.class)
+ public List<Map<String, Object>> pageProductInformation(Integer specificationsId) {
+ return productMapper.pageProductInformation(specificationsId);
}
- @Override
- public List<Map<String, Object>> pageFatherNameProductInformation(String fatherName) {
- LambdaQueryWrapper<Product> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Product::getFather, fatherName);
- wrapper.select(Product::getId, Product::getName, Product::getUnit, Product::getRequired, Product::getInternal);
- return productMapper.selectMaps(wrapper);
- }
- //閫氳繃椤圭洰鍚嶆煡璇㈤」鐩殑璇曢獙鏂规硶
- @Override
- public List<Map> selectInstrumentByProname(String name) {
- return productMapper.selectInstrumentByProname(name);
- }
}
--
Gitblit v1.9.3