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/MaterialService.java | 27 ++++++---------------------
1 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java
index b355c3c..28e5a43 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java
@@ -15,37 +15,22 @@
* @since 2023-07-17
*/
public interface MaterialService extends IService<Material> {
+
List<Material> selectMaterialLimit(int pageSize,int countSize);
- Integer addMaterialInformation(Material material);
-
- /**
- * 渚ц竟鏍忕墿鏂欐暟鎹�
- * @param specificationsId
- * @return
- */
- List<Map<String, Object>> getListMaterialInformation(String specificationsId);
+ Map selectMaterialById(String materialId);
/**
* 鍒犻櫎绛変簬MaterialId鐨勬暟鎹�
* @param materialId
* @return
*/
- Integer deleteMaterialInformation(Integer materialId);
+ Integer deleteMaterialInformation(String materialId);
/**
- * 鏇存柊Material鐨勬暟鎹�
- * @param material
+ * 鍒犻櫎绛変簬SpecificationsId鐨勭墿鏂欐暟鎹�
+ * @param deleteSpecificationsId
* @return
*/
- Integer updateMaterialInformation(Material material);
-
- /**
- * 鍒犻櫎绛変簬SpecificationId鐨勬暟鎹�
- * @param specificationsId
- * @return
- */
- List<String> deleteMaterialEqSpecification(String specificationsId);
-
- Map selectMaterialById(String materialId);
+ List<String> specificationsIdDeleteMaterial(List<Integer> deleteSpecificationsId);
}
--
Gitblit v1.9.3