From a6c70be014537e9b5ed48e68edaf3a1a94cb1ac7 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 23 一月 2024 11:48:58 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java
index dcb9cad..15f2563 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java
@@ -6,15 +6,26 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
@Service
-@DS("erp_sd")
+@DS("sd")
public class ProductService {
@Autowired
ProductMapper productMapper;
- public List<Product> defaultDateProduct(Integer pageNum,Integer pageSize) {
+ public Map<String,Object> defaultDateProduct(Integer pageNum, Integer pageSize, List<String> glassType, Product product) {
Integer offset = (pageNum-1)*pageSize;
- return productMapper.defaultProduct(offset,pageSize);
+ String glassTypeId = null;
+ if(glassType.size()>1){
+ glassTypeId = glassType.get(1);
+ }
+ Map<String,Object> map = new HashMap<>();
+ map.put("data",productMapper.defaultProduct(offset,pageSize,glassTypeId,product));
+ map.put("total",productMapper.getPageTotal(offset,pageSize,glassTypeId,product));
+ return map;
}
+
+
}
--
Gitblit v1.8.0