From 10a3de647d269809bc1d868390380196f3ebd489 Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Fri, 6 Mar 2026 09:18:17 +0800 Subject: [PATCH] =?UTF-8?q?fix--=20=E5=8A=9E=E7=BB=93=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervision/service/report/ReportDataServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/biutag/supervision/service/report/ReportDataServiceImpl.java b/src/main/java/com/biutag/supervision/service/report/ReportDataServiceImpl.java index 33c90a0..bde5673 100644 --- a/src/main/java/com/biutag/supervision/service/report/ReportDataServiceImpl.java +++ b/src/main/java/com/biutag/supervision/service/report/ReportDataServiceImpl.java @@ -2,6 +2,7 @@ package com.biutag.supervision.service.report; import cn.hutool.core.util.StrUtil; import com.biutag.supervision.constants.enums.CheckStatusEnum; +import com.biutag.supervision.constants.enums.ProcessingStatusEnum; import com.biutag.supervision.pojo.domain.NegativeVo; import com.biutag.supervision.pojo.dto.report.BusinessLineOverviewSection; import com.biutag.supervision.pojo.dto.report.OverviewSection; @@ -125,7 +126,7 @@ public class ReportDataServiceImpl implements ReportDataService { // 分县市局下发数据 List fxsjxfNegativeList = ztNegativeList.stream().filter(one -> Objects.equals(2, one.getCrtDepartLevel())).toList(); // 办结数据 - List bjNegativeList = ztNegativeList.stream().filter(one -> !Objects.isNull(one.getCompleteDate())).toList(); + List bjNegativeList = ztNegativeList.stream().filter(one -> ProcessingStatusEnum.completed.getLabel().equals(one.getProcessingStatus())).toList(); // 办结中属实数据 List bjssNegativeList = bjNegativeList.stream().filter(one -> CheckStatusEnum.TRUE_SET.contains(one.getCheckStatus())).toList(); // 办结中基本属实数据