From 72b971c98c46531064d74b68fc8fe8864ed0b544 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 08 Nov 2022 09:04:56 +0800
Subject: [PATCH] 大屏溯源统计次数sql修改

---
 src/main/java/org/springblade/modules/stockfactory/controller/StockfactoryController.java |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/stockfactory/controller/StockfactoryController.java b/src/main/java/org/springblade/modules/stockfactory/controller/StockfactoryController.java
index f9b5b99..0ad70ec 100644
--- a/src/main/java/org/springblade/modules/stockfactory/controller/StockfactoryController.java
+++ b/src/main/java/org/springblade/modules/stockfactory/controller/StockfactoryController.java
@@ -35,6 +35,8 @@
 import org.springblade.modules.stockfactory.service.IStockfactoryService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.util.List;
+
 /**
  * 农资厂家表 控制器
  *
@@ -79,6 +81,16 @@
 	@ApiOperation(value = "分页", notes = "传入stockfactory")
 	public R<IPage<StockfactoryVO>> page(StockfactoryVO stockfactory, Query query) {
 		IPage<StockfactoryVO> pages = stockfactoryService.selectStockfactoryPage(Condition.getPage(query), stockfactory);
+		return R.data(pages);
+	}
+	/**
+	 * 自定义分页 农资厂家表
+	 */
+	@GetMapping("/pages")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入stockfactory")
+	public R<List<StockfactoryVO>> pages(StockfactoryVO stockfactory) {
+		List<StockfactoryVO> pages = stockfactoryService.selectStockfactoryPages(stockfactory);
 		return R.data(pages);
 	}
 
@@ -137,8 +149,8 @@
 	 * @return
 	 */
 	@GetMapping("/selectStockIn")
-	public R selectStockIn() {
-		return R.data(stockfactoryService.selectStockIn());
+	public R selectStockIn(@RequestParam String name) {
+		return R.data(stockfactoryService.selectStockIn(name));
 	}
 
 

--
Gitblit v1.9.3