From 20f397c1fff97a1082c4a662ea7ab8d24a551db5 Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Wed, 25 Mar 2026 15:25:25 +0800 Subject: [PATCH] =?UTF-8?q?fix--=E6=B6=89=E5=8F=8A=E4=BA=BA=E4=B8=8D?= =?UTF-8?q?=E5=AF=B9=E3=80=81=E5=AE=A1=E8=AE=A1=E6=94=B9=E4=B8=BA=E5=8A=9E?= =?UTF-8?q?=E7=BB=93=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/biutag/supervision/service/datav/DatavServiceImpl.java | 3 ++- .../supervision/service/subDatav/SubDatavServiceImpl.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java b/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java index dc2f730..75170a4 100644 --- a/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java +++ b/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java @@ -1470,6 +1470,7 @@ public class DatavServiceImpl implements DatavService { long leaderCount = negativeBlames.stream() .filter(one -> BlameType.personal.name().equals(one.getType())) + .filter(one -> StrUtil.isNotBlank(one.getBlameName())) .filter(one -> StrUtil.isNotBlank(one.getLeadName())) .flatMap(one -> splitValidAccountabilityResults(one.getLeadHandleResultName()).stream() .map(resultName -> one.getNegativeId() + "_" + one.getLeadName() + "_" + resultName)) @@ -1586,7 +1587,7 @@ public class DatavServiceImpl implements DatavService { ); long numerator = negativeListData.stream() - .filter(one -> "1".equals(one.getIsRectifyCode())) + .filter(item -> ProcessingStatusEnum.completed.name().equals(item.getProcessingStatus())) .count(); long denominator = negativeListData.size(); AuditNegativeVo vo = new AuditNegativeVo(); diff --git a/src/main/java/com/biutag/supervision/service/subDatav/SubDatavServiceImpl.java b/src/main/java/com/biutag/supervision/service/subDatav/SubDatavServiceImpl.java index 77a8d42..2d97f23 100644 --- a/src/main/java/com/biutag/supervision/service/subDatav/SubDatavServiceImpl.java +++ b/src/main/java/com/biutag/supervision/service/subDatav/SubDatavServiceImpl.java @@ -1246,6 +1246,7 @@ public class SubDatavServiceImpl implements SubDatavService { long leaderCount = negativeBlames.stream() .filter(one -> BlameType.personal.name().equals(one.getType())) + .filter(one -> StrUtil.isNotBlank(one.getBlameName())) .filter(one -> StrUtil.isNotBlank(one.getLeadName())) .flatMap(one -> splitValidAccountabilityResults(one.getLeadHandleResultName()).stream() .map(resultName -> one.getNegativeId() + "_" + one.getLeadName() + "_" + resultName))