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/SpecificationsServiceImpl.java | 55 +------------------------------------------------------
1 files changed, 1 insertions(+), 54 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java
index 3ff92cb..0730bc4 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java
@@ -2,13 +2,10 @@
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.yuanchu.limslaboratory.pojo.Specifications;
import com.yuanchu.limslaboratory.mapper.SpecificationsMapper;
import com.yuanchu.limslaboratory.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yuanchu.limslaboratory.pojo.dto.UpdateSpeStateSpecificationsDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -16,8 +13,6 @@
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
-import java.util.Objects;
/**
* <p>
@@ -34,50 +29,10 @@
private SpecificationsMapper specificationsMapper;
@Autowired
- private StandardsService standardsService;
-
- @Autowired
- private UserService userService;
-
- @Autowired
private MaterialService materialService;
@Autowired
private ProductService productService;
-
- @Override
- public Integer addSpecificationsInformation(Specifications specifications) {
- Boolean userIsNull = userService.userIsNull(specifications.getUserId());
- if (userIsNull){
- Boolean standardsIsNull = standardsService.standardsIsNull(specifications.getSerialId());
- if (!ObjectUtils.isEmpty(standardsIsNull)){
- LambdaQueryWrapper<Specifications> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Specifications::getNumber, specifications.getNumber());
- Specifications specificationsNumberIsNull = specificationsMapper.selectOne(wrapper);
- if (ObjectUtils.isEmpty(specificationsNumberIsNull)){
- return specificationsMapper.insert(specifications);
- }
- }
- }
- return 0;
- }
-
- @Override
- public IPage<Map<String, Objects>> listSpecificationsInformation(String specificationsName, String serialNumberId, Page<Objects> page) {
- return specificationsMapper.listSpecificationsInformation(specificationsName,serialNumberId,page);
- }
-
- @Override
- public Map<String, Object> selectSNameSNName(int materialId) {
- return specificationsMapper.selectSNameSNName(materialId);
- }
-
- @Override
- public Integer updateSpecificationsInformation(Specifications specifications) {
- LambdaQueryWrapper<Specifications> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Specifications::getId, specifications.getId());
- return specificationsMapper.update(specifications, wrapper);
- }
@Override
public Integer deleteSpecifications(Integer specificationsId) {
@@ -102,7 +57,7 @@
List<Integer> list = new ArrayList<>();
for (String serialNumberId:deleteSerialNumberId){
LambdaQueryWrapper<Specifications> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Specifications::getSerialId, serialNumberId);
+ wrapper.eq(Specifications::getId, serialNumberId);
wrapper.select(Specifications::getId);
List<Specifications> maps1 = specificationsMapper.selectList(wrapper);
for (Specifications specifications:maps1){
@@ -114,13 +69,5 @@
}
}
return list;
- }
-
- @Override
- public Integer updateSpeStateSpecifications(UpdateSpeStateSpecificationsDto updateSpeStateSpecificationsDto) {
- LambdaUpdateWrapper<Specifications> updateWrapper = new LambdaUpdateWrapper<>();
- updateWrapper.eq(Specifications::getId, updateSpeStateSpecificationsDto.getId());
- updateWrapper.set(Specifications::getSpe_state, updateSpeStateSpecificationsDto.getSpe_state());
- return specificationsMapper.update(new Specifications(), updateWrapper);
}
}
--
Gitblit v1.9.3