From fe371739b664c4e87914bcc7f3f550fec7e93121 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 Aug 2022 11:42:27 +0800
Subject: [PATCH] 保留农资退回记录，修复当农资库存为1时出库再退回，农资库存数据有误
---
src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
index cef2023..76b5872 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -26,7 +26,7 @@
c.dict_value as dica,
v.farm_name as deptname,
l.farm_id as farmId,
- l.land_type
+ l.land_type,l.type
FROM `sys_land` l
LEFT JOIN (SELECT dict_key, dict_value FROM blade_dict_biz WHERE CODE = 'land' AND is_deleted = 0 <if
test="land.tenantId!=null and land.tenantId != ''">
@@ -56,6 +56,9 @@
</if>
<if test="land.tenantId!=null and land.tenantId != ''">
and l.tenant_id =#{land.tenantId}
+ </if>
+ <if test="land.farmId !=null and land.farmId !=''">
+ AND l.farm_id = #{land.farmId}
</if>
</select>
@@ -155,7 +158,7 @@
<select id="selectLandList" resultType="java.util.HashMap">
select id, land_name as landName
from sys_land
- where dept_id = #{userid}
+ where farm_id = #{userid}
and is_deleted = 0
</select>
<!--土地总面积-->
@@ -228,5 +231,20 @@
AND land.farm_id = #{farmId}
</if>
</select>
+ <select id="getByStrainIdFarmId" resultType="org.springblade.modules.lang.entity.Land">
+ SELECT DISTINCT land.id,land.land_name,land.url,land.farm_id
+ FROM sys_land land
+ LEFT JOIN sys_farm_plant sfp ON sfp.land_id = land.id
+ WHERE land.is_deleted = 0
+ <if test="land.strainId !=null and land.strainId !=''">
+ AND sfp.strain_id = #{land.strainId}
+ </if>
+ <if test="land.farmId !=null and land.farmId != '' ">
+ AND land.farm_id = #{land.farmId}
+ </if>
+ <if test="land.sfpStatus !=null and land.sfpStatus !=''">
+ AND sfp.status = #{land.sfpStatus}
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.3