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/FarmPaperMapper.xml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farm/mapper/FarmPaperMapper.xml b/src/main/java/org/springblade/modules/farm/mapper/FarmPaperMapper.xml
index ba6efbd..ebabcbe 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmPaperMapper.xml
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmPaperMapper.xml
@@ -11,6 +11,9 @@
<if test="farmPaper.deptId!=null and farmPaper.deptId!=''">
and dept_id = #{farmPaper.deptId}
</if>
+ <if test="farmPaper.farmId!=null">
+ and farm_id = #{farmPaper.farmId}
+ </if>
<if test="farmPaper.name!=null and farmPaper.name!=''">
and name like concat('%',#{farmPaper.name},'%')
</if>
@@ -18,7 +21,10 @@
<!--查询相关检测信息-->
<select id="getFarmPaperList" resultType="org.springblade.modules.farm.vo.FarmPaperVO">
- select * from sys_farm_paper sfp where dept_id = #{deptId}
+ select * from sys_farm_paper
+ where 1=1
+ and (farm_id = #{farmId} and type != 3)
+ or (farm_id = #{farmPlantId} and type = 3)
</select>
</mapper>
--
Gitblit v1.9.3