From 4fae0a3d70ce519502c8ef17f327daffbe9a44aa Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 19 七月 2023 11:19:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/SpecificationsServiceImpl.java | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 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..f8e4807 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
@@ -5,16 +5,15 @@
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.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 com.yuanchu.limslaboratory.utils.MyUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -38,6 +37,12 @@
@Autowired
private UserService userService;
+ @Autowired
+ private MaterialService materialService;
+
+ @Autowired
+ private ProductService productService;
+
@Override
public Integer addSpecificationsInformation(Specifications specifications) {
Boolean userIsNull = userService.userIsNull(specifications.getUserId());
@@ -56,7 +61,37 @@
}
@Override
- public IPage<ListSpecificationsInformation> listSpecificationsInformation(String specificationsName, String serialNumberId, Page<Objects> page) {
+ 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(String specificationsId) {
+ LambdaQueryWrapper<Specifications> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(Specifications::getId, specificationsId);
+ // 鍒犻櫎Specifications涓殑鏁版嵁
+ int delete = specificationsMapper.delete(wrapper);
+ if (delete == 1){
+ // 鍒犻櫎绛変簬SpecificationsId鐨凪aterial琛ㄦ牸涓殑鏁版嵁锛屽苟涓旇幏鍙栬鏁版嵁鐨処d锛岀敤浜庡垹闄roduct琛ㄦ牸涓殑鏁版嵁
+ List<String> materialListId = materialService.deleteMaterialEqSpecification(specificationsId);
+ if (!ObjectUtils.isEmpty(materialListId)){
+ // 鏍规嵁Material琛ㄨ繑鍥炵殑鍒楄〃Id锛屽垹闄roduct琛ㄤ腑鎵�鏈塎aterialId绛変簬璇ュ垪琛ㄤ腑鐨勬墍鏈夋暟鎹紝鏃犺繑鍥炲��
+ productService.deleteProductEqMaterialId(materialListId);
+ }
+ return 1;
+ }
+ return 0;
+ }
}
--
Gitblit v1.9.3