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 | 57 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 34 insertions(+), 23 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 099e61e..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
@@ -1,22 +1,18 @@
package com.yuanchu.limslaboratory.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.yuanchu.limslaboratory.pojo.Specifications;
import com.yuanchu.limslaboratory.mapper.SpecificationsMapper;
-import com.yuanchu.limslaboratory.service.SpecificationsService;
+import com.yuanchu.limslaboratory.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yuanchu.limslaboratory.service.StandardsService;
-import com.yuanchu.limslaboratory.service.UserService;
-import com.yuanchu.limslaboratory.vo.ListSpecificationsInformation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
-import java.util.Map;
-import java.util.Objects;
+import java.util.ArrayList;
+import java.util.List;
/**
* <p>
@@ -33,30 +29,45 @@
private SpecificationsMapper specificationsMapper;
@Autowired
- private StandardsService standardsService;
+ private MaterialService materialService;
@Autowired
- private UserService userService;
+ 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);
- }
+ public Integer deleteSpecifications(Integer specificationsId) {
+ LambdaUpdateWrapper<Specifications> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(Specifications::getId, specificationsId);
+ updateWrapper.set(Specifications::getState, 0);
+ List<Integer> list = new ArrayList<>();
+ 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);
}
+ return 1;
}
return 0;
}
@Override
- public IPage<ListSpecificationsInformation> listSpecificationsInformation(String specificationsName, String serialNumberId, Page<Objects> page) {
- return specificationsMapper.listSpecificationsInformation(specificationsName,serialNumberId,page);
+ public List<Integer> SerialNumberIdDeleteSpecifications(List<String> deleteSerialNumberId) {
+ List<Integer> list = new ArrayList<>();
+ for (String serialNumberId:deleteSerialNumberId){
+ LambdaQueryWrapper<Specifications> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(Specifications::getId, serialNumberId);
+ wrapper.select(Specifications::getId);
+ List<Specifications> maps1 = specificationsMapper.selectList(wrapper);
+ for (Specifications specifications:maps1){
+ LambdaUpdateWrapper<Specifications> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(Specifications::getId, specifications.getId());
+ updateWrapper.set(Specifications::getState, 0);
+ specificationsMapper.update(new Specifications(), updateWrapper);
+ list.add(specifications.getId());
+ }
+ }
+ return list;
}
}
--
Gitblit v1.9.3