From 7f85ff7e882ed4d3d39c3261bc996af9cf656aa1 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 28 Feb 2024 14:26:19 +0800
Subject: [PATCH] 消息管理
---
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 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 931e37b..ece7291 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -29,6 +29,8 @@
br.town_code streetCode,
jp.principal as realName,
jp.principal_phone as phone,
+ jp.nine_type ,
+ jp.front_type ,
jt.id,
jt.NAME,
jt.type,
@@ -123,7 +125,7 @@
and br.town_code = #{task.streetCode}
</if>
<if test="task.realName != null and task.realName != null">
- and bu.name like concat('%', #{task.realName}, '%')
+ and jp.principal like concat('%', #{task.realName}, '%')
</if>
<if test="task.phone != null and task.phone != null">
and bu.phone like concat('%', #{task.phone}, '%')
@@ -147,8 +149,8 @@
AND jt.create_time BETWEEN #{task.startTime} and #{task.endTime}
</if>
<!-- 场所店铺 -->
- <if test="task.reportType != null and task.reportType == 2 ">
- and jt.report_type in (2,3,4,5,6,7,8)
+ <if test="task.reportType != null">
+ and jt.report_type = #{task.reportType}
</if>
<if test="task.reportType == null">
and jt.report_type in (2,3,4,5,6,7,8)
@@ -180,14 +182,17 @@
jt.source,
jt.is_deleted,
jt.house_code,
- jt.report_type
+ jt.report_type,
+ jtbre.start_time startTimes,
+ jtbre.reach_time,
+ jtbre.return_time
FROM
jczz_task jt
LEFT JOIN jczz_house jh ON jt.house_code=jh.house_code and jh.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_grid jg on jg.grid_code = jh.grid_code and jg.is_deleted = 0
LEFT JOIN blade_region br on br.code = jg.community_code
+ LEFT JOIN jczz_task_bail_reporting_event jtbre on jtbre.task_id = jt.id
<where>
<if test="task.roleName != null and task.roleName != ''">
<if test="task.roleName=='wgy'">
@@ -293,7 +298,6 @@
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>
@@ -350,11 +354,15 @@
<select id="selectTaskPageBy" resultType="org.springblade.modules.task.vo.TaskVO">
SELECT
jt.* ,
- jda.address_name
+ jda.address_name,
+ jtbre.start_time startTimes,
+ jtbre.reach_time,
+ jtbre.return_time
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
+ LEFT JOIN jczz_task_bail_reporting_event jtbre on jtbre.task_id = jt.id
<where>
<if test="task.reportType != null and task.reportType != '' and task.reportType == 1">
AND jt.report_type = #{task.reportType}
@@ -405,7 +413,10 @@
jt.source,
jt.is_deleted,
jt.house_code,
- jt.report_type
+ jt.report_type,
+ jtbre.start_time startTimes,
+ jtbre.reach_time,
+ jtbre.return_time
FROM
jczz_task jt
LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jt.house_code
--
Gitblit v1.9.3