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/service/ProductService.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java
index 9264254..8fbb6af 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java
@@ -1,10 +1,13 @@
package com.yuanchu.limslaboratory.service;
+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.extension.service.IService;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
/**
@@ -16,19 +19,16 @@
* @since 2023-07-17
*/
public interface ProductService extends IService<Product> {
+ void deleteProductInformation(List<Integer> SpecificationsId);
- /*閫氳繃鐗╂枡id鑾峰彇鐗╂枡淇″強涓嬪睘鐨勯」鐩垪琛�*/
- List<Product> selectProductByMaterialId(int materialId);
+ IPage<Map<String, Object>> pageProductInformation(String productCodeOrName, Integer specificationsId, Page<Objects> page);
- Integer addProductInformation(Product product);
+ List<Map<String, Object>> pageFatherNameProductInformation(String fatherName);
- List<Map<String, Object>> getListProductInformation(String materialId);
-
- Map<String, Object> getProductInformation(Integer productId);
-
- Integer deleteProductInformation(Integer productId);
-
- void MaterialIdDeleteProduct(List<String> deleteMaterialId);
-
- Integer updateMaterialInformation(Product product);
+ /**
+ * 閫氳繃椤圭洰鍚嶆煡璇㈤」鐩殑璇曢獙鏂规硶
+ * @param name
+ * @return
+ */
+ List<Map> selectInstrumentByProname(String name);
}
--
Gitblit v1.9.3