From eb55b4133ae6b3df80d8d14fbc5b32928f296fd7 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 26 Dec 2023 14:17:07 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 106 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 75 insertions(+), 31 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 52ca811..902b68e 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>
@@ -67,11 +72,11 @@
<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="reportType != null and reportType == 1 ">
+ <if test="task.reportType != null and task.reportType == 1 ">
and jt.report_type = 1
</if>
<!-- 场所店铺 -->
- <if test="reportType != null and reportType == 2 ">
+ <if test="task.reportType != null and task.reportType == 2 ">
and jt.report_type in (2,3,4,5,6)
</if>
@@ -81,37 +86,76 @@
<select id="selectTaskCount" resultType="int" parameterType="org.springblade.modules.task.vo.TaskVO">
- SELECT count(1)
+ SELECT
+ count( 1 )
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
- WHERE
- jgm.user_id = #{userId}
- <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>
+ <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="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