1. 修复证据改造bug

src/main/java/com/supervision/police/dto/EvidenceDirectoryDTO.java

@@ -193,6 +193,7 @@ public class EvidenceDirectoryDTO {
     public void appendChildFile(Map<String,List<EvidenceFileDTO>> fileMap){
         List<EvidenceFileDTO> evidenceFileDTOS = fileMap.get(this.id);
         if (CollUtil.isNotEmpty(evidenceFileDTOS)){
+            evidenceFileDTOS.sort(Comparator.comparingInt(EvidenceFileDTO::getRank));
             this.fileInfoList.addAll(evidenceFileDTOS);
         }else {
             if (CollUtil.isNotEmpty(this.getChild())){

src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java

@@ -198,6 +198,9 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
             caseEvidenceDetailDTO.setContentTypeValue(recordFileDTOS);
             EvidenceDirectoryDTO directory = evidenceDirectoryService.findDirectoryById(caseEvidence.getDirectoryId(), evidenceDirectoryDTOS);
             caseEvidenceDetailDTO.setEvidenceFormatValue(directory, null != queryDirectory && queryDirectory.getLevel() == 3);
+            if (null != queryDirectory && queryDirectory.getLevel() == 3 && StrUtil.isNotEmpty(caseEvidence.getFileName())){
+                caseEvidenceDetailDTO.setEvidenceName(caseEvidence.getFileName().split("\\.")[0]);
+            }
             return caseEvidenceDetailDTO;
         });
     }
@@ -577,8 +580,6 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
             List<EvidenceVerifyDTO> value = entry.getValue();
 
             // 更新证据属性
-            EvidenceDirectoryDTO directory = topDirectory.findDirectory(CollUtil.getFirst(value).getDirectoryId());
-
             this.lambdaUpdate().eq(CaseEvidence::getId, evidenceId)
                     .set(CaseEvidence::getProperty, JSONUtil.toJsonStr(CollUtil.getFirst(value).getProperties()))
                     .set(CaseEvidence::getTitle, CollUtil.getFirst(value).getTitle())
@@ -599,7 +600,7 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
                 for (EvidenceFileDTO evidenceFileDTO : evidenceDetail.getFileList()) {
                     evidenceFileDTO.setRank(findRank(list, evidenceFileDTO.getFileId()));
                     evidenceFileService.lambdaUpdate().eq(EvidenceFile::getFileId, evidenceFileDTO.getFileId())
-                            .eq(EvidenceFile::getEvidenceId, evidenceFileDTO.getEvidenceId())
+                            .eq(EvidenceFile::getEvidenceId, evidenceId)
                             .set(EvidenceFile::getRank, evidenceFileDTO.getRank()).update();
                 }
             }
@@ -673,7 +674,9 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
             EvidenceDirectoryDTO evidenceDirectoryDTO = iterator.next();
             evidenceDirectoryDTO.setFileEvidence(caseEvidenceMap, categoryPromptMap);
             evidenceDirectoryDTO.removeEmptyDirectory();
-            if (CollUtil.isEmpty(evidenceDirectoryDTO.getChild()) && CollUtil.isEmpty(evidenceDirectoryDTO.getFileInfoList())) {
+            List<EvidenceFileDTO> fileInfoList = evidenceDirectoryDTO.getFileInfoList();
+            if (CollUtil.isEmpty(evidenceDirectoryDTO.getChild()) && CollUtil.isEmpty(fileInfoList)) {
+                // 移除自身
                 iterator.remove();
             }
         }
@@ -808,7 +811,7 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
                     MinioFile minioFile = fileMap.get(fileId);
                     if (null != minioFile) {
                         // 证据名为文件名
-                        caseEvidenceDetailDTO.setEvidenceName(minioFile.getFilename());
+                        caseEvidenceDetailDTO.setEvidenceName(minioFile.getFilename().split("\\.")[0]);
                         evidenceFileDTO.setFileType(minioFile.getFileType());
                         evidenceFileDTO.setFileName(minioFile.getFilename());
                     }

src/main/resources/mapper/EvidenceFileMapper.xml

@@ -49,6 +49,7 @@
         ef.file_id as fileId,
         ef.evidence_id as evidenceId,
         ef.directory_id as directoryId,
+        ef.`rank` as rank,
         mf.filename as filename,
         mf.file_type as fileType,
         op.ocr_text as ocrText