From 725747cc82be171926ba1222ebfe98cfbcfeb6b3 Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Thu, 12 Feb 2026 14:45:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=85=E5=8A=9E=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fire/check/app/AppFireCheckListController.java |  2 +-
 .../check/command/query/FireCheckListQueryExe.java | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckListController.java b/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckListController.java
index 332d10e..c3e85b1 100644
--- a/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckListController.java
+++ b/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckListController.java
@@ -32,7 +32,7 @@ public class AppFireCheckListController {
     public PageResponse<FireCheckListCO> checkList(@RequestBody FireCheckListPageQry qry) {
         return fireCheckListService.appCheckList(qry);
     }
-    @ApiOperation("获取待排查数量")
+    @ApiOperation("获取待排查数量和打回数量")
     @PostMapping("/checkListCount")
     public SingleResponse<Integer> checkListCount(@RequestBody FireCheckListPageQry qry) {
         return SingleResponse.of(fireCheckListService.checkListCount(qry));
diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java
index 842a59a..577d9f0 100644
--- a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java
+++ b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java
@@ -152,12 +152,22 @@ public class FireCheckListQueryExe {
 
     }
     public Integer checkListCount(FireCheckListPageQry qry) {
+
+        //待办数
         Map<String, Object> params = PageQueryHelper.toHashMap(qry);
         PageResponse<FireCheckListDO> pageResponse = fireCheckListRepository.appCheckList(params);
-        if (CollUtil.isEmpty(pageResponse.getData())) {
+
+        //打回的数量
+
+        Map<String, Object> backParams = PageQueryHelper.toHashMap(qry);
+        backParams.put("userId",AuthContext.getUserId());
+        PageResponse<FireCheckListDO> backPageResponse = fireCheckListRepository.getBackChecKList(backParams);
+
+
+        if (CollUtil.isEmpty(pageResponse.getData()) && CollUtil.isEmpty(backPageResponse.getData())) {
             return 0;
         }else{
-            return pageResponse.getTotalCount();
+            return pageResponse.getTotalCount()+backPageResponse.getTotalCount();
         }
     }