From 2648880bec1583ce4fe1886de65300f0a22638d0 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 26 Sep 2022 17:09:31 +0800
Subject: [PATCH] 更改种类描述的判断方式、溯源时地图详情sql调整、农资出库时删除数据回滚修复、大屏接受数据增加展示判断

---
 src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml |    6 ++++++
 1 files changed, 6 insertions(+), 0 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 e83d95d..2bad5bd 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
@@ -260,6 +260,12 @@
         <if test="farm.strainId!=null and farm.strainId!=''">
             and sfr.strain_id = #{farm.strainId}
         </if>
+        <if test="farm.startTime!=null and farm.startTime!=''">
+            and sfr.create_time &gt;= #{farm.startTime}
+        </if>
+        <if test="farm.endTime!=null and farm.endTime!=''">
+            and sfr.create_time &lt;= #{farm.endTime}
+        </if>
         order by sfr.time desc,sfr.create_time desc
     </select>
     <select id="getDetails" resultType="org.springblade.modules.farm.vo.FarmingRecordVO">

--
Gitblit v1.9.3