From 7b8cc84950a3caeb8cae5e99a7aa99c1aafa6ac7 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 22 二月 2024 14:18:17 +0800
Subject: [PATCH] 提交分架代码

---
 north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java |   18 +++++++++++++++---
 1 files changed, 15 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 aff3714..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,14 +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() {
-        return productMapper.defaultProduct();
+    public Map<String,Object> defaultDateProduct(Integer pageNum, Integer pageSize, List<String> glassType, Product product) {
+        Integer offset = (pageNum-1)*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