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.xml | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
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 11691b3..64d4e09 100644
--- a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
+++ b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
@@ -47,7 +47,7 @@
<if test="sale.strainId !=null and sale.strainId != '' ">
sale.strain_id = #{sale.strainId} AND
</if>
- sale.is_deleted = 0
+ sale.is_deleted = 0 ORDER BY sale.create_time DESC
</select>
@@ -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>
--
Gitblit v1.9.3