From b9f33a1db2b7039986354177abc7e8d1d1cf0a79 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 23 May 2022 10:38:00 +0800
Subject: [PATCH] 采收查询修改
---
src/main/java/org/springblade/modules/traceability/entity/Traceability.java | 5 +++++
src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml | 3 ++-
src/main/java/org/springblade/modules/recovery/vo/RecoveryVO.java | 5 +++++
3 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml b/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
index 6d290b5..7b2e2eb 100644
--- a/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
+++ b/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
@@ -4,8 +4,9 @@
<!--自定义查询采收记录分页数据-->
<select id="selectRecoveryPage" resultType="org.springblade.modules.recovery.vo.RecoveryVO">
- select sr.*,sl.land_name landName from sys_recovery sr
+ select sr.*,sl.land_name landName,ss.strain_name strainName from sys_recovery sr
left join sys_land sl on sl.id = sr.land_id
+ left join sys_strain ss on ss.id = sr.strain_id
where 1=1
<if test="recovery.strainId!=null and recovery.strainId!=''">
and sr.strain_id = #{recovery.strainId}
diff --git a/src/main/java/org/springblade/modules/recovery/vo/RecoveryVO.java b/src/main/java/org/springblade/modules/recovery/vo/RecoveryVO.java
index f6cef8e..0f5aae2 100644
--- a/src/main/java/org/springblade/modules/recovery/vo/RecoveryVO.java
+++ b/src/main/java/org/springblade/modules/recovery/vo/RecoveryVO.java
@@ -16,4 +16,9 @@
* 地块名称
*/
private String landName;
+
+ /**
+ * 农产品名称
+ */
+ private String strainName;
}
diff --git a/src/main/java/org/springblade/modules/traceability/entity/Traceability.java b/src/main/java/org/springblade/modules/traceability/entity/Traceability.java
index 5123024..a9ed88b 100644
--- a/src/main/java/org/springblade/modules/traceability/entity/Traceability.java
+++ b/src/main/java/org/springblade/modules/traceability/entity/Traceability.java
@@ -62,6 +62,11 @@
private Date createTime;
/**
+ * 重量
+ */
+ private String weight;
+
+ /**
* 溯源码编号
*/
private String code;
--
Gitblit v1.9.3