From c10d6358b9f014375a13821465bc978d0c0da22e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 May 2024 17:17:08 +0800
Subject: [PATCH] 通过E呼即办数据统计

---
 src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 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 ebd4d81..eee8477 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -29,8 +29,9 @@
         br.town_code streetCode,
         jp.principal as realName,
         jp.principal_phone as phone,
-        jp.nine_type ,
-        jp.front_type ,
+        jp.nine_type,
+        jp.front_type,
+        jp.place_name,
         jt.id,
         jt.NAME,
         jt.type,
@@ -60,7 +61,8 @@
                             <choose>
                                 <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
                                     and jh.grid_code in
-                                    <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+                                    <foreach collection="regionChildCodesList" item="code" open="(" close=")"
+                                             separator=",">
                                         #{code}
                                     </foreach>
                                 </when>
@@ -73,7 +75,8 @@
                             <choose>
                                 <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
                                     and br.village_code in
-                                    <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+                                    <foreach collection="regionChildCodesList" item="code" open="(" close=")"
+                                             separator=",">
                                         #{code}
                                     </foreach>
                                 </when>
@@ -419,7 +422,6 @@
                 and jt.report_type in (5,8)
             </if>
             and jt.is_deleted = 0
-            and jt.house_code is not null
         </where>
     </select>
 
@@ -463,11 +465,12 @@
         </where>
     </select>
 
+    <!--取保候审人员查询-->
     <select id="getBailReportingPage" resultType="org.springblade.modules.task.vo.TaskVO">
         SELECT
-        IFNULL( jda.address_name, jp.location ) AS address_name,
+        IFNULL( jda.address_name, jh.house_name ) AS address_name,
         jtbre.apply_name,
-        jgr.district_code aoiCode,
+        jh.district_code aoiCode,
         jda.region_code,
         jg.community_code neiCode,
         jc.street_code streetCode,
@@ -493,9 +496,9 @@
         FROM
         jczz_task jt
         LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jt.house_code
-        LEFT JOIN jczz_place jp ON jt.house_code = jp.house_code and jp.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_house jh ON jt.house_code = jh.house_code and jh.is_deleted = 0
+        LEFT JOIN jczz_grid jg on jg.grid_code = jh.grid_code and jg.is_deleted = 0
+        LEFT JOIN jczz_police_affairs_grid jpag on jh.jw_grid_code= jpag.jw_grid_code and jpag.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
         LEFT JOIN blade_user bu on bu.id = jtbre.check_user_id and bu.is_deleted = 0
@@ -521,7 +524,7 @@
             </if>
 
             <if test="task.aoiCode != null and task.aoiCode != null">
-                and jgr.district_code = #{task.aoiCode}
+                and jh.district_code = #{task.aoiCode}
             </if>
 
             <if test="task.neiCode != null and task.neiCode != null">
@@ -545,7 +548,7 @@
             </if>
 
             <if test="task.districtName != null and task.districtName != null">
-                and jgr.district_name like concat('%', #{task.districtName}, '%')
+                and jh.district_name like concat('%', #{task.districtName}, '%')
             </if>
 
             <if test="task.frequency != null and task.frequency != ''">

--
Gitblit v1.9.3