Merge branch 'dev' of http://146.56.199.25:3000/zhuibobo/EnforcementCode-2.0 into dev

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfTodoItemController.java

@@ -82,42 +82,24 @@ public class AppEnfTodoItemController extends BaseController {
         // 2. 执法评价未读个数（暂时默认为0）
         statistics.setZfpjCount(0L);
 
-        // 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.getZfrwCount()
+                        + statistics.getZfyqCount();
         statistics.setTotalCount(totalCount);
+
         return R.ok(statistics);
     }
 }