From c5138faa1c4771bfbc19de5b257e7c129c081cb8 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 28 八月 2023 13:30:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 standard-server/src/main/java/com/yuanchu/limslaboratory/service/SpecificationsService.java |   26 ++++++++++----------------
 1 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/SpecificationsService.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/SpecificationsService.java
index 1a67143..5da007f 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/SpecificationsService.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/SpecificationsService.java
@@ -1,15 +1,14 @@
 package com.yuanchu.limslaboratory.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.limslaboratory.mapper.SpecificationsMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yuanchu.limslaboratory.pojo.Specifications;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.limslaboratory.pojo.Standard;
+import com.yuanchu.limslaboratory.pojo.dto.AddSpecifications;
+import com.yuanchu.limslaboratory.pojo.dto.AddStandardDto;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
-import java.util.Map;
-import java.util.Objects;
+import java.util.List;
 
 /**
  * <p>
@@ -20,20 +19,15 @@
  * @since 2023-07-11
  */
 public interface SpecificationsService extends IService<Specifications> {
-
-    Integer addSpecificationsInformation(Specifications specifications);
-
-    Map<String,Object> selectSNameSNName(int materialId);
-
-    IPage<Map<String, Objects>> listSpecificationsInformation(String specificationsName, String serialNumberId, Page<Objects> page);
-
-    Integer updateSpecificationsInformation(Specifications specifications);
-
     /**
      * 澶氳〃鍒犻櫎锛岃〃鏍煎垎鍒湁锛歋pecification --> Material --> Product
      * @param specificationsId
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    Integer deleteSpecifications(String specificationsId);
+    Integer deleteSpecifications(Integer specificationsId);
+
+    List<Integer> StandardIdDeleteSpecifications(List<Integer> deleteStandard);
+
+    Integer addSpecificationsInformation(AddSpecifications addStandardDto);
 }

--
Gitblit v1.9.3