From 0062594a627cd1e013789cf459aedb48853665d7 Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Thu, 24 Oct 2024 15:03:52 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8D=E8=AF=81=E6=8D=AE?=
 =?UTF-8?q?=E6=94=B9=E9=80=A0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/supervision/police/dto/CaseEvidenceDetailDTO.java    | 5 ++++-
 .../police/service/impl/CaseEvidenceServiceImpl.java         | 4 +---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/supervision/police/dto/CaseEvidenceDetailDTO.java b/src/main/java/com/supervision/police/dto/CaseEvidenceDetailDTO.java
index 8a11862..db83630 100644
--- a/src/main/java/com/supervision/police/dto/CaseEvidenceDetailDTO.java
+++ b/src/main/java/com/supervision/police/dto/CaseEvidenceDetailDTO.java
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.supervision.common.constant.EvidenceConstants;
 import com.supervision.police.domain.CaseEvidence;
 import com.supervision.police.domain.FileEvidenceProperty;
 import com.supervision.police.handler.NotePromptExtractAttributesTypeHandler;
@@ -102,7 +103,9 @@ public class CaseEvidenceDetailDTO {
             this.evidenceName = caseEvidence.getEvidenceName();
             this.evidenceType = caseEvidence.getEvidenceType();
             this.provider = caseEvidence.getProvider();
-            this.processStatus = caseEvidence.getProcessStatus();
+            if (StrUtil.isNotEmpty(caseEvidence.getProcessStatus())){
+                this.processStatus = EvidenceConstants.PROCESS_STATUS_MAPPING.get(caseEvidence.getProcessStatus());
+            }
             this.fileId = caseEvidence.getFileId();
             this.directoryId = caseEvidence.getDirectoryId();
         }
diff --git a/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java b/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java
index 871d50c..5b15b3e 100644
--- a/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java
+++ b/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java
@@ -18,7 +18,6 @@ import com.supervision.police.mapper.CaseEvidenceMapper;
 import com.supervision.police.service.*;
 import com.supervision.police.vo.EvidenceDirectoryReqVO;
 import com.supervision.police.vo.VerifyEvidenceReqVO;
-import jakarta.annotation.Resource;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.aop.framework.AopContext;
@@ -573,13 +572,12 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
         }
         List<CaseEvidenceDetailDTO> caseEvidenceDetailDTOS = queryEvidenceList(caseId, batchNo);
 
-        EvidenceDirectoryDTO topDirectory = new EvidenceDirectoryDTO(listDirectoryTree(caseId));
         Map<String, List<EvidenceVerifyDTO>> evidenceMap = evidenceVerifyDTOS.stream().collect(Collectors.groupingBy(EvidenceVerifyDTO::getEvidenceId));
         for (Map.Entry<String, List<EvidenceVerifyDTO>> entry : evidenceMap.entrySet()) {
             String evidenceId = entry.getKey();
             List<EvidenceVerifyDTO> value = entry.getValue();
 
-            // 更新证据属性
+            // 更新证据属性 和 核实状态
             this.lambdaUpdate().eq(CaseEvidence::getId, evidenceId)
                     .set(CaseEvidence::getProperty, JSONUtil.toJsonStr(CollUtil.getFirst(value).getProperties()))
                     .set(CaseEvidence::getTitle, CollUtil.getFirst(value).getTitle())