1. 证据改造代码提交

src/main/java/com/supervision/police/controller/CaseEvidenceController.java

@@ -158,8 +158,9 @@ public class CaseEvidenceController {
     @Operation(summary = "查询证据详情-结果以树的方式展示")
     @GetMapping("/ocrAndExtract/details")
     public R<List<EvidenceDirectoryDTO>> evidenceDetails(@RequestParam("caseId") String caseId,
-                                                      @RequestParam(value = "batchNo",required = false) String batchNo) {
+                                                      @RequestParam(value = "batchNo",required = false) String batchNo,
-        List<EvidenceDirectoryDTO> evidenceDirectoryDTOS = caseEvidenceService.evidenceDetails(caseId,batchNo);
+                                                         @RequestParam(value = "evidenceId",required = false) String evidenceId) {
+        List<EvidenceDirectoryDTO> evidenceDirectoryDTOS = caseEvidenceService.evidenceDetails(caseId,batchNo,evidenceId);
         return R.ok(evidenceDirectoryDTOS);
     }
 

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

@@ -34,6 +34,11 @@ public class EvidenceCategoryDTO {
      */
     private String parentId;
 
+    /**
+     * 提示词id
+     */
+    private String promptId;
+
     /**
      * 提示词名称
      */

src/main/java/com/supervision/police/mapper/EvidenceFileMapper.java

@@ -21,7 +21,8 @@ public interface EvidenceFileMapper extends BaseMapper<EvidenceFile> {
 
     Page<EvidenceFileDTO> pageListFileInfo(@Param("evidenceIds") List<String> evidenceIds,@Param("page") Page<EvidenceFileDTO> page);
 
-    List<EvidenceFileDTO> listFileInfoByCaseIdAndBatchNo(@Param("caseId")String caseId,@Param("batchNo") String batchNo);
+    List<EvidenceFileDTO> queryFileInfoList(@Param("caseId")String caseId, @Param("batchNo") String batchNo,
+                                            @Param("evidenceId")String evidenceId, @Param("directoryId") String directoryId);
 }
 
 

src/main/java/com/supervision/police/service/CaseEvidenceService.java

@@ -74,6 +74,8 @@ public interface CaseEvidenceService  extends IService<CaseEvidence> {
 
     List<EvidenceDirectoryDTO> listFileTree(String caseId,String batchNo);
 
+    List<EvidenceDirectoryDTO> listFileTree(String caseId,String batchNo,String evidenceId,String directoryId);
+
 
     List<EvidenceDirectoryDTO> listDirectoryTree(String caseId);
 
@@ -133,7 +135,7 @@ public interface CaseEvidenceService  extends IService<CaseEvidence> {
 
     void verifyEvidence(VerifyEvidenceReqVO verifyEvidenceReqVO);
 
-    List<EvidenceDirectoryDTO> evidenceDetails(String caseId, String batchNo);
+    List<EvidenceDirectoryDTO> evidenceDetails(String caseId, String batchNo,String evidenceId);
 
     String generateDirectoryName(String caseId, String categoryId, String provider);
 

src/main/java/com/supervision/police/service/EvidenceFileService.java

@@ -20,5 +20,7 @@ public interface EvidenceFileService extends IService<EvidenceFile> {
 
     List<EvidenceFile> listByFileIds(List<String> fileIds);
 
-    List<EvidenceFileDTO> listFileInfoByCaseIdAndBatchNo(String caseId, String batchNo);
+    List<EvidenceFileDTO> queryFileInfoList(String caseId, String batchNo);
+
+    List<EvidenceFileDTO> queryFileInfoList(String caseId, String batchNo, String evidenceId, String directoryId);
 }

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

@@ -333,7 +333,19 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
         List<EvidenceDirectoryDTO> evidenceDirectoryDTOS = evidenceDirectoryService.listDirectoryTree(caseId);
 
 
-        evidenceDirectoryService.appendFile(evidenceDirectoryDTOS, evidenceFileService.listFileInfoByCaseIdAndBatchNo(caseId,batchNo));
+        evidenceDirectoryService.appendFile(evidenceDirectoryDTOS, evidenceFileService.queryFileInfoList(caseId,batchNo));
+
+        return evidenceDirectoryDTOS;
+    }
+
+    @Override
+    public List<EvidenceDirectoryDTO> listFileTree(String caseId, String batchNo, String evidenceId, String directoryId) {
+        Assert.notEmpty(caseId,"案件ID不能为空!");
+        List<EvidenceDirectoryDTO> evidenceDirectoryDTOS = evidenceDirectoryService.listDirectoryTree(caseId);
+
+
+        evidenceDirectoryService.appendFile(evidenceDirectoryDTOS,
+                evidenceFileService.queryFileInfoList(caseId,batchNo, evidenceId, directoryId));
 
         return evidenceDirectoryDTOS;
     }
@@ -575,8 +587,8 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
     }
 
     @Override
-    public List<EvidenceDirectoryDTO> evidenceDetails(String caseId, String batchNo) {
+    public List<EvidenceDirectoryDTO> evidenceDetails(String caseId, String batchNo,String evidenceId) {
-        List<EvidenceDirectoryDTO> evidenceDirectoryDTOS = listFileTree(caseId,batchNo);
+        List<EvidenceDirectoryDTO> evidenceDirectoryDTOS = listFileTree(caseId,batchNo,evidenceId,null);
 
         List<CaseEvidence> caseEvidenceList = this.lambdaQuery().eq(CaseEvidence::getCaseId, caseId).list();
         List<CategoryPromptDTO> categoryPromptDTOS = evidenceDirectoryService.listCategoryPrompt(caseId);
@@ -589,7 +601,7 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
             EvidenceDirectoryDTO evidenceDirectoryDTO = iterator.next();
             evidenceDirectoryDTO.setFileEvidence(caseEvidenceMap, categoryPromptMap);
             evidenceDirectoryDTO.removeEmptyDirectory();
-            if (CollUtil.isEmpty(evidenceDirectoryDTO.getChild())){
+            if (CollUtil.isEmpty(evidenceDirectoryDTO.getChild()) && CollUtil.isEmpty(evidenceDirectoryDTO.getFileInfoList())){
                 iterator.remove();
             }
         }

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

@@ -40,8 +40,13 @@ public class EvidenceFileServiceImpl extends ServiceImpl<EvidenceFileMapper, Evi
     }
 
     @Override
-    public List<EvidenceFileDTO> listFileInfoByCaseIdAndBatchNo(String caseId,String batchNo) {
+    public List<EvidenceFileDTO> queryFileInfoList(String caseId, String batchNo) {
-        return super.getBaseMapper().listFileInfoByCaseIdAndBatchNo(caseId,batchNo);
+        return super.getBaseMapper().queryFileInfoList(caseId,batchNo, null,null);
+    }
+
+    @Override
+    public List<EvidenceFileDTO> queryFileInfoList(String caseId, String batchNo, String evidenceId, String directoryId) {
+        return super.getBaseMapper().queryFileInfoList(caseId,batchNo, evidenceId,directoryId);
     }
 }
 

src/main/resources/mapper/EvidenceFileMapper.xml

@@ -44,7 +44,7 @@
         </where>
     </select>
 
-    <select id="listFileInfoByCaseIdAndBatchNo" resultType="com.supervision.police.dto.EvidenceFileDTO">
+    <select id="queryFileInfoList" resultType="com.supervision.police.dto.EvidenceFileDTO">
         select
         ef.file_id as fileId,
         ef.evidence_id as evidenceId,
@@ -63,6 +63,12 @@
             <if test="batchNo != null and batchNo != ''">
                 and ef.batch_no = #{batchNo}
             </if>
+        <if test="directoryId != null and directoryId != ''">
+            and ef.directory_id = #{directoryId}
+        </if>
+        <if test="evidenceId != null and evidenceId != ''">
+            and ef.evidence_id = #{evidenceId}
+        </if>
         </where>
     </select>
     <select id="pageListFileInfo" resultType="com.supervision.police.dto.EvidenceFileDTO">