From 3f0e25410f5aa3f01fda3d2d6410d89dc74159f3 Mon Sep 17 00:00:00 2001 From: XiaoRuby <3114200645@qq.com> Date: 星期六, 19 八月 2023 15:16:25 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 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 572c272..f6b8b81 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 @@ -2,6 +2,11 @@ import com.yuanchu.limslaboratory.pojo.Material; import com.baomidou.mybatisplus.extension.service.IService; +import com.yuanchu.limslaboratory.pojo.dto.AddMaterialDto; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Map; /** * <p> @@ -13,4 +18,33 @@ */ public interface MaterialService extends IService<Material> { + List<Map> selectMaterialLimit(int pageSize,int countSize, int type); + + + /** + * 鍒犻櫎绛変簬MaterialId鐨勬暟鎹� + * @param materialId + * @return + */ + @Transactional(rollbackFor = Exception.class) + Integer deleteMaterialInformation(Integer materialId); + + /** + * 涓夌骇娣诲姞鍙傛暟 + */ + @Transactional(rollbackFor = Exception.class) + Integer addMaterialInformation(AddMaterialDto addMaterialDto); + + /** + * 鍥涚骇鍒嗗眰鏄剧ず + */ + List<Map<String, Object>> getFourLevelInformation(String specificationName); + + + /** + * 娣诲姞鎸囨爣-->閫夋嫨鏍峰搧鍚嶇О + * @return + */ + List<String> selectmater(); + } -- Gitblit v1.9.3