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> evidenceFileMap = fileInfoList.stream().collect(Collectors.groupingBy(EvidenceFileDTO::getEvidenceId)); // 转换分页结果 - return caseEvidencePage.convert(caseEvidence -> new CaseEvidenceDetailDTO(caseEvidence,evidenceFileMap.get(caseEvidence.getId()))); + //查询字典 + List 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