From 3df8757ade3bdef3b5a142c846680102589260bc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 13 Jul 2022 10:36:37 +0800
Subject: [PATCH] 农事操作，种植记录查询新增，地块，溯源码查询修改
---
src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 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..0d20db2 100644
--- a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
+++ b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="org.springblade.modules.sale.mapper.SaleMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="saleResultMap" type="org.springblade.modules.sale.entity.Sale">
+ <resultMap id="saleResultMap" type="org.springblade.modules.sale.vo.SaleVO">
<result column="id" property="id"/>
<result column="create_user" property="createUser"/>
<result column="create_dept" property="createDept"/>
@@ -18,13 +18,28 @@
<result column="sale_destination" property="saleDestination"/>
<result column="sale_destination1" property="saleDestination1"/>
<result column="sale_price" property="salePrice"/>
+ <result column="real_name" property="realName"/>
+ <result column="strain_name" property="strainName"/>
+ <result column="url" property="url"/>
+ <result column="district" property="district"/>
+ <result column="land_id" property="landId"/>
</resultMap>
<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 +71,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 +100,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