From fdff4ca4813fc77a9006309ed4e5c232b4f3c85e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 22 Jul 2022 14:26:51 +0800
Subject: [PATCH] 返回数据新增农场全景地址
---
src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml | 56 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 35 insertions(+), 21 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..4a0bd48 100644
--- a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
+++ b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
@@ -60,8 +60,12 @@
IFNULL(SUM( CASE WHEN MONTH ( s.sale_time ) = 12 THEN s.sale_num * sale_price END ),0) AS '12'
FROM
sys_sale AS s
+ LEFT JOIN sys_land sl ON sl.id = s.land_id
WHERE
YEAR ( sale_time ) = YEAR ( NOW( ) )
+ <if test="farmId != null and farmId != ''">
+ and sl.farm_id = #{farmId}
+ </if>
</select>
<!--统计今年和去年的销售总额-->
@@ -69,37 +73,43 @@
SELECT
IFNULL( SUM( sale_num * sale_price), 0 ) AS num
FROM
- sys_sale
+ sys_sale ss
+ LEFT JOIN sys_land sl ON sl.id = ss.land_id
WHERE
- YEAR ( sale_time ) = YEAR ( NOW( )-1 ) UNION ALL
+ YEAR ( sale_time ) = YEAR ( NOW( )-1 )
+ <if test="sale.farmId != null and sale.farmId != ''">
+ and sl.farm_id = #{sale.farmId}
+ </if>
+ UNION ALL
SELECT
IFNULL( SUM( sale_num * sale_price ), 0 ) AS num
FROM
- sys_sale
+ sys_sale ss
+ LEFT JOIN sys_land sl ON sl.id = ss.land_id
WHERE
YEAR ( sale_time ) = YEAR ( date_sub( now( ), INTERVAL 1 YEAR ) )
+ <if test="sale.farmId != null and sale.farmId != ''">
+ and sl.farm_id = #{sale.farmId}
+ </if>
</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,
@@ -109,8 +119,12 @@
FROM
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( ) )
+ <if test="farmId != null and farmId != ''">
+ and sl.farm_id = #{farmId}
+ </if>
GROUP BY
dis.NAME,
dis.lat,
--
Gitblit v1.9.3