From 1e6e1c296add6c168eaa99a8a3e37a9f34d9a2dd Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 10 Jan 2024 10:20:31 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 127 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 124 insertions(+), 3 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 b9040d7..cc7e085 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -23,7 +23,7 @@
<select id="selectTaskPage" resultMap="taskResultMap">
SELECT
IFNULL( jda.address_name, jp.location ) AS address_name,
- jgr.district_code aoiCode,
+ IFNULL( jgr.district_code, ' ' ) aoiCode,
jda.region_code,
jg.community_code neiCode,
jc.street_code streetCode,
@@ -86,11 +86,19 @@
</if>
<if test="task.realName != null and task.realName != null">
- and bu.name = like concat('%', #{task.realName}, '%')
+ and bu.name like concat('%', #{task.realName}, '%')
</if>
<if test="task.phone != null and task.phone != null">
- and bu.phone = like concat('%', #{task.phone}, '%')
+ and bu.phone like concat('%', #{task.phone}, '%')
+ </if>
+
+ <if test="task.communityName != null and task.communityName != null">
+ and jc.name like concat('%', #{task.communityName}, '%')
+ </if>
+
+ <if test="task.districtName != null and task.districtName != null">
+ and jgr.district_name like concat('%', #{task.districtName}, '%')
</if>
<if test="task.frequency != null and task.frequency != ''">
@@ -204,6 +212,119 @@
</select>
+ <select id="getBailReportingPage" resultType="org.springblade.modules.task.vo.TaskVO">
+ SELECT
+ IFNULL( jda.address_name, jp.location ) AS address_name,
+ jtbre.apply_name,
+ jgr.district_code aoiCode,
+ jda.region_code,
+ jg.community_code neiCode,
+ jc.street_code streetCode,
+ bu.name realName,
+ bu.phone,
+ jt.id,
+ jt.NAME,
+ jt.type,
+ jt.frequency,
+ jt.remark,
+ jt.create_time,
+ jt.create_user,
+ jt.update_time,
+ jt.update_user,
+ jt.STATUS,
+ jt.tenant_id,
+ jt.create_dept,
+ jt.is_deleted,
+ jt.house_code,
+ jt.report_type
+ FROM
+ 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 = jt.house_code
+ LEFT JOIN blade_user bu on bu.id = jt.create_user
+ LEFT JOIN jczz_grid_range jgr on jgr.house_code= jt.house_code
+ LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id
+ LEFT JOIN jczz_community jc on jc.`code`= jg.community_code
+ LEFT JOIN jczz_task_bail_reporting_event jtbre on jtbre.task_id = jt.id
+ <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>
+
+ <if test="task.status != null and task.status != null">
+ and jt.status = #{task.status}
+ </if>
+
+ <if test="task.aoiCode != null and task.aoiCode != null">
+ and jgr.district_code = #{task.aoiCode}
+ </if>
+
+ <if test="task.neiCode != null and task.neiCode != null">
+ and jg.community_code = #{task.neiCode}
+ </if>
+
+ <if test="task.streetCode != null and task.streetCode != null">
+ and jc.street_code = #{task.streetCode}
+ </if>
+
+ <if test="task.realName != null and task.realName != null">
+ and bu.name like concat('%', #{task.realName}, '%')
+ </if>
+
+ <if test="task.phone != null and task.phone != null">
+ and bu.phone like concat('%', #{task.phone}, '%')
+ </if>
+
+ <if test="task.communityName != null and task.communityName != null">
+ and jc.name like concat('%', #{task.communityName}, '%')
+ </if>
+
+ <if test="task.districtName != null and task.districtName != null">
+ and jgr.district_name like concat('%', #{task.districtName}, '%')
+ </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>
+
+ and jt.is_deleted = 0
+ and jt.house_code is not null
+ order by jt.create_time desc
+ </where>
+ </select>
</mapper>
--
Gitblit v1.9.3