From f20b176a682080c7358578d11d1176aa88bb4efc Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 30 一月 2024 10:51:02 +0800
Subject: [PATCH] 修改实体
---
north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 20802d2..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,19 +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("sd")
public class ProductService {
@Autowired
ProductMapper productMapper;
- public List<Product> defaultDateProduct(Integer pageNum,Integer pageSize,List<String> glassType,Product product) {
+ 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);
}
- return productMapper.defaultProduct(offset,pageSize,glassTypeId,product);
+ 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