From 636af7d0ed40549da7182569175e69068e5e937d Mon Sep 17 00:00:00 2001
From: “zhuo” <“zhuo@itcast.cn”>
Date: 星期三, 09 八月 2023 09:24:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 3a02fc6..cbf5b02 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,15 @@
*/
public interface ProductMapper extends BaseMapper<Product> {
- List<Product> selectProductByMaterialId(String materialId);
+ //鏍规嵁鐗╂枡id鏌ヨ妫�楠岄」鐩�
+ List<Map> selectProductByMaterialId(int materialId);
+
+ IPage<Map<String, Object>> pageProductInformation(String productCodeOrName, Integer specificationsId, Page<Objects> page);
+
+ Map<String, Object> selectOneChildren(Object father);
Map<String, Object> getProductInformation(Integer productId);
+
+ //閫氳繃椤圭洰鍚嶆煡璇㈤」鐩殑璇曢獙鏂规硶
+ List<Map> selectInstrumentByProname(String name);
}
--
Gitblit v1.9.3