From b860cb4a53c3c1e25dc9c462a2de34de54a77c9d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 13 May 2022 11:00:19 +0800
Subject: [PATCH] 农产品查询修改
---
src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml | 3 ++-
src/main/java/org/springblade/modules/farmplant/mapper/StrainMapper.xml | 6 ++++++
src/main/java/org/springblade/modules/farmplant/vo/FarmPlantVO.java | 10 ++++++++++
3 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml b/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
index 8e91a41..e5daf27 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
@@ -4,8 +4,9 @@
<!--自定义查询农场养殖记录分页数据-->
<select id="selectFarmPlantPage" resultType="org.springblade.modules.farmplant.vo.FarmPlantVO">
- select sfp.*,ss.strain_name strainName from sys_farm_plant sfp
+ select sfp.*,ss.strain_name strainName,url,sl.land_name landName from sys_farm_plant sfp
left join sys_strain ss on ss.id = sfp.strain_id
+ left join sys_land sl on sl.id = sfp.land_id
where 1=1
<if test="farmPlant.plant!=null and farmPlant.plant!=''">
and sfp.plant = #{farmPlant.plant}
diff --git a/src/main/java/org/springblade/modules/farmplant/mapper/StrainMapper.xml b/src/main/java/org/springblade/modules/farmplant/mapper/StrainMapper.xml
index 853111d..879db30 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/StrainMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/StrainMapper.xml
@@ -5,6 +5,12 @@
<!--自定义查询农场检测报告/证书分页数据-->
<select id="selectStrainPage" resultType="org.springblade.modules.farmplant.vo.StrainVO">
select * from sys_strain where 1=1
+ <if test="strain.strainType!=null and strain.strainType!=''">
+ and strain_type = #{strain.strainType}
+ </if>
+ <if test="strain.strainName!=null and strain.strainName!=''">
+ and strain_name like concat('%',#{strain.strainName},'%')
+ </if>
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/farmplant/vo/FarmPlantVO.java b/src/main/java/org/springblade/modules/farmplant/vo/FarmPlantVO.java
index 9573bca..ea8d0d2 100644
--- a/src/main/java/org/springblade/modules/farmplant/vo/FarmPlantVO.java
+++ b/src/main/java/org/springblade/modules/farmplant/vo/FarmPlantVO.java
@@ -17,4 +17,14 @@
*/
private String strainName;
+ /**
+ * 农产品图片 url
+ */
+ private String url;
+
+ /**
+ * 地块名称
+ */
+ private String landName;
+
}
--
Gitblit v1.9.3