From 981a3d85848753a799da2d909089c2fe4fcd3ccf Mon Sep 17 00:00:00 2001
From: zhongrj <123456>
Date: Mon, 18 Jul 2022 14:53:15 +0800
Subject: [PATCH] 农产品库存，操作人列表查询修改，溯源码详情查询修改，
---
src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml | 50 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 36 insertions(+), 14 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 da1e7a9..7bec563 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -30,13 +30,15 @@
AND blade_dict_biz.tenant_id = #{land.tenantId}
</if> ) d
ON d.dict_key = l.land_type
- LEFT JOIN (SELECT dict_key, dict_value
+ LEFT JOIN
+ (SELECT dict_key, dict_value
FROM blade_dict_biz
WHERE CODE = 'landunit'
- AND is_deleted = 0 <if
- test="land.tenantId!=null and land.tenantId != ''">
- AND blade_dict_biz.tenant_id = #{land.tenantId}
- </if> ) c ON c.dict_key = l.land_unit
+ AND is_deleted = 0
+ <if 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
where l.is_deleted = 0
<if test="land.landType!=null and land.landType != ''">
@@ -47,6 +49,9 @@
</if>
<if test="land.deptId!=null and land.deptId != ''">
and l.dept_id=#{land.deptId}
+ </if>
+ <if test="land.farmId!=null and land.farmId != ''">
+ and l.farm_id=#{land.farmId}
</if>
<if test="land.type!=null and land.type != ''">
and l.type=#{land.type}
@@ -63,7 +68,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 != ''">
@@ -144,8 +154,11 @@
<select id="selectZAre" resultType="java.util.HashMap">
SELECT IFNULL(land_area, 0) as area, IFNULL(land_unit, 0) as unit FROM sys_land
WHERE is_deleted = 0
- <if test="farmId!= null and farmId!=''">
- and farm_id=#{farmId}
+ <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>
<!--土地使用面积-->
@@ -154,8 +167,11 @@
FROM sys_land
WHERE is_deleted = 0
and type = 0
- <if test="farmId!= null and farmId!=''">
- and farm_id=#{farmId}
+ <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>
<!--土地未使用面积-->
@@ -164,8 +180,11 @@
FROM sys_land
WHERE is_deleted = 0
and type = 1
- <if test="farmId!= null and farmId!=''">
- and farm_id=#{farmId}
+ <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>
@@ -173,8 +192,11 @@
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="farmId!= null and farmId!=''">
- and sl.farm_id=#{farmId}
+ <if test="land.farmId!= null and land.farmId!=''">
+ and sl.farm_id=#{land.farmId}
+ </if>
+ <if test="land.deptId!= null and land.deptId!=''">
+ and sfp.dept_id=#{land.deptId}
</if>
GROUP BY sfp.strain_id
</select>
--
Gitblit v1.9.3