From d2ce4553e18131b9a60d7be53c496f0cbce699ca Mon Sep 17 00:00:00 2001 From: Fixiaobai <fixiaobai@163.com> Date: 星期五, 08 九月 2023 14:47:47 +0800 Subject: [PATCH] 修改bug --- standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 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 e8b6dc5..48ac847 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,9 @@ import com.yuanchu.limslaboratory.pojo.Material; import com.baomidou.mybatisplus.extension.service.IService; +import com.yuanchu.limslaboratory.pojo.ProductModel; +import com.yuanchu.limslaboratory.pojo.dto.AddMaterialDto; +import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Map; @@ -16,33 +19,34 @@ */ public interface MaterialService extends IService<Material> { - Integer addMaterialInformation(Material material); + List<Map> selectMaterialLimit(int pageSize,int countSize, int type); - /** - * 渚ц竟鏍忕墿鏂欐暟鎹� - * @param specificationsId - * @return - */ - List<Map<String, Object>> getListMaterialInformation(String specificationsId); /** * 鍒犻櫎绛変簬MaterialId鐨勬暟鎹� * @param materialId * @return */ + @Transactional(rollbackFor = Exception.class) Integer deleteMaterialInformation(Integer materialId); /** - * 鏇存柊Material鐨勬暟鎹� - * @param material - * @return + * 涓夌骇娣诲姞鍙傛暟 */ - Integer updateMaterialInformation(Material material); + @Transactional(rollbackFor = Exception.class) + Integer addMaterialInformation(AddMaterialDto addMaterialDto); /** - * 鍒犻櫎绛変簬SpecificationId鐨勬暟鎹� - * @param specificationsId + * 鍥涚骇鍒嗗眰鏄剧ず + */ + List<Map<String, Object>> getFourLevelInformation(); + + + /** + * 娣诲姞鎸囨爣-->閫夋嫨鏍峰搧鍚嶇О * @return */ - List<String> deleteMaterialEqSpecification(String specificationsId); + List<String> selectmater(); + + List<ProductModel> getSample(); } -- Gitblit v1.9.3