From e69229e91d9e44ae22a7fa97d85a1d2da1655a8d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 11 Jul 2022 16:52:08 +0800
Subject: [PATCH] 溯源记录修改
---
src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 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 854039b..7050b96 100644
--- a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
+++ b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
@@ -22,9 +22,19 @@
<select id="selectSalePage" resultMap="saleResultMap">
- select *
- from sys_sale
- where is_deleted = 0
+ SELECT
+ sale.*,
+ user.real_name,
+ strain.strain_name,
+ strain.url,
+ district.name as district
+ FROM
+ sys_sale sale
+ LEFT JOIN blade_user user on sale.create_user = user.id
+ LEFT JOIN sys_strain strain on sale.strain_id = strain.id
+ LEFT JOIN sys_district district on sale.sale_destination = district.code
+ WHERE
+ sale.is_deleted = 0
</select>
@@ -56,7 +66,7 @@
FROM
sys_sale
WHERE
- YEAR ( sale_time ) = YEAR ( NOW( ) ) UNION ALL
+ YEAR ( sale_time ) = YEAR ( NOW( )-1 ) UNION ALL
SELECT
IFNULL( SUM( sale_num * sale_price ), 0 ) AS num
FROM
@@ -85,5 +95,21 @@
WHERE
DATE_FORMAT( sale_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
</select>
+ <select id="selectMarketDistrict" resultType="java.util.HashMap" >
+ SELECT
+ IFNULL( SUM( sale_num ), 0 ) AS num,
+ dis.`name`,
+ dis.lat,
+ dis.lng
+ FROM
+ sys_sale sale
+ LEFT JOIN sys_district dis ON sale.sale_destination = dis.CODE
+ WHERE
+ YEAR ( sale_time ) = YEAR ( NOW( ) )
+ GROUP BY
+ dis.NAME,
+ dis.lat,
+ dis.lng
+ </select>
</mapper>
--
Gitblit v1.9.3