From a00fd2fbe704de91fa77cf8c695f070938ef6d1c Mon Sep 17 00:00:00 2001
From: buaixuexideshitongxue <2936013465@qq.com>
Date: Wed, 18 Mar 2026 12:31:30 +0800
Subject: [PATCH] =?UTF-8?q?fix--=E6=94=AF=E6=8C=81=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/param/DataCaseVerifQueryParam.java   |  2 +-
 .../service/DataCaseVerifService.java         | 22 +++++++++++--------
 .../service/datav/DatavServiceImpl.java       |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/biutag/supervision/pojo/param/DataCaseVerifQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/DataCaseVerifQueryParam.java
index a816adb..e660589 100644
--- a/src/main/java/com/biutag/supervision/pojo/param/DataCaseVerifQueryParam.java
+++ b/src/main/java/com/biutag/supervision/pojo/param/DataCaseVerifQueryParam.java
@@ -27,7 +27,7 @@ public class DataCaseVerifQueryParam extends BasePage {
 
     private String distributionState;
 
-    private String checkStatus; // 是否属实
+    private List<String> checkStatus; // 是否属实
 
     private List<String> involvedIssue;
 
diff --git a/src/main/java/com/biutag/supervision/service/DataCaseVerifService.java b/src/main/java/com/biutag/supervision/service/DataCaseVerifService.java
index 0496381..6678f4c 100644
--- a/src/main/java/com/biutag/supervision/service/DataCaseVerifService.java
+++ b/src/main/java/com/biutag/supervision/service/DataCaseVerifService.java
@@ -25,10 +25,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @RequiredArgsConstructor
@@ -75,17 +72,20 @@ public class DataCaseVerifService extends ServiceImpl<DataCaseVerifMapper, DataC
         }
 
         // 是否属实：改查 negative.check_status_code
-        if (StrUtil.isNotBlank(queryParam.getCheckStatus())) {
+        if (CollectionUtil.isNotEmpty(queryParam.getCheckStatus())) {
             LambdaQueryWrapper<Negative> negativeWrapper = new LambdaQueryWrapper<>();
             negativeWrapper.select(Negative::getOriginId)
-                    .eq(Negative::getCheckStatusCode, queryParam.getCheckStatus());
+                    .in(Negative::getCheckStatusCode, queryParam.getCheckStatus());
 
             List<Negative> negativeList = negativeService.list(negativeWrapper);
-            List<String> originIds = negativeList.stream()
+            List<String> originIds = Optional.ofNullable(negativeList)
+                    .orElse(Collections.emptyList())
+                    .stream()
+                    .filter(Objects::nonNull)
                     .map(Negative::getOriginId)
                     .filter(StrUtil::isNotBlank)
                     .distinct()
-                    .toList();
+                    .collect(Collectors.toList());
 
             if (CollUtil.isEmpty(originIds)) {
                 return Page.<DataCaseVerif>of(queryParam.getCurrent(), queryParam.getSize())
@@ -108,7 +108,11 @@ public class DataCaseVerifService extends ServiceImpl<DataCaseVerifMapper, DataC
             wrapper.in(Negative::getOriginId, originIds)
                     .select(Negative::getOriginId, Negative::getCheckStatusCode);
             List<Negative> negatives = negativeService.list(wrapper);
-            Map<String, String> map = negatives.stream()
+            Map<String, String> map = Optional.ofNullable(negatives)
+                    .orElse(Collections.emptyList())
+                    .stream()
+                    .filter(Objects::nonNull)
+                    .filter(item -> StrUtil.isNotBlank(item.getOriginId()))
                     .collect(Collectors.toMap(
                             Negative::getOriginId,
                             Negative::getCheckStatusCode,
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 159efc5..fbd2a61 100644
--- a/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java
+++ b/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java
@@ -370,7 +370,7 @@ public class DatavServiceImpl implements DatavService {
         long ajhcCount = dataCaseVerifResourceService.count(ajhcQueryParam);
         // 局长信箱
         MailQueryParam mailQueryParam = new MailQueryParam();
-        mailQueryParam.setCreateTime(dates);
+        mailQueryParam.setMailTime(dates);
         long jzxxCount = mailResourceService.count(mailQueryParam);
 
         // 12337