From 3df8757ade3bdef3b5a142c846680102589260bc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 13 Jul 2022 10:36:37 +0800
Subject: [PATCH] 农事操作,种植记录查询新增,地块,溯源码查询修改

---
 src/main/java/org/springblade/modules/farm/mapper/FarmPaperMapper.xml |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/farm/mapper/StrainService.xml b/src/main/java/org/springblade/modules/farm/mapper/FarmPaperMapper.xml
similarity index 64%
rename from src/main/java/org/springblade/modules/farm/mapper/StrainService.xml
rename to src/main/java/org/springblade/modules/farm/mapper/FarmPaperMapper.xml
index d226dd9..0bd83c7 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/StrainService.xml
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmPaperMapper.xml
@@ -5,8 +5,11 @@
     <!--自定义查询农场检测报告/证书分页数据-->
     <select id="selectFarmPaperPage" resultType="org.springblade.modules.farm.vo.FarmPaperVO">
         select * from sys_farm_paper where 1=1
-        <if test="farmPaper.type!=null">
+        <if test="farmPaper.type!=null and farmPaper.type!=''">
             and type = #{farmPaper.type}
+        </if>
+        <if test="farmPaper.deptId!=null and farmPaper.deptId!=''">
+            and dept_id = #{farmPaper.deptId}
         </if>
         <if test="farmPaper.farmId!=null">
             and farm_id = #{farmPaper.farmId}
@@ -16,4 +19,9 @@
         </if>
     </select>
 
+    <!--查询相关检测信息-->
+    <select id="getFarmPaperList" resultType="org.springblade.modules.farm.vo.FarmPaperVO">
+        select * from sys_farm_paper sfp where dept_id = #{deptId}
+    </select>
+
 </mapper>

--
Gitblit v1.9.3