From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 六月 2025 11:54:00 +0800
Subject: [PATCH] 6.9新增登录失败冻结逻辑

---
 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/SuperviseService.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/SuperviseService.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/SuperviseService.java
index 1fcd03b..c0aae17 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/SuperviseService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/SuperviseService.java
@@ -5,7 +5,6 @@
 import com.panzhihua.common.exceptions.ServiceException;
 import com.panzhihua.common.model.vos.LoginUserInfoVO;
 import com.panzhihua.sangeshenbian.dao.ComplaintMapper;
-import com.panzhihua.sangeshenbian.dao.ComplaintRejectMapper;
 import com.panzhihua.sangeshenbian.model.entity.ComplaintAuditRecord;
 import com.panzhihua.sangeshenbian.model.entity.ComplaintProgress;
 import com.panzhihua.sangeshenbian.model.entity.SystemUserLevel;
@@ -83,7 +82,10 @@
         Map<Long, List<ComplaintAuditRecord>> finalAuditRecordListMap = auditRecordListMap;
         page.getRecords().forEach(item->{
             List<ComplaintAuditRecord> auditList = finalAuditRecordListMap.getOrDefault(item.getId(), CollUtil.newArrayList());
-            item.setReportCount((int) auditList.stream().filter(auditRecord -> auditRecord.getAuditType().equals(2)).count());
+            item.setReportCount((int) auditList.stream()
+                    .filter(auditRecord -> auditRecord.getAuditType().equals(2)
+                            && !auditRecord.getAuditStatus().equals(3)) //不统计撤回了的
+                    .count());
             item.setAssignmentCount((int) auditList.stream().filter(auditRecord -> auditRecord.getAuditType().equals(3)).count());
             List<ComplaintProgress> progressList = complaintProgressListMap.getOrDefault(item.getId(), CollUtil.newArrayList());
             item.setProgressCount(progressList.size());

--
Gitblit v1.7.1