From d3d9ae322dbf77dfc4731b785474f2449bb7f929 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 02 Jan 2024 19:07:26 +0800
Subject: [PATCH] 特殊号码处理
---
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 81 +++++++++++++++++++++-------------------
1 files changed, 43 insertions(+), 38 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 99e6683..4e1af03 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -45,44 +45,49 @@
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>
- <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>
- order by jt.create_time desc
+ <where>
+ <if test="task.userId != null and task.userId != ''">
+ and jgm.user_id = #{task.userId}
+ </if>
+ <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 != 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>
+ order by jt.create_time desc
+ </where>
</select>
--
Gitblit v1.9.3