From d18eb5bd8b9cf93ba7adb4ee97fdcaccd3838e79 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 24 Aug 2022 10:36:10 +0800
Subject: [PATCH] 删除回滚完善，销售损耗添加字段type、prodId、地块选择数据返回增加库存量和面积
---
src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 4e647a7..2f5c3ad 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -228,11 +228,16 @@
</if>
</select>
- <select id="selectByStrainId" resultType="org.springblade.modules.lang.entity.Land">
- SELECT land.id,land.land_name,land.url,land.farm_id
+ <select id="selectByStrainId" resultType="org.springblade.modules.lang.vo.LandVO">
+ SELECT DISTINCT land.id,land.land_name,land.url,land.farm_id,fps.weight,
+ ( CASE WHEN land_unit = 2 THEN FORMAT(land.land_area * 0.0015,3) WHEN land_unit = 1 THEN land.land_area * 0.1 ELSE land.land_area END ) land_area
FROM sys_land land
LEFT JOIN sys_farm_product_stock fps ON fps.land_id = land.id
- WHERE fps.strain_id = #{strainId}
+ LEFT JOIN sys_farm_plant sfp ON sfp.land_id = land.id
+ WHERE 1=1
+ <if test="strainId !=null and strainId != ''">
+ AND fps.strain_id = #{strainId}
+ </if>
<if test="farmId !=null and farmId != '' ">
AND land.farm_id = #{farmId}
</if>
--
Gitblit v1.9.3