From 32c6f61e38a8a05dc1334a003b6652e6687ed3db Mon Sep 17 00:00:00 2001
From: niujiyi <18272501226@163.com>
Date: Thu, 23 Jul 2026 10:18:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF-=E4=BB=A3=E5=8A=9E?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enforcement/AppEnfTodoItemController.java | 36 ++++++-------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfTodoItemController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfTodoItemController.java
index 487c61bf..e1984f44 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfTodoItemController.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfTodoItemController.java
@@ -85,39 +85,25 @@ public class AppEnfTodoItemController extends BaseController {
         // 3. 执法预告未读个数（暂时默认为0）
         statistics.setZfygCount(0L);
 
-        // 4. 计算总未读个数
-        Long totalCount = statistics.getPffwCount()
-                        + statistics.getZfpjCount()
-                        + statistics.getZfygCount();
-        statistics.setTotalCount(totalCount);
-
-        return R.ok(statistics);
-    }
-
-    /**
-     * 获取代办个数
-     * 返回执法预告，执法任务，执法预约的未读个数及总数
-     */
-    @SaIgnore
-    @GetMapping("/statisticsUnReadCountForEnforcement")
-    public R<TodoStatisticsVo> statisticsUnReadCountForEnforcement() {
-
-        TodoStatisticsVo statistics = new TodoStatisticsVo();
-
-        //1. 统计执法预告
+        //4. 统计执法预告
         Long zfygCount = cpNoticeMessageService.countUnreadNoticeMessageForCurrentUser();
         statistics.setZfygCount(zfygCount != null ? zfygCount : 0L);
-        //2. 统计执法任务
+        //5. 统计执法任务
         Long zfrwCount = efcodeCpTaskService.countUnreadTasksForCurrentUser();
         statistics.setZfrwCount(zfrwCount != null ? zfrwCount : 0L);
-        //3. 统计执法预约
+        //6. 统计执法预约
         Long zfyqCount = efcodeCpReserveService.countUnreadReservesForCurrentUser();
         statistics.setZfyqCount(zfyqCount != null ? zfyqCount : 0L);
 
-        Long totalCount = statistics.getZfygCount()
-            + statistics.getZfrwCount()
-            + statistics.getZfyqCount();
+        // 7. 计算总未读个数
+        Long totalCount = statistics.getPffwCount()
+                        + statistics.getZfpjCount()
+                        + statistics.getZfygCount()
+                        + statistics.getZfygCount()
+                        + statistics.getZfrwCount()
+                        + statistics.getZfyqCount();
         statistics.setTotalCount(totalCount);
+
         return R.ok(statistics);
     }
 }