From c6c30ead51b2ac1f7ffd4fb7e4b193c5d11d7bdf Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 27 七月 2023 16:02:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java
index 6cbc593..5b7371d 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java
@@ -22,7 +22,7 @@
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -45,8 +45,8 @@
}
@Override
- public IPage<Map<String, Object>> pageProductInformation(String productCodeOrName, Page<Objects> page) {
- IPage<Map<String, Object>> iPage = productMapper.pageProductInformation(productCodeOrName, page);
+ public IPage<Map<String, Object>> pageProductInformation(String productCodeOrName, Integer specificationsId, Page<Objects> page) {
+ IPage<Map<String, Object>> iPage = productMapper.pageProductInformation(productCodeOrName, specificationsId, page);
List<Map<String, Object>> maps = iPage.getRecords();
MyUtil.PrintLog(maps.toString());
maps.forEach(map -> {
@@ -71,4 +71,10 @@
wrapper.select(Product::getId, Product::getName, Product::getUnit, Product::getRequired, Product::getInternal);
return productMapper.selectMaps(wrapper);
}
+
+ //閫氳繃椤圭洰鍚嶆煡璇㈤」鐩殑璇曢獙鏂规硶
+ @Override
+ public List<Map> selectInstrumentByProname(String name) {
+ return productMapper.selectInstrumentByProname(name);
+ }
}
--
Gitblit v1.9.3