From 01b846921613edfbccfb4f28a64db7af5ea78b07 Mon Sep 17 00:00:00 2001
From: xiebin <123456>
Date: Tue, 09 Aug 2022 17:54:48 +0800
Subject: [PATCH] 大屏市场流通增加查询条件
---
src/main/java/org/springblade/modules/sale/mapper/SaleMapper.java | 2 +-
src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml | 13 +++++++++++--
src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java | 4 ++--
src/main/java/org/springblade/modules/sale/service/ISaleService.java | 2 +-
src/main/java/org/springblade/modules/sale/controller/SaleController.java | 4 ++--
5 files changed, 17 insertions(+), 8 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 b6484b2..13e1f1f 100644
--- a/src/main/java/org/springblade/modules/sale/controller/SaleController.java
+++ b/src/main/java/org/springblade/modules/sale/controller/SaleController.java
@@ -202,8 +202,8 @@
* 按行政区统计市场流通
*/
@GetMapping("/selectMarketDistrict")
- public R selectMarketDistrict(String farmId) {
- return R.data(saleService.selectMarketDistrict(farmId));
+ public R selectMarketDistrict(String farmId,String startTime,String endTime) {
+ return R.data(saleService.selectMarketDistrict(farmId,startTime,endTime));
}
}
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 52966d1..962365d 100644
--- a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.java
+++ b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.java
@@ -50,5 +50,5 @@
*/
List<Map<Object,String>> selectMarketCirculate(@Param("sale") SaleVO sale);
- List<Map<Object,String>> selectMarketDistrict(String farmId);
+ List<Map<Object,String>> selectMarketDistrict(String farmId,String startTime,String endTime);
}
diff --git a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
index 343ed91..64d4e09 100644
--- a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
+++ b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
@@ -128,8 +128,17 @@
sys_sale sale
LEFT JOIN sys_district dis ON sale.sale_destination = dis.CODE
LEFT JOIN sys_land sl ON sl.id = sale.land_id
- WHERE
- YEAR ( sale_time ) = YEAR ( NOW( ) )
+ WHERE 1 = 1
+ <if test="startTime != null and startTime != ''">
+ and sale_time >= #{startTime}
+ </if>
+ <if test="endTime != null and endTime != ''">
+ and sale_time <= #{endTime}
+ </if>
+ <if test="startTime == null and endTime == null ">
+ and YEAR ( sale_time ) = YEAR ( NOW( ) )
+ </if>
+
<if test="farmId != null and farmId != ''">
and sl.farm_id = #{farmId}
</if>
diff --git a/src/main/java/org/springblade/modules/sale/service/ISaleService.java b/src/main/java/org/springblade/modules/sale/service/ISaleService.java
index ca71942..43af344 100644
--- a/src/main/java/org/springblade/modules/sale/service/ISaleService.java
+++ b/src/main/java/org/springblade/modules/sale/service/ISaleService.java
@@ -49,5 +49,5 @@
* @return
*/
List<Map<Object,String>> selectMarketCirculate(SaleVO sale);
- List<Map<Object,String>> selectMarketDistrict(String farmId);
+ List<Map<Object,String>> selectMarketDistrict(String farmId,String startTime,String endTime);
}
diff --git a/src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java b/src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java
index 1d69554..7425509 100644
--- a/src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java
+++ b/src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java
@@ -74,8 +74,8 @@
return baseMapper.selectMarketCirculate(sale);
}
@Override
- public List<Map<Object, String>> selectMarketDistrict(String farmId) {
- return baseMapper.selectMarketDistrict(farmId);
+ public List<Map<Object, String>> selectMarketDistrict(String farmId,String startTime,String endTime) {
+ return baseMapper.selectMarketDistrict(farmId,startTime,endTime);
}
}
--
Gitblit v1.9.3