From 9d1892790a7a18d18c19b8b1cf643056d1547f01 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 13 Jul 2022 18:02:25 +0800
Subject: [PATCH] 农事操作，大屏统计接口调整，根据农场id 查询
---
src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml | 33 +++++++++++++++------------------
1 files changed, 15 insertions(+), 18 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 0d20db2..f4cd29c 100644
--- a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
+++ b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
@@ -81,25 +81,22 @@
</select>
<!--统计市场流通/去年流通量/本月流通量-->
<select id="selectMarketCirculate" resultType="java.util.HashMap" >
- SELECT
- IFNULL( SUM( sale_num ), 0 ) AS num
- FROM
- sys_sale
- WHERE
- YEAR ( sale_time ) = YEAR ( NOW( ) ) UNION ALL
- SELECT
- IFNULL( SUM( sale_num ), 0 ) AS num
- FROM
- sys_sale
- WHERE
- YEAR ( sale_time ) = YEAR ( date_sub( now( ), INTERVAL 1 YEAR ) ) UNION ALL
- SELECT
- IFNULL( SUM( sale_num ), 0 ) AS num
- FROM
- sys_sale
- WHERE
- DATE_FORMAT( sale_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
+ SELECT IFNULL( SUM( sale_num ), 0 ) AS num FROM sys_sale ss
+ left join sys_land sl on sl.id = ss.land_id
+ WHERE YEAR ( ss.sale_time ) = YEAR ( NOW())
+ and sl.farm_id = #{sale.farmId}
+ UNION ALL
+ SELECT IFNULL(SUM(sale_num), 0) AS num FROM sys_sale ss
+ left join sys_land sl on sl.id = ss.land_id
+ WHERE YEAR ( ss.sale_time ) = YEAR ( date_sub( now( ), INTERVAL 1 YEAR ) )
+ and sl.farm_id = #{sale.farmId}
+ UNION ALL
+ SELECT IFNULL( SUM( sale_num ), 0 ) AS num FROM sys_sale ss
+ left join sys_land sl on sl.id = ss.land_id
+ WHERE DATE_FORMAT( ss.sale_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
+ and sl.farm_id = #{sale.farmId}
</select>
+
<select id="selectMarketDistrict" resultType="java.util.HashMap" >
SELECT
IFNULL( SUM( sale_num ), 0 ) AS num,
--
Gitblit v1.9.3