From af01675778013c044754d6bded36ba3cd65d36d1 Mon Sep 17 00:00:00 2001
From: xiebin <123456>
Date: Fri, 26 Aug 2022 10:17:12 +0800
Subject: [PATCH] 大屏地块查询返回种养品种图片
---
src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml b/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
index 04a8ed7..e83d95d 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
@@ -43,6 +43,7 @@
<if test="farmingRecord.farmId!=null and farmingRecord.farmId!=''">
and sl.farm_id = #{farmingRecord.farmId}
</if>
+ ORDER BY sfr.create_time DESC
</select>
<!--自定义查询农事记录分页数据-->
@@ -88,6 +89,7 @@
<if test="farmingRecord.farmId!=null and farmingRecord.farmId!=''">
and sl.farm_id = #{farmingRecord.farmId}
</if>
+ ORDER BY sfr.create_time DESC
</select>
<select id="selectFarmingRecordPages" resultType="org.springblade.modules.farm.vo.FarmingRecordVO">
@@ -165,7 +167,7 @@
left join sys_land sl on sl.id = sfr.land_id
WHERE
YEAR(sfr.time) = YEAR(NOW())
- AND sfr.stock_id != NULL
+ AND sfr.stock_id != ""
and sl.farm_id=#{farmId}
</select>
<!--去年农资使用量-->
@@ -260,4 +262,24 @@
</if>
order by sfr.time desc,sfr.create_time desc
</select>
+ <select id="getDetails" resultType="org.springblade.modules.farm.vo.FarmingRecordVO">
+ SELECT sfr.*,land.land_name,
+ bdb.dict_value AS typeName,
+ strain.strain_name AS strainName,
+ stock.agriculturalType,
+ stock.agricultural_name,
+ bu.name AS realName
+ FROM sys_farming_record sfr
+ LEFT JOIN sys_land land ON land.id = sfr.land_id
+ LEFT JOIN blade_dict_biz bdb ON bdb.dict_key = sfr.type
+ LEFT JOIN sys_strain strain ON strain.id = sfr.strain_id
+ LEFT JOIN (
+ SELECT stf.id,stf.agricultural_name,bdb1.dict_value AS agriculturalType
+ FROM sys_stockfactory stf
+ LEFT JOIN blade_dict_biz bdb1 ON stf.type = bdb1.dict_key
+ WHERE bdb1.code = "stockType" GROUP BY stf.id,stf.agricultural_name,bdb1.dict_value
+ ) stock ON sfr.stock_id = stock.id
+ LEFT JOIN blade_user bu ON bu.id = sfr.operator
+ WHERE bdb.code = "farmingType" AND sfr.id = #{FarmingRecordVO.id}
+ </select>
</mapper>
--
Gitblit v1.9.3