From ec09030f0730809145c97bfaa0bd0387a7d990bf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 19 Jul 2022 17:45:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/sale/mapper/SaleMapper.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.java b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.java
index f4df1f4..047ed48 100644
--- a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.java
+++ b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.sale.mapper;
+import org.apache.ibatis.annotations.Param;
import org.springblade.modules.sale.entity.Sale;
import org.springblade.modules.sale.vo.SaleVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -39,8 +40,15 @@
* @return
*/
List<SaleVO> selectSalePage(IPage page, SaleVO sale);
- Map<String, String> selctSaletCount();
- List<Map<Object,String>> selctSaletZ();
- List<Map<Object,String>> selectMarketCirculate();
- List<Map<Object,String>> selectMarketDistrict();
+ Map<String, String> selctSaletCount(String farmId);
+ List<Map<Object,String>> selctSaletZ(@Param("sale") SaleVO sale);
+
+ /**
+ * 统计市场流通/去年流通量/本月流通量
+ * @param sale
+ * @return
+ */
+ List<Map<Object,String>> selectMarketCirculate(@Param("sale") SaleVO sale);
+
+ List<Map<Object,String>> selectMarketDistrict(String farmId);
}
--
Gitblit v1.9.3