From b738548b942265ec7fc487bdd2017d7d91da26f1 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Mon, 25 Dec 2023 14:50:30 +0800
Subject: [PATCH] 场所标签优化
---
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
index ceac40a..4783185 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -22,7 +22,7 @@
<select id="selectTaskPage" resultMap="taskResultMap">
SELECT
- jda.address_name,
+ IFNULL(jda.address_name,jp.localtion)address_name ,
jt.id,
jt.name,
jt.type,
@@ -36,16 +36,21 @@
jt.tenant_id,
jt.create_dept,
jt.is_deleted,
- jt.house_code
+ jt.house_code,
+ jt.report_type
FROM
jczz_gridman jgm
LEFT JOIN jczz_grid jg ON jgm.grid_id = jg.id
LEFT JOIN jczz_grid_range jgr ON jg.id = jgr.grid_id
LEFT JOIN jczz_task jt ON jgr.house_code = jt.house_code
LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jt.house_code
+ LEFT JOIN jczz_place jp on jp.house_code=jgr.house_code
WHERE
jgm.user_id = #{task.userId}
and jt.report_type in(2,3,4,5,6)
+ <if test="task.communityCode != null and task.communityCode != ''">
+ and jg.community_code = #{task.communityCode}
+ </if>
<if test="task.status != null and task.status != null">
and jt.status = #{task.status}
</if>
--
Gitblit v1.9.3