From ddf6452d487465e6fdfabc154bc46e0d2d0c6823 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 18 Jan 2024 12:26:21 +0800
Subject: [PATCH] bug 修复

---
 src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml |   19 ++++++++++---------
 1 files changed, 10 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 c022f78..87b7aff 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
@@ -172,11 +172,7 @@
             AND jtrfr.phone like concat('%',#{vo.phone},'%')
         </if>
         <if test="vo.confirmFlag != null">
-            AND (jtrfr.confirm_flag = #{vo.confirmFlag}
-            <if test="vo.confirmUserId != null and vo.roleName!='网格员'">
-                or jtrfr.confirm_user_id = #{vo.confirmUserId}
-            </if>
-            )
+            AND jtrfr.confirm_flag = #{vo.confirmFlag}
         </if>
 
         <if test="vo.status != null">
@@ -259,10 +255,12 @@
 
 
     <select id="getStatisticsCount" resultType="org.springblade.modules.task.vo.TaskReportStatistics">
-        SELECT
-        COUNT( 1 ) AS total,
-        ifnull(SUM( CASE WHEN STATUS = 10 THEN 1 ELSE 0 END ),0) AS handle
-        FROM jczz_task_report_for_repairs
+        ELECT
+        count( 1 ) AS total,
+        ifnull( sum( CASE WHEN STATUS = 10 THEN 1 ELSE 0 END ), 0 ) AS handle
+        FROM
+        jczz_task_report_for_repairs jtrfr
+        LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jtrfr.address_code
         WHERE is_deleted = 0
         <if test="userId != null">
             and create_user = #{userId}
@@ -271,6 +269,9 @@
         <if test="houseCode != null and houseCode != ''">
             and address_code = #{houseCode}
         </if>
+        <if test="neiCode != null and neiCode != ''">
+            AND jda.nei_code LIKE concat( #{neiCode}, '%' )
+        </if>
     </select>
 
 

--
Gitblit v1.9.3