From 1e159ffbf027d1c8a2de5a92ff257d3b02411415 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 06 Aug 2022 16:50:11 +0800
Subject: [PATCH] 修复使用农资后，已出库待使用农资数据不变。修复使用农资后还能删除出库数据
---
src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml | 93 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 76 insertions(+), 17 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 3a83ae7..fc1ed16 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -17,13 +17,16 @@
<select id="selectLandPage" resultMap="landResultMap">
SELECT l.land_name,
+ l.land_unit,
l.id,
l.land_area ,
ST_ASTEXT(land_range) as land_range,
l.url,
d.dict_value as dic,
c.dict_value as dica,
- v.dept_name as deptname
+ v.farm_name as deptname,
+ l.farm_id as farmId,
+ l.land_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 != ''">
@@ -37,7 +40,7 @@
test="land.tenantId!=null and land.tenantId != ''">
AND blade_dict_biz.tenant_id = #{land.tenantId}
</if> ) c ON c.dict_key = l.land_unit
- LEFT JOIN ( SELECT id, dept_name FROM blade_dept WHERE is_deleted = 0 ) v ON v.id = l.dept_id
+ LEFT JOIN ( SELECT id, farm_name FROM sys_farm ) v ON v.id = l.farm_id
where l.is_deleted = 0
<if test="land.landType!=null and land.landType != ''">
and l.land_type = #{land.landType}
@@ -63,7 +66,12 @@
land_name,
land_area,
ST_ASTEXT(land_range) as land_range,
- url
+ url,
+ type,
+ land_type,
+ land_unit,
+ dept_id,
+ farm_id
FROM sys_land
where is_deleted = 0
<if test="land.landType!=null and land.landType != ''">
@@ -130,6 +138,16 @@
type = #{land.type},
land_unit = #{land.landUnit},
farm_id = #{land.farmId},
+ url = #{land.url}
+ where id = #{land.id}
+ </update>
+
+ <update id="updateLandAr">
+ update sys_land set user_id = #{land.userId},
+ land_area = #{land.landArea},
+ <if test="land.landRange!=null and land.landRange!=''">
+ land_range = ST_GeomFromText(${land.landRange}),
+ </if>
url = #{land.url},
where id = #{land.id}
</update>
@@ -142,11 +160,10 @@
</select>
<!--土地总面积-->
<select id="selectZAre" resultType="java.util.HashMap">
- SELECT IFNULL(land_area, 0) as area, IFNULL(land_unit, 0) as unit
- FROM sys_land
+ SELECT IFNULL(land_area, 0) as area, IFNULL(land_unit, 0) as unit FROM sys_land
WHERE is_deleted = 0
- <if test="deptId!= null and deptId!=''">
- and dept_id=#{deptId}
+ <if test="land.farmId!= null and land.farmId!=''">
+ and farm_id=#{land.farmId}
</if>
</select>
<!--土地使用面积-->
@@ -155,8 +172,8 @@
FROM sys_land
WHERE is_deleted = 0
and type = 0
- <if test="deptId!= null and deptId!=''">
- and dept_id=#{deptId}
+ <if test="land.farmId!= null and land.farmId!=''">
+ and farm_id=#{land.farmId}
</if>
</select>
<!--土地未使用面积-->
@@ -165,18 +182,60 @@
FROM sys_land
WHERE is_deleted = 0
and type = 1
- <if test="deptId!= null and deptId!=''">
- and dept_id=#{deptId}
+ <if test="land.farmId!= null and land.farmId!=''">
+ and farm_id=#{land.farmId}
</if>
</select>
+
<select id="selectNum" resultType="java.util.HashMap">
- SELECT strain_id
- FROM `sys_farm_plant`
- WHERE status = 1
- <if test="deptId!= null and deptId!=''">
- and dept_id=#{deptId}
+ SELECT strain_id FROM sys_farm_plant sfp
+ left join sys_land sl on sl.id = sfp.land_id
+ WHERE sfp.status = 1
+ <if test="land.farmId!= null and land.farmId!=''">
+ and sl.farm_id=#{land.farmId}
</if>
- GROUP BY strain_id
+ <if test="land.deptId!= null and land.deptId!=''">
+ and sfp.dept_id=#{land.deptId}
+ </if>
+ GROUP BY sfp.strain_id
+ </select>
+
+ <!--查询统计地块是否有轮廓-->
+ <select id="getLandIsAreaStatistic" resultType="java.lang.Integer">
+ SELECT count(*) FROM sys_land where land_range is not null
+ <if test="land.farmId!= null and land.farmId!=''">
+ and farm_id=#{land.farmId}
+ </if>
+ <if test="land.deptId!= null and land.deptId!=''">
+ and dept_id=#{land.deptId}
+ </if>
+ union all
+ SELECT count(*) FROM sys_land where land_range is null
+ <if test="land.farmId!= null and land.farmId!=''">
+ and farm_id=#{land.farmId}
+ </if>
+ <if test="land.deptId!= null and land.deptId!=''">
+ and dept_id=#{land.deptId}
+ </if>
+ </select>
+
+ <select id="selectByStrainId" resultType="org.springblade.modules.lang.entity.Land">
+ SELECT land.id,land.land_name,land.url,land.farm_id
+ FROM sys_land land
+ LEFT JOIN sys_farm_product_stock fps ON fps.land_id = land.id
+ WHERE fps.strain_id = #{strainId}
+ <if test="farmId !=null and farmId != '' ">
+ AND land.farm_id = #{farmId}
+ </if>
+ </select>
+ <select id="getByStrainIdFarmId" resultType="org.springblade.modules.lang.entity.Land">
+ SELECT 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 sfp.strain_id = #{strainId}
+ <if test="farmId !=null and farmId != '' ">
+ AND land.farm_id = #{farmId}
+ </if>
</select>
</mapper>
--
Gitblit v1.9.3