From faebe32c53e360a854d33a919ea612fea6b65a3e Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 18 Jul 2022 15:16:14 +0800
Subject: [PATCH] 地块
---
src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml | 10 +++++++---
src/main/java/org/springblade/modules/process/vo/ProcessVO.java | 1 +
src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml | 4 ++--
3 files changed, 10 insertions(+), 5 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 87a2960..f790a3a 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -23,7 +23,7 @@
l.url,
d.dict_value as dic,
c.dict_value as dica,
- v.dept_name as deptname
+ v.farm_name as deptname
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 +37,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}
diff --git a/src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml b/src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml
index a54cc03..374bda2 100644
--- a/src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml
+++ b/src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml
@@ -23,11 +23,15 @@
<select id="selectProcessPage" resultMap="processResultMap">
SELECT p.*,
- m.machining_type as processName,
- m.machining_tp AS tpurl
+ m.machining_type as processName,
+ m.machining_tp AS tpurl
FROM sys_process p
- LEFT JOIN sys_machining m ON m.id = p.process_id
+ LEFT JOIN sys_machining m ON m.id = p.process_id
+ LEFT JOIN sys_land sl ON sl.id = p.land_id
WHERE p.is_deleted = 0
+ <if test="process.farmId!=null and process.farmId!=''">
+ and sl.farm_id = #{process.farmId}
+ </if>
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/process/vo/ProcessVO.java b/src/main/java/org/springblade/modules/process/vo/ProcessVO.java
index 8cf266c..75f5d4d 100644
--- a/src/main/java/org/springblade/modules/process/vo/ProcessVO.java
+++ b/src/main/java/org/springblade/modules/process/vo/ProcessVO.java
@@ -39,4 +39,5 @@
*/
private String tpurl;
private String processName;
+ private String farmId;
}
--
Gitblit v1.9.3