Merge remote-tracking branch 'origin/dev' into dev

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

@@ -616,7 +616,7 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
         if (CollUtil.isEmpty(evidenceVerifyDTOS)) {
             return;
         }
-        List<CaseEvidenceDetailDTO> caseEvidenceDetailDTOS = queryEvidenceList(caseId, batchNo);
+        List<CaseEvidenceDetailDTO> caseEvidenceDetailDTOS = queryEvidenceList(caseId, null);
 
         Map<String, List<EvidenceVerifyDTO>> evidenceMap = evidenceVerifyDTOS.stream().collect(Collectors.groupingBy(EvidenceVerifyDTO::getEvidenceId));
         for (Map.Entry<String, List<EvidenceVerifyDTO>> entry : evidenceMap.entrySet()) {
@@ -643,13 +643,20 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
             // 调整顺序
             CaseEvidenceDetailDTO evidenceDetail = findEvidenceDetail(evidenceId, caseEvidenceDetailDTOS);
             if (evidenceDetail != null) {
-                List<String> list = value.stream().map(EvidenceVerifyDTO::getFileId).toList();
-                for (EvidenceFileDTO evidenceFileDTO : evidenceDetail.getFileList()) {
-                    evidenceFileDTO.setRank(findRank(list, evidenceFileDTO.getFileId()));
-                    evidenceFileService.lambdaUpdate().eq(EvidenceFile::getFileId, evidenceFileDTO.getFileId())
-                            .eq(EvidenceFile::getEvidenceId, evidenceId)
-                            .set(EvidenceFile::getRank, evidenceFileDTO.getRank()).update();
+                if (StrUtil.isNotEmpty(batchNo)){
+                    // 如果批次号为空，则对证据中所有文件进行重排序
+
+                }else {
+                    // 如果批次不为空，则只对当前批次的文件进行排序
+                    List<String> list = value.stream().map(EvidenceVerifyDTO::getFileId).toList();
+                    for (EvidenceFileDTO evidenceFileDTO : evidenceDetail.getFileList()) {
+                        evidenceFileDTO.setRank(findRank(list, evidenceFileDTO.getFileId()));
+                        evidenceFileService.lambdaUpdate().eq(EvidenceFile::getFileId, evidenceFileDTO.getFileId())
+                                .eq(EvidenceFile::getEvidenceId, evidenceId)
+                                .set(EvidenceFile::getRank, evidenceFileDTO.getRank()).update();
+                    }
                 }
+
             }
 
         }
@@ -934,7 +941,7 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
 
                         List<EvidenceFileDTO> updateFileList = new ArrayList<>();
                         // 新增的文件顺序排在原有文件的后面
-                        int initOrder = oldFileIds.size() - 1;
+                        int initOrder = oldFileIds.size();
                         for (String addFileId : tupleIdRecord.addFileList) {
                             EvidenceFileDTO evidenceFileDTO = new EvidenceFileDTO();
                             evidenceFileDTO.setFileId(addFileId);