优化三元组提取

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

@@ -57,7 +57,7 @@ public class NoteRecordDetailDTO {
     /**
      * 供述材料
      */
-    private Integer confessionMaterial;
+    private String confessionMaterial;
 
     /**
      * 询问人
@@ -100,7 +100,7 @@ public class NoteRecordDetailDTO {
         this.personId = noteRecordDTO.getCasePersonId();
         this.name = noteRecordDTO.getName();
         this.role = noteRecordDTO.getRole();
-        this.confessionMaterial = noteRecordDTO.getConfessionMaterial();
+        this.confessionMaterial = String.valueOf(noteRecordDTO.getConfessionMaterial());
         this.lawAsker = noteRecordDTO.getLawAsker();
         this.confessionStartTime = noteRecordDTO.getConfessionStartTime();
         this.confessionEndTime = noteRecordDTO.getConfessionEndTime();

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

@@ -21,6 +21,7 @@ import com.supervision.minio.service.MinioService;
 import com.supervision.neo4j.service.Neo4jService;
 import com.supervision.police.domain.*;
 import com.supervision.police.dto.NoteRecordDTO;
+import com.supervision.police.dto.NoteRecordFileDTO;
 import com.supervision.police.vo.NoteRecordReqVO;
 import com.supervision.police.dto.NoteRecordDetailDTO;
 import com.supervision.police.mapper.NoteRecordSplitMapper;
@@ -251,6 +252,9 @@ public class NoteRecordSplitServiceImpl extends ServiceImpl<NoteRecordSplitMappe
             int fileCount = 0;
             for (NoteRecordDetailDTO recordDetailDTO : noteRecordDetailDTOS) {
                 fileCount = fileCount + recordDetailDTO.getFileList().size();
+                // 获取文件的文件名称
+                Set<String> fileNameSet = recordDetailDTO.getFileList().stream().map(NoteRecordFileDTO::getFileName).collect(Collectors.toSet());
+                recordDetailDTO.setConfessionMaterial(CollUtil.join(fileNameSet, ";"));
                 CaseTaskRecord caseTaskRecord = taskRecordMap.get(recordDetailDTO.getId());
                 if (ObjectUtil.isNotEmpty(caseTaskRecord)) {
                     if (caseTaskRecord.getStatus() == 2) {
@@ -271,7 +275,7 @@ public class NoteRecordSplitServiceImpl extends ServiceImpl<NoteRecordSplitMappe
             }
             noteRecordDetailDTO.setChildren(noteRecordDetailDTOS);
             // 统计所有children的文件数量
-            noteRecordDetailDTO.setConfessionMaterial(fileCount);
+            noteRecordDetailDTO.setConfessionMaterial(String.valueOf(fileCount));
             res.add(noteRecordDetailDTO);
         }
         List<NoteRecordDetailDTO> pager = ListUtils.Pager(size, page, res);