From f1d445b9d51abb020cbcd4a61b4edd36fbe75216 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 26 八月 2023 15:57:38 +0800
Subject: [PATCH] 新增检验修改
---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java | 80 +++++++++++++++++++++++-----------------
1 files changed, 46 insertions(+), 34 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..fec45c1 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
@@ -1,24 +1,18 @@
package com.yuanchu.limslaboratory.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yuanchu.limslaboratory.pojo.Product;
import com.yuanchu.limslaboratory.mapper.ProductMapper;
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.util.ObjectUtils;
-
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
-import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
+
/**
* <p>
@@ -34,9 +28,10 @@
@Resource
private ProductMapper productMapper;
+
@Override
public void deleteProductInformation(List<Integer> SpecificationsId) {
- for (Integer materialId : SpecificationsId){
+ for (Integer materialId : SpecificationsId) {
LambdaUpdateWrapper<Product> wrapper = new LambdaUpdateWrapper<>();
wrapper.eq(Product::getSpecifications_id, materialId);
wrapper.set(Product::getState, 0);
@@ -44,36 +39,53 @@
}
}
+ //灞曠ず璇ュ瀷鍙蜂笅鐨勬楠岄」鐩姹�-->閫夋嫨鐗堟湰
@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;
+ public List<Integer> chooseVersion(Integer specificationsId) {
+ return productMapper.chooseVersion(specificationsId);
+ }
+
+ //灞曠ず璇ュ瀷鍙蜂笅鐨勬楠岄」鐩姹�
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public List<Map<String, Object>> pageProductInformation(Integer specificationsId,Integer version) {
+ return productMapper.pageProductInformation(specificationsId,version);
+ }
+
+ //濉啓鏍囧噯鍊间笌鍐呮帶鍊�,榧犳爣绉诲紑淇濆瓨
+ @Override
+ public Integer write(Integer id, String required, String internal) {
+ Product product = new Product();
+ product.setId(id);
+ product.setRequired(required);
+ product.setInternal(internal);
+ MyUtil.PrintLog(product.toString());
+ return productMapper.updateById(product);
}
@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);
+ public void deleteList(String ids) {
+ productMapper.deleteList(ids);
}
- //閫氳繃椤圭洰鍚嶆煡璇㈤」鐩殑璇曢獙鏂规硶
+ //娣诲姞鍚屼竴涓瀷鍙风殑鍏朵粬鐗堟湰
@Override
- public List<Map> selectInstrumentByProname(String name) {
- return productMapper.selectInstrumentByProname(name);
+ public Integer addVersion(Integer specificationsId) {
+ List<Product> productList = productMapper.selectList(Wrappers.<Product>query().eq("specifications_id", specificationsId));
+ for (Product product : productList) {
+ product.setId(null);
+ product.setVersion(product.getVersion()+1);
+ product.setSpecifications_id(specificationsId);
+ }
+ saveBatch(productList);
+ return productList.get(0).getVersion();
}
+
+ //鏌ヨ璇ュ瀷鍙蜂笅鐨勬墍鏈夎瘯楠岄」鐩�(鐖剁被)
+ @Override
+ public List<Map<String,Object>> chooseProject(Integer modelId) {
+ return productMapper.chooseProject(modelId);
+ }
+
+
}
--
Gitblit v1.9.3