From 6e30c1a3f8ef0c4022bcfe1c3dc8169a6bd8368f Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 22 Aug 2022 09:07:21 +0800
Subject: [PATCH] 修复小程序产量统计根据产业查询功能

---
 src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml |    3 +++
 src/main/java/org/springblade/modules/recovery/vo/RecoveryVO.java        |    4 ++++
 2 files changed, 7 insertions(+), 0 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 c0f3f09..f496b0a 100644
--- a/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
+++ b/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
@@ -86,6 +86,9 @@
         <if test="recovery.endTime != null and recovery.endTime !=''">
             and DATE_FORMAT(sr.create_time,'%Y-%m-%d') &lt;= #{recovery.endTime}
         </if>
+        <if test="recovery.strainType != null and recovery.strainType !=''">
+            AND strain.strain_type = #{recovery.strainType}
+        </if>
         GROUP BY sr.strain_id
     </select>
 </mapper>
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 fc3212d..0bc2c2a 100644
--- a/src/main/java/org/springblade/modules/recovery/vo/RecoveryVO.java
+++ b/src/main/java/org/springblade/modules/recovery/vo/RecoveryVO.java
@@ -51,4 +51,8 @@
 	 * 结束时间
 	 */
 	private String endTime;
+	/**
+	 * 产业类型（0：种植业 1：水产业 2：禽畜业）
+	 */
+	private String strainType;
 }

--
Gitblit v1.9.3