From 7e8b0e04d5b1cd492555517e30491ed6008f7b55 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 23 Feb 2024 18:32:19 +0800
Subject: [PATCH] 取保候审优化

---
 src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml |   17 ++++++++++++++---
 1 files changed, 14 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 971cc51..ece7291 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -182,13 +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 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'">
@@ -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