From fb3aea33fbcb7e6ae278a38498c7badf4b7c1f28 Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Wed, 17 Jul 2024 15:10:18 +0800
Subject: [PATCH] =?UTF-8?q?1.=20pageListEvidence=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CaseEvidenceServiceImpl.java       | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

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 a861b80..9e34706 100644
--- a/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java
+++ b/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java
@@ -7,11 +7,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
 import com.supervision.police.daoService.CaseEvidenceDaoService;
 import com.supervision.police.daoService.EvidenceFileDaoService;
 import com.supervision.police.domain.CaseEvidence;
+import com.supervision.police.domain.ComDictionary;
 import com.supervision.police.domain.EvidenceFile;
 import com.supervision.police.dto.CaseEvidenceDetailDTO;
 import com.supervision.police.dto.EvidenceFileDTO;
 import com.supervision.police.service.CaseEvidenceService;
 import com.supervision.police.dto.CaseEvidenceDTO;
+import com.supervision.police.service.ComDictionaryService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -30,6 +32,8 @@ public class CaseEvidenceServiceImpl implements CaseEvidenceService {
 
     private final EvidenceFileDaoService evidenceFileDaoService;
 
+    private final ComDictionaryService comDictionaryService;
+
     @Override
     @Transactional(transactionManager = "dataSourceTransactionManager",rollbackFor = Exception.class)
     public String saveEvidence(CaseEvidenceDTO caseEvidenceDTO) {
@@ -119,7 +123,14 @@ public class CaseEvidenceServiceImpl implements CaseEvidenceService {
         Map<String, List<EvidenceFileDTO>> evidenceFileMap = fileInfoList.stream().collect(Collectors.groupingBy(EvidenceFileDTO::getEvidenceId));
 
         // 转换分页结果
-        return caseEvidencePage.convert(caseEvidence -> new CaseEvidenceDetailDTO(caseEvidence,evidenceFileMap.get(caseEvidence.getId())));
+        //查询字典
+        List<ComDictionary> evidenceTypeDic = comDictionaryService.lambdaQuery().eq(ComDictionary::getType, "evidence_type").list();
+        return caseEvidencePage.convert(caseEvidence -> {
+            CaseEvidenceDetailDTO caseEvidenceDetailDTO = new CaseEvidenceDetailDTO(caseEvidence, evidenceFileMap.get(caseEvidence.getId()));
+            caseEvidenceDetailDTO.setEvidenceTypeDesc(
+                    comDictionaryService.getName(evidenceTypeDic, "evidence_type", caseEvidence.getEvidenceType()));
+            return caseEvidenceDetailDTO;
+        });
     }
 
     @Override