From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据，不设置网格信息
---
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 324 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 232 insertions(+), 92 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..768ae89 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -14,6 +14,7 @@
<result column="update_time" property="updateTime"/>
<result column="update_user" property="updateUser"/>
<result column="status" property="status"/>
+ <result column="source" property="source"/>
<result column="is_deleted" property="isDeleted"/>
<result column="house_code" property="houseCode"/>
<result column="report_type" property="reportType"/>
@@ -23,6 +24,220 @@
<select id="selectTaskPage" resultMap="taskResultMap">
SELECT
IFNULL( jda.address_name, jp.location ) AS address_name,
+ IFNULL( jgr.district_code, ' ' ) aoiCode,
+ jda.region_code,
+ jg.community_code neiCode,
+ jc.street_code streetCode,
+ jp.principal as realName,
+ jp.principal_phone as 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.source,
+ 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 locate(jt.house_code,jp.house_code)>0 and jp.is_deleted = 0
+ LEFT JOIN blade_user bu on bu.id = jt.create_user and bu.is_deleted = 0
+ LEFT JOIN jczz_grid_range jgr on jgr.house_code= jt.house_code
+ LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
+ LEFT JOIN jczz_community jc on jc.`code`= jg.community_code and jc.is_deleted = 0
+ <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="isAdministrator==2">
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and jg.community_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jg.community_code in ('')
+ </otherwise>
+ </choose>
+ </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.communityName != null and task.communityName != null">
+ and jc.name like concat('%', #{task.communityName}, '%')
+ </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.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,7)
+ </if>
+ <if test="task.reportType == null">
+ and jt.report_type in (2,3,4,5,6,7)
+ </if>
+ and jt.is_deleted = 0
+ and jt.house_code is not null
+ order by jt.create_time desc
+ </where>
+ </select>
+
+
+ <select id="selectTaskCount" resultType="int" parameterType="org.springblade.modules.task.vo.TaskVO">
+ SELECT
+ count( 1 )
+ FROM
+ jczz_task jt
+ LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jt.house_code
+ <where>
+ <if test="status != null">
+ and jt.status = #{status}
+ </if>
+ <if test="frequency != null">
+ and jt.frequency = #{frequency}
+ </if>
+ <if test="type != null">
+ and jt.type = #{type}
+ </if>
+ <!-- 取保候审 -->
+ <if test="reportType != null and reportType == 1 ">
+ and jt.report_type = 1
+ </if>
+ <!-- 场所店铺 -->
+ <if test="reportType != null and reportType == 2 ">
+ and jt.report_type in (2,3,4,5,6,7)
+ </if>
+
+ <if test="name != null and name != ''">
+ and jt.name like concat('%', #{name}, '%')
+ </if>
+ <if test="neiCode != null and neiCode != ''">
+ and jda.nei_code = #{neiCode}
+ </if>
+ <if test="userId != null">
+ 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
+ AND jgm.user_id = #{userId} )
+ </if>
+ </where>
+ order by jt.create_time desc
+ </select>
+
+
+ <select id="selectTaskPageBy" resultType="org.springblade.modules.task.vo.TaskVO">
+ SELECT
+ jt.* ,
+ jda.address_name
+ FROM
+ jczz_task jt
+ LEFT JOIN jczz_doorplate_address jda ON jt.house_code = jda.address_code
+ LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
+ <where>
+ <if test="task.reportType != null and task.reportType != '' and task.reportType == 1">
+ AND jt.report_type = #{task.reportType}
+ </if>
+
+ <if test="task.reportType == null or task.reportType == ''">
+ AND jt.report_type in (2,3,6,7)
+ </if>
+ <if test="task.userId != null and task.userId != ''">
+ AND jc.res_police_user_id like concat('%',#{task.userId},'%')
+ </if>
+ <if test="isAdministrator==2">
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and jc.code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jc.code in ('')
+ </otherwise>
+ </choose>
+ </if>
+ </where>
+ </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,
@@ -39,19 +254,19 @@
jt.update_time,
jt.update_user,
jt.STATUS,
- jt.tenant_id,
- jt.create_dept,
+ jt.source,
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_place jp ON locate(jt.house_code,jp.house_code)>0 and jp.is_deleted = 0
+ LEFT JOIN blade_user bu on bu.id = jt.create_user and bu.is_deleted = 0
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_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
+ LEFT JOIN jczz_community jc on jc.`code`= jg.community_code and jc.is_deleted = 0
+ LEFT JOIN jczz_task_bail_reporting_event jtbre on jtbre.task_id = jt.id and jtbre.is_deleted = 0
<where>
<if test="task.userId != null and task.userId != ''">
AND jt.house_code IN (
@@ -86,11 +301,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 != ''">
@@ -106,8 +329,6 @@
<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 != '' ">
@@ -117,92 +338,11 @@
<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
and jt.house_code is not null
order by jt.create_time desc
</where>
- </select>
-
-
- <select id="selectTaskCount" resultType="int" parameterType="org.springblade.modules.task.vo.TaskVO">
- SELECT
- count( 1 )
- FROM
- jczz_task jt
- LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jt.house_code
- <where>
- <if test="status != null">
- and jt.status = #{status}
- </if>
- <if test="frequency != null">
- and jt.frequency = #{frequency}
- </if>
- <if test="type != null">
- and jt.type = #{type}
- </if>
- <!-- 取保候审 -->
- <if test="reportType != null and reportType == 1 ">
- and jt.report_type = 1
- </if>
- <!-- 场所店铺 -->
- <if test="reportType != null and reportType == 2 ">
- and jt.report_type in (2,3,4,5,6)
- </if>
-
- <if test="name != null and name != ''">
- and jt.name like concat('%', #{name}, '%')
- </if>
- <if test="neiCode != null and neiCode != ''">
- and jda.nei_code = #{neiCode}
- </if>
- <if test="userId != null">
- 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
- AND jgm.user_id = #{userId} )
- </if>
- </where>
-
- order by jt.create_time desc
- </select>
-
-
- <select id="selectTaskPageBy" resultType="org.springblade.modules.task.vo.TaskVO">
-
- SELECT
- jt.* ,
- jda.address_name
- FROM
- jczz_task jt
- LEFT JOIN jczz_doorplate_address jda ON jt.house_code = jda.address_code
- LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
- <where>
- <if test="task.reportType != null and task.reportType != '' and task.reportType == 1">
- AND jt.report_type = #{task.reportType}
- </if>
-
- <if test="task.reportType == null or task.reportType == ''">
- AND jt.report_type in (2,3,6)
- </if>
- <if test="task.userId != null and task.userId != ''">
- AND jc.res_police_user_id = #{task.userId}
- </if>
- </where>
-
-
</select>
--
Gitblit v1.9.3