From aa3256f25ea88527455f96c02d39e6e319fcf8e4 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 09 八月 2023 17:53:20 +0800
Subject: [PATCH] 不合格反馈与不合格评审
---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java | 71 +++++++----------------------------
1 files changed, 15 insertions(+), 56 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 ac60c11..93be8b1 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,23 +2,20 @@
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.SerialNumber;
import com.yuanchu.limslaboratory.pojo.Specifications;
import com.yuanchu.limslaboratory.mapper.SpecificationsMapper;
+import com.yuanchu.limslaboratory.pojo.dto.AddSpecifications;
+import com.yuanchu.limslaboratory.pojo.dto.AddStandardDto;
import com.yuanchu.limslaboratory.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import io.swagger.models.auth.In;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
-import java.util.Objects;
/**
* <p>
@@ -35,50 +32,7 @@
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) {
@@ -89,21 +43,18 @@
list.add(specificationsId);
int isDeleteSuccess = specificationsMapper.update(new Specifications(), updateWrapper);
if (isDeleteSuccess == 1){
- List<String> deleteMaterialId = materialService.specificationsIdDeleteMaterial(list);
- if (!ObjectUtils.isEmpty(deleteMaterialId)){
- productService.MaterialIdDeleteProduct(deleteMaterialId);
- }
+ productService.deleteProductInformation(list);
return 1;
}
return 0;
}
@Override
- public List<Integer> SerialNumberIdDeleteSpecifications(List<String> deleteSerialNumberId) {
+ public List<Integer> StandardIdDeleteSpecifications(List<Integer> deleteStandard) {
List<Integer> list = new ArrayList<>();
- for (String serialNumberId:deleteSerialNumberId){
+ for (Integer standard : deleteStandard){
LambdaQueryWrapper<Specifications> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Specifications::getSerialId, serialNumberId);
+ wrapper.eq(Specifications::getStandardId, standard);
wrapper.select(Specifications::getId);
List<Specifications> maps1 = specificationsMapper.selectList(wrapper);
for (Specifications specifications:maps1){
@@ -116,4 +67,12 @@
}
return list;
}
+
+ @Override
+ public Integer addSpecificationsInformation(AddSpecifications addStandardDto) {
+ Specifications specifications = new Specifications()
+ .setName(addStandardDto.getSpecificationsName())
+ .setStandardId(addStandardDto.getStandardId());
+ return specificationsMapper.insert(specifications);
+ }
}
--
Gitblit v1.9.3