From ad0bc4e763fa988a2ec4dd8dfab7381ea7726021 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 06 Jan 2024 17:46:48 +0800
Subject: [PATCH] 区划树查询修改
---
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 105 +++++++++++++++++++++++++++++-----------------------
1 files changed, 58 insertions(+), 47 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 284a3cc..8c46635 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -22,9 +22,9 @@
<select id="selectTaskPage" resultMap="taskResultMap">
SELECT
- IFNULL(jda.address_name,jp.location)address_name ,
+ IFNULL( jda.address_name, jp.location ) address_name,
jt.id,
- jt.name,
+ jt.NAME,
jt.type,
jt.frequency,
jt.remark,
@@ -32,59 +32,70 @@
jt.create_user,
jt.update_time,
jt.update_user,
- jt.status,
+ jt.STATUS,
jt.tenant_id,
jt.create_dept,
jt.is_deleted,
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
+ jczz_task jt
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>
- <if test="task.frequency != null and task.frequency != ''">
- and jt.frequency = #{task.frequency}
- </if>
- <if test="task.name != null and task.name != ''">
- and jt.name like concat('%', #{task.name}, '%')
- </if>
- <if test="task.id != null ">and jt.id = #{task.id}</if>
- <if test="task.type != null ">and jt.type = #{task.type}</if>
- <if test="task.remark != null and task.remark != ''">and jt.remark = #{task.remark}</if>
- <if test="task.createTime != null ">and jt.create_time = #{task.createTime}</if>
- <if test="task.createUser != null ">and jt.create_user = #{task.createUser}</if>
- <if test="task.updateTime != null ">and jt.update_time = #{task.updateTime}</if>
- <if test="task.updateUser != null ">and jt.update_user = #{task.updateUser}</if>
- <if test="task.tenantId != null and task.tenantId != ''">and jt.tenant_id = #{task.tenantId}</if>
- <if test="task.createDept != null ">and jt.create_dept = #{task.createDept}</if>
- <if test="task.isDeleted != null ">and jt.is_deleted = #{task.isDeleted}</if>
- <if test="task.houseCode != null and task.houseCode != ''">and jt.house_code = #{task.houseCode}</if>
- <if test="task.startTime != null and task.startTime != '' and task.endTime != null and task.endTime != '' ">
- AND jt.create_time BETWEEN #{task.startTime} and #{task.endTime}
- </if>
- <!-- 取保候审 -->
- <if test="task.reportType != null and task.reportType == 1 ">
- and jt.report_type = 1
- </if>
- <!-- 场所店铺 -->
- <if test="task.reportType != null and task.reportType == 2 ">
- and jt.report_type in (2,3,4,5,6)
- </if>
+ LEFT JOIN jczz_place jp ON jp.house_code = jt.house_code
+ <where>
+ <if test="task.userId != null and task.userId != ''">
+ AND jt.house_code IN (
+ SELECT
+ jgr.house_code
+ FROM
+ jczz_grid_range jgr
+ LEFT JOIN jczz_grid jg ON jg.id = jgr.grid_id
+ LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
+ WHERE
+ jg.is_deleted = 0
+ <if test="task.communityCode != null and task.communityCode != ''">
+ and jg.community_code = #{task.communityCode}
+ </if>
+ AND jgm.user_id = #{task.userId} )
+ </if>
- order by jt.create_time desc
-
+ <if test="task.status != null and task.status != null">
+ and jt.status = #{task.status}
+ </if>
+ <if test="task.frequency != null and task.frequency != ''">
+ and jt.frequency = #{task.frequency}
+ </if>
+ <if test="task.name != null and task.name != ''">
+ and jt.name like concat('%', #{task.name}, '%')
+ </if>
+ <if test="task.id != null ">and jt.id = #{task.id}</if>
+ <if test="task.type != null ">and jt.type = #{task.type}</if>
+ <if test="task.remark != null and task.remark != ''">and jt.remark = #{task.remark}</if>
+ <if test="task.createTime != null ">and jt.create_time = #{task.createTime}</if>
+ <if test="task.createUser != null ">and jt.create_user = #{task.createUser}</if>
+ <if test="task.updateTime != null ">and jt.update_time = #{task.updateTime}</if>
+ <if test="task.updateUser != null ">and jt.update_user = #{task.updateUser}</if>
+ <if test="task.tenantId != null and task.tenantId != ''">and jt.tenant_id = #{task.tenantId}</if>
+ <if test="task.createDept != null ">and jt.create_dept = #{task.createDept}</if>
+ <if test="task.isDeleted != null ">and jt.is_deleted = #{task.isDeleted}</if>
+ <if test="task.houseCode != null and task.houseCode != ''">and jt.house_code = #{task.houseCode}</if>
+ <if test="task.startTime != null and task.startTime != '' and task.endTime != null and task.endTime != '' ">
+ AND jt.create_time BETWEEN #{task.startTime} and #{task.endTime}
+ </if>
+ <!-- 取保候审 或 报事报修 -->
+ <if test="task.reportType != null and task.reportType != 2 ">
+ and jt.report_type = #{task.reportType}
+ </if>
+ <!-- 场所店铺 -->
+ <if test="task.reportType != null and task.reportType == 2 ">
+ and jt.report_type in (2,3,4,5,6)
+ </if>
+ <if test="task.reportType == null">
+ and jt.report_type in (2,3,4,5,6)
+ </if>
+ and jt.is_deleted = 0
+ order by jt.create_time desc
+ </where>
</select>
--
Gitblit v1.9.3