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/TaskReportForRepairsMapper.xml |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
index 1b3ade3..b23021f 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
@@ -130,19 +130,28 @@
 
 
     <select id="getStatistics" resultType="java.lang.Integer">
-
         SELECT
-            count(1)
+        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_report_for_repairs jtr ON jgr.house_code = jtr.address_code
-                LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jtr.address_code
+        jczz_task_report_for_repairs jtr
+        LEFT JOIN jczz_doorplate_address jda ON jtr.address_code = jda.address_code
         WHERE
+        jtr.is_deleted = 0
+        <if test="neiCode != null and neiCode != ''">
+            and jda.nei_code = #{neiCode}
+        </if>
+        <if test="userId != null">
+            AND jtr.address_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 jtr.confirm_flag = 1
-          AND jgm.user_id = #{userId}
+            AND jgm.user_id = #{userId} )
+        </if>
 
     </select>
 

--
Gitblit v1.9.3