1. ocr 功能接口联调调整

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

@@ -47,6 +47,9 @@ public class NoteRecordDTO {
     @Schema(description = "供述开始时间")
     private String confessionStartTime;
 
+    @Schema(description = "证据状态 1:暂存 2：核实 3：提交")
+    private String imgRecordStatus;
+
     /**
      * 供述结束时间
      */

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

@@ -37,8 +37,8 @@ public class NoteRecordDetailDTO {
     @Schema(description = "笔录类型 0:文档 1:ocr图片识别")
     private String recordType;
 
-    @Schema(description = "是否已提交 0:否 1:是")
+    @Schema(description = "1:暂存 2：核实 3：提交")
-    private String submitted;
+    private String imgRecordStatus;
 
     /**
      * 笔录文件信息
@@ -143,6 +143,7 @@ public class NoteRecordDetailDTO {
         }else {
             this.fileList = new ArrayList<>(1);
         }
+        this.imgRecordStatus = noteRecordDTO.getImgRecordStatus();
     }
 
     public void setPercentageValue(CaseTaskRecord caseTaskRecord) {
@@ -181,12 +182,4 @@ public class NoteRecordDetailDTO {
         }
         this.recordType = "0";
     }
-
-    public void setSubmittedValue(CaseTaskRecord caseTaskRecord){
-        if (null == caseTaskRecord){
-            this.submitted = "0";
-            return;
-        }
-        this.submitted = StrUtil.equals(caseTaskRecord.getRecordId(), this.id) ? "1" : "0";
-    }
 }

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

@@ -295,7 +295,7 @@ public class NoteRecordSplitServiceImpl extends ServiceImpl<NoteRecordSplitMappe
         Map<String, CaseTaskRecord> taskRecordMap = taskList.stream().collect(Collectors.toMap(CaseTaskRecord::getRecordId, Function.identity(), (k1, k2) -> k1));
 
         List<RecordFileDTO> recordFileDTOS = fileOcrProcessService.queryFileList(fileIdList)
-                .stream().filter(file->StrUtil.isEmpty(file.getOcrId())).toList();
+                .stream().filter(file->StrUtil.isNotEmpty(file.getOcrId())).toList();
         setRecordDetailSerialNumber(noteRecordDetailDTOList);
         for (NoteRecordDetailDTO recordDetailDTO : noteRecordDetailDTOList) {
             // 获取文件的文件名称
@@ -305,7 +305,6 @@ public class NoteRecordSplitServiceImpl extends ServiceImpl<NoteRecordSplitMappe
             }
             recordDetailDTO.setPercentageValue(taskRecordMap.get(recordDetailDTO.getId()));
             recordDetailDTO.setRecordTypeValue(recordFileDTOS);
-            recordDetailDTO.setSubmittedValue(taskRecordMap.get(recordDetailDTO.getId()));
 
         }
         noteRecordDetailDTOList.sort(Comparator.comparing(NoteRecordDetailDTO::getSerialNumber));

src/main/resources/mapper/NoteRecordMapper.xml

@@ -16,6 +16,7 @@
                r.confession_material   as confessionMaterial,
                r.confession_start_time as confessionStartTime,
                r.confession_end_time   as confessionEndTime,
+               r.img_record_status     as imgRecordStatus,
                p.id_card               as idCard,
                r.create_time           as createTime,
                r.update_time           as updateTime