From 82b9a4fe6d016a881aff972455badf1473312396 Mon Sep 17 00:00:00 2001
From: buaixuexideshitongxue <2936013465@qq.com>
Date: Fri, 27 Mar 2026 18:08:26 +0800
Subject: [PATCH] =?UTF-8?q?fix--=E7=BB=B4=E6=9D=83=E6=A1=88=E4=BB=B6?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=95=B0=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supervision/mapper/RpcApplyMapper.java    | 20 +++----------------
 .../mapper/RpcComfortPacksMapper.java         |  2 +-
 src/main/resources/mapper/RpcApplyMapper.xml  | 20 +++++++++++++++++++
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java b/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java
index 33ab300..5a01e41 100644
--- a/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java
@@ -143,23 +143,9 @@ public interface RpcApplyMapper extends BaseMapper<RpcApply> {
 
 
 
-    @Select("   select sdp.short_name as name ,COUNT(*) as value from rpc_apply ra " +
-            "   LEFT JOIN sup_depart sdp on ra.second_depart_id  = sdp.id " +
-            "   WHERE sdp.statistics_group_id = 3  " +
-            "   and ra.crt_time BETWEEN #{beginTime} and #{endTime} " +
-            "   GROUP BY sdp.short_name HAVING name is NOT NULL ")
-    List<EchartsVo> getIncidentOrg(Date beginTime, Date endTime);
-
-    @Select("SELECT * FROM rpc_apply ra  " +
-            "LEFT JOIN sup_depart sd on  ra.depart_id = sd.id " +
-            "LEFT JOIN sup_depart sdd on  sd.pid = sdd.id " +
-            "LEFT JOIN sup_depart sddd on sdd.pid = sddd.id " +
-            "WHERE ra.rpc_id is not null  " +
-            "AND ra.type =1 " +
-            "AND ra.crt_time >= #{beginTime} AND ra.crt_time <= #{endTime}  " +
-            "AND (sd.id =#{id} OR sdd.id=#{id} or sddd.id=#{id});")
-    List<RpcApply> getIncidentOrg(Date beginTime, Date endTime, String id);
-
+    Integer countIncidentOrg(@Param("beginTime") Date beginTime,
+                             @Param("endTime") Date endTime,
+                             @Param("id") String id);
 
     // 二级大屏
     @Select("SELECT   " +
diff --git a/src/main/java/com/biutag/supervision/mapper/RpcComfortPacksMapper.java b/src/main/java/com/biutag/supervision/mapper/RpcComfortPacksMapper.java
index b585094..75f6016 100644
--- a/src/main/java/com/biutag/supervision/mapper/RpcComfortPacksMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/RpcComfortPacksMapper.java
@@ -26,7 +26,7 @@ public interface RpcComfortPacksMapper extends BaseMapper<RpcComfortPacks> {
             "LEFT JOIN sup_depart sdd ON sd.pid = sdd.id " +
             "WHERE r.type=2 " +
             "AND r.rpc_status ='completed' " +
-            "AND r.apply_date > #{beginTime} AND r.apply_date <=#{endTime} " +
+            "AND r.apply_date >= #{beginTime} AND r.apply_date <=#{endTime} " +
             "AND sdd.statistics_group_id =#{i} " +
             "GROUP BY sdd.`name` " +
             "ORDER BY value desc")
diff --git a/src/main/resources/mapper/RpcApplyMapper.xml b/src/main/resources/mapper/RpcApplyMapper.xml
index 51d13a1..fa1bc15 100644
--- a/src/main/resources/mapper/RpcApplyMapper.xml
+++ b/src/main/resources/mapper/RpcApplyMapper.xml
@@ -34,4 +34,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  LEFT JOIN rpc_apply a on rap.rpc_id = a.rpc_id
             ${ew.getCustomSqlSegment}
     </select>
+
+
+    <select id="countIncidentOrg" resultType="java.lang.Integer">
+        SELECT COUNT(1)
+        FROM rpc_apply ra
+                 LEFT JOIN sup_depart sd ON ra.depart_id = sd.id
+                 LEFT JOIN sup_depart sdd ON sd.pid = sdd.id
+                 LEFT JOIN sup_depart sddd ON sdd.pid = sddd.id
+        WHERE ra.rpc_id IS NOT NULL
+          AND ra.type = 1
+          AND ra.verified = 0
+          AND ra.crt_time <![CDATA[>=]]> #{beginTime}
+          AND ra.crt_time <![CDATA[<=]]> #{endTime}
+          AND (
+            sd.id = #{id}
+                OR sdd.id = #{id}
+                OR sddd.id = #{id}
+            )
+    </select>
+
 </mapper>