1. 修复证据改造bug

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

@@ -87,6 +87,8 @@ public class EvidenceProcessDTO {
         this.evidenceType = caseEvidence.getEvidenceType();
         if (StrUtil.isNotEmpty(caseEvidence.getProcessStatus())) {
             this.status = EvidenceConstants.PROCESS_STATUS_MAPPING.get(caseEvidence.getProcessStatus());
+        }else {
+            this.status = EvidenceConstants.PROCESS_STATUS_UNPROCESSED;
         }
     }
 

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

@@ -642,19 +642,20 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
             }
             // 调整顺序
             CaseEvidenceDetailDTO evidenceDetail = findEvidenceDetail(evidenceId, caseEvidenceDetailDTOS);
-            if (evidenceDetail != null) {
-                if (StrUtil.isNotEmpty(batchNo)){
-                    // 如果批次号为空，则对证据中所有文件进行重排序
 
-                }else {
+            if (evidenceDetail != null) {
+                List<EvidenceFileDTO> fileList = evidenceDetail.getFileList();
+                int initOrder = 0;
+                if (StrUtil.isNotEmpty(batchNo) && !CollUtil.isNotEmpty(fileList)){
                     // 如果批次不为空，则只对当前批次的文件进行排序
-                    List<String> list = value.stream().map(EvidenceVerifyDTO::getFileId).toList();
+                    initOrder = fileList.size();
-                    for (EvidenceFileDTO evidenceFileDTO : evidenceDetail.getFileList()) {
+                }
-                        evidenceFileDTO.setRank(findRank(list, evidenceFileDTO.getFileId()));
+                List<String> list = value.stream().map(EvidenceVerifyDTO::getFileId).toList();
-                        evidenceFileService.lambdaUpdate().eq(EvidenceFile::getFileId, evidenceFileDTO.getFileId())
+                for (EvidenceFileDTO evidenceFileDTO : evidenceDetail.getFileList()) {
-                                .eq(EvidenceFile::getEvidenceId, evidenceId)
+                    evidenceFileDTO.setRank(initOrder + findRank(list, evidenceFileDTO.getFileId()));
-                                .set(EvidenceFile::getRank, evidenceFileDTO.getRank()).update();
+                    evidenceFileService.lambdaUpdate().eq(EvidenceFile::getFileId, evidenceFileDTO.getFileId())
-                    }
+                            .eq(EvidenceFile::getEvidenceId, evidenceId)
+                            .set(EvidenceFile::getRank, evidenceFileDTO.getRank()).update();
                 }
 
             }