From 30f6da8bf0143906b42fa600f6a604cea6c81f71 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 26 七月 2023 09:16:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java | 39 ++-------------------------------------
1 files changed, 2 insertions(+), 37 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java
index a7839fe..a373c2a 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java
@@ -4,17 +4,11 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.yuanchu.limslaboratory.pojo.Material;
import com.yuanchu.limslaboratory.mapper.MaterialMapper;
-import com.yuanchu.limslaboratory.pojo.Specifications;
-import com.yuanchu.limslaboratory.pojo.dto.UpdateMaterialInformation;
import com.yuanchu.limslaboratory.service.MaterialService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.limslaboratory.service.ProductService;
-import com.yuanchu.limslaboratory.utils.JackSonUtil;
-import com.yuanchu.limslaboratory.utils.MyUtil;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
import java.util.ArrayList;
@@ -35,40 +29,20 @@
@Resource
MaterialMapper materialMapper;
+ //鏌ヨ鐗╂枡淇℃伅
@Override
public List<Material> selectMaterialLimit(int pageSize, int countSize) {
return materialMapper.selectMaterialLimit((pageSize - 1) * countSize,pageSize * countSize);
}
+ //鏍规嵁鐗╂枡id鏌ヨ鐗╂枡淇℃伅
@Override
public Map selectMaterialById(String materialId) {
return materialMapper.selectMaterialById(materialId);
}
- @Override
- public Material ListIdMaterialInformation(String materialId) {
- LambdaQueryWrapper<Material> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Material::getId, materialId);
- wrapper.select(Material::getId, Material::getName, Material::getSupplier, Material::getLocation, Material::getNum, Material::getBatch,
- Material::getReelNumber);
- return materialMapper.selectOne(wrapper);
- }
-
@Autowired
private ProductService productService;
-
- @Override
- public Integer addMaterialInformation(Material material) {
- return materialMapper.insert(material);
- }
-
- @Override
- public List<Map<String, Object>> getListMaterialInformation(String specificationsId) {
- LambdaQueryWrapper<Material> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Material::getSpecificationsId, specificationsId);
- wrapper.select(Material::getId, Material::getName);
- return materialMapper.selectMaps(wrapper);
- }
@Override
public Integer deleteMaterialInformation(String materialId) {
@@ -86,19 +60,10 @@
}
@Override
- public Integer updateMaterialInformation(Material material) {
- LambdaUpdateWrapper<Material> updateWrapper = new LambdaUpdateWrapper<>();
- updateWrapper.eq(Material::getId, material.getId());
- materialMapper.updateById(material);
- return materialMapper.update(material, updateWrapper);
- }
-
- @Override
public List<String> specificationsIdDeleteMaterial(List<Integer> deleteSpecificationsId) {
List<String> list = new ArrayList<>();
for (Integer serialNumberId:deleteSpecificationsId){
LambdaQueryWrapper<Material> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Material::getSpecificationsId, serialNumberId);
wrapper.select(Material::getId);
List<Material> maps1 = materialMapper.selectList(wrapper);
for (Material material:maps1){
--
Gitblit v1.9.3