From 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 13:30:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/StandardService.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/StandardService.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/StandardService.java
index 643d7cc..d851e08 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/StandardService.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/StandardService.java
@@ -2,7 +2,12 @@
import com.yuanchu.limslaboratory.pojo.Standard;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.limslaboratory.pojo.dto.AddStandardDto;
+import io.swagger.models.auth.In;
import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -16,9 +21,16 @@
/**
* 鏍规嵁鏍囧噯Id鍒犻櫎鏁版嵁
- * @param standardsId
+ * @param materialId
* @return
*/
+ List<Integer> deleteStandardsInformation(Integer materialId);
+
@Transactional(rollbackFor = Exception.class)
- Integer deleteStandardsInformation(String standardsId);
+ Integer deleteStandardInformation(Integer standardsId);
+
+ //浜岀骇鏂板
+ Integer addStandardInformation(AddStandardDto addStandardDto);
+
+ List<Map<String, Object>> getSpecificationIdAndName(String materialId);
}
--
Gitblit v1.9.3