From 924d018e6e6f15effbd272cead5dff67cd3b93a5 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 23 八月 2023 16:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java
index da22e00..5abf378 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java
@@ -1,11 +1,14 @@
package com.yuanchu.limslaboratory.mapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.Product;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
/**
* <p>
@@ -17,7 +20,11 @@
*/
public interface ProductMapper extends BaseMapper<Product> {
- List<Product> selectProductByMaterialId(int materialId);
+ //鏍规嵁鐗╂枡id鏌ヨ妫�楠岄」鐩�
+ List<Map> selectProductByMaterialId(int materialId);
- Map<String, Object> getProductInformation(Integer productId);
+ //灞曠ず璇ュ瀷鍙蜂笅鐨勬楠岄」鐩姹�
+ List<Map<String, Object>> pageProductInformation(Integer specificationsId);
+
+ void deleteList(String ids);
}
--
Gitblit v1.9.3