From a6cc72176607a0950cbae2f0ff97d49e5725efd4 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 18 Jul 2022 17:41:44 +0800
Subject: [PATCH] 地块
---
src/main/java/org/springblade/modules/sale/controller/SaleController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 bc157cb..187b23e 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("当前库存不足！"));
@@ -152,10 +152,12 @@
/**
* 统计市场流通/去年流通量/本月流通量
+ * @param sale
+ * @return
*/
@GetMapping("/selectMarketCirculate")
- public R selectMarketCirculate() {
- return R.data(saleService.selectMarketCirculate());
+ public R selectMarketCirculate(SaleVO sale) {
+ return R.data(saleService.selectMarketCirculate(sale));
}
/**
@@ -165,4 +167,5 @@
public R selectMarketDistrict() {
return R.data(saleService.selectMarketDistrict());
}
+
}
--
Gitblit v1.9.3