From b7145c10db0d3ace368689edfebb850760632c79 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 27 七月 2023 15:13:14 +0800
Subject: [PATCH] LIMS管理系统框架-开发7-27第二次标准库完成修改
---
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java | 2 +-
standard-server/src/main/resources/mapper/ProductMapper.xml | 3 ++-
standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java | 2 +-
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java | 5 +++--
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java | 4 ++--
5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
index 48d6c63..5853e6a 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
@@ -33,11 +33,12 @@
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "pageNo", value = "璧峰椤�", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "pageSize", value = "姣忎竴椤垫暟閲�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "specificationsId", value = "瑙勬牸鍨嬪彿ID", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(value = "鍘熸潗鏂欑紪鐮�/鍘熸潗鏂欏悕绉�", name = "productCodeOrName", dataTypeClass = String.class)
})
@GetMapping("/page")
- public Result<?> pageProductInformation(Integer pageNo, Integer pageSize,String productCodeOrName) {
- IPage<Map<String, Object>> maps = productService.pageProductInformation(productCodeOrName, new Page<Objects>(pageNo, pageSize));
+ public Result<?> pageProductInformation(Integer pageNo, Integer pageSize, Integer specificationsId, String productCodeOrName) {
+ IPage<Map<String, Object>> maps = productService.pageProductInformation(productCodeOrName, specificationsId, new Page<Objects>(pageNo, pageSize));
Map<String, Object> map = new HashMap<>();
map.put("row", maps.getRecords());
map.put("total", maps.getTotal());
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 4536735..feb1d02 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
@@ -22,7 +22,7 @@
List<Product> selectProductByMaterialId(String materialId);
- IPage<Map<String, Object>> pageProductInformation(String productCodeOrName, Page<Objects> page);
+ IPage<Map<String, Object>> pageProductInformation(String productCodeOrName, Integer specificationsId, Page<Objects> page);
Map<String, Object> selectOneChildren(Object father);
}
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 d6b2662..7786a38 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
@@ -21,7 +21,7 @@
public interface ProductService extends IService<Product> {
void deleteProductInformation(List<Integer> SpecificationsId);
- IPage<Map<String, Object>> pageProductInformation(String productCodeOrName, Page<Objects> page);
+ IPage<Map<String, Object>> pageProductInformation(String productCodeOrName, Integer specificationsId, Page<Objects> page);
List<Map<String, Object>> pageFatherNameProductInformation(String fatherName);
}
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..4af7a12 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
@@ -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 -> {
diff --git a/standard-server/src/main/resources/mapper/ProductMapper.xml b/standard-server/src/main/resources/mapper/ProductMapper.xml
index 7596baa..8a2d7fd 100644
--- a/standard-server/src/main/resources/mapper/ProductMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductMapper.xml
@@ -5,8 +5,9 @@
<select id="pageProductInformation" resultType="map">
SELECT COUNT(1) num, p.`father`
FROM product p
+ WHERE p.`specifications_id` = #{specificationsId}
<if test="productCodeOrName != null and productCodeOrName != ''">
- WHERE p.`father` = #{productCodeOrName}
+ AND p.`father` = #{productCodeOrName}
</if>
GROUP BY p.`father`
</select>
--
Gitblit v1.9.3