From 64ce8e808e8b7dc95c79eecd9201d302d4335dfa Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 19 Jul 2022 17:45:16 +0800
Subject: [PATCH] 1、首页农场条件追加
---
src/main/java/org/springblade/modules/sale/controller/SaleController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/sale/controller/SaleController.java b/src/main/java/org/springblade/modules/sale/controller/SaleController.java
index 5582a92..522d9f9 100644
--- a/src/main/java/org/springblade/modules/sale/controller/SaleController.java
+++ b/src/main/java/org/springblade/modules/sale/controller/SaleController.java
@@ -112,7 +112,7 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入sale")
- public R submit(@Valid @RequestBody Sale sale) {
+ public R submit(@Valid @RequestBody SaleVO sale) {
boolean res = farmProductStockService.stockCompare(sale.getSaleNum(),sale.getStrainId());
if (!res){
throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前库存不足！"));
@@ -138,16 +138,16 @@
* 大屏销售统计
*/
@GetMapping("/selctSaletCount")
- public R selctSaletCount() {
- return R.data(saleService.selctSaletCount());
+ public R selctSaletCount(String farmId) {
+ return R.data(saleService.selctSaletCount(farmId));
}
/**
* 统计今年和去年的销售总额
*/
@GetMapping("/selctSaletZ")
- public R selctSaletZ() {
- return R.data(saleService.selctSaletZ());
+ public R selctSaletZ(SaleVO sale) {
+ return R.data(saleService.selctSaletZ(sale));
}
/**
@@ -164,8 +164,8 @@
* 按行政区统计市场流通
*/
@GetMapping("/selectMarketDistrict")
- public R selectMarketDistrict() {
- return R.data(saleService.selectMarketDistrict());
+ public R selectMarketDistrict(String farmId) {
+ return R.data(saleService.selectMarketDistrict(farmId));
}
}
--
Gitblit v1.9.3