From 7342c944e24f884a2ef7826bd6c9e0442b06d2a7 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 01 Jun 2022 17:18:09 +0800
Subject: [PATCH] 农事操作新增农产品绑定，采收修改，农产品种植修改，新增根据地块查询农产品
---
src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
index fef14ac..9c3815c 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -17,19 +17,25 @@
<select id="selectLandPage" resultMap="landResultMap">
SELECT l.land_name,
- l.land_area ,
- ST_ASTEXT(land_range) as land_range,
- l.url,
- d.dict_value as dic,
- c.dict_value as dica
+ l.land_area ,
+ ST_ASTEXT(land_range) as land_range,
+ l.url,
+ d.dict_value as dic,
+ c.dict_value as dica
FROM `sys_land` l
- LEFT JOIN (SELECT dict_key, dict_value FROM blade_dict_biz WHERE CODE = 'land' AND is_deleted = 0) d
- ON d.dict_key = l.land_type
- LEFT JOIN (SELECT dict_key, dict_value
- FROM blade_dict_biz
- WHERE CODE = 'landunit'
- AND is_deleted = 0) c ON c.dict_key = l.type
+ LEFT JOIN (SELECT dict_key, dict_value FROM blade_dict_biz WHERE CODE = 'land' AND is_deleted = 0) d
+ ON d.dict_key = l.land_type
+ LEFT JOIN (SELECT dict_key, dict_value
+ FROM blade_dict_biz
+ WHERE CODE = 'landunit'
+ AND is_deleted = 0) c ON c.dict_key = l.type
where l.is_deleted = 0
+ <if test="land.landType!=null and land.landType != ''">
+ and l.land_type = #{land.landType}
+ </if>
+ <if test="land.landName!=null and land.landName != ''">
+ and l.land_name like concat('%', #{land.landName},'%')
+ </if>
</select>
<insert id="saveLandInfo">
--
Gitblit v1.9.3