From 23a211dcf2dfd0c33b5d1d07e95b0f0a4803107a Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Fri, 6 Sep 2024 14:42:09 +0800 Subject: [PATCH] =?UTF-8?q?1.=20ocr=20=E5=8A=9F=E8=83=BD=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=81=94=E8=B0=83=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../police/service/impl/NoteRecordSplitServiceImpl.java | 5 +++-- src/main/java/com/supervision/police/vo/NoteRecordReqVO.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/supervision/police/service/impl/NoteRecordSplitServiceImpl.java b/src/main/java/com/supervision/police/service/impl/NoteRecordSplitServiceImpl.java index 6815062..0694278 100644 --- a/src/main/java/com/supervision/police/service/impl/NoteRecordSplitServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/NoteRecordSplitServiceImpl.java @@ -294,12 +294,13 @@ public class NoteRecordSplitServiceImpl extends ServiceImpl taskList = caseTaskRecordService.lambdaQuery().eq(CaseTaskRecord::getCaseId, noteRecord.getCaseId()).list(); Map taskRecordMap = taskList.stream().collect(Collectors.toMap(CaseTaskRecord::getRecordId, Function.identity(), (k1, k2) -> k1)); - List recordFileDTOS = fileOcrProcessService.queryFileList(fileIdList); + List recordFileDTOS = fileOcrProcessService.queryFileList(fileIdList) + .stream().filter(file->StrUtil.isEmpty(file.getOcrId())).toList(); setRecordDetailSerialNumber(noteRecordDetailDTOList); for (NoteRecordDetailDTO recordDetailDTO : noteRecordDetailDTOList) { // 获取文件的文件名称 Set fileNameSet = recordDetailDTO.getFileList().stream().map(NoteRecordFileDTO::getFileName).collect(Collectors.toSet()); - if (StrUtil.isEmpty(recordDetailDTO.getConfessionMaterial())){ + if (StrUtil.isEmpty(recordDetailDTO.getConfessionMaterial()) || StrUtil.equals("null", recordDetailDTO.getConfessionMaterial())){ recordDetailDTO.setConfessionMaterial(CollUtil.join(fileNameSet, ";")); } recordDetailDTO.setPercentageValue(taskRecordMap.get(recordDetailDTO.getId())); diff --git a/src/main/java/com/supervision/police/vo/NoteRecordReqVO.java b/src/main/java/com/supervision/police/vo/NoteRecordReqVO.java index 5160050..bea46d8 100644 --- a/src/main/java/com/supervision/police/vo/NoteRecordReqVO.java +++ b/src/main/java/com/supervision/police/vo/NoteRecordReqVO.java @@ -74,7 +74,7 @@ public class NoteRecordReqVO { if (NumberUtil.isNumber(this.indexNum)){ noteRecord.setIndexNum(Integer.parseInt(this.indexNum)); } - // noteRecord.setConfessionMaterial(confessionMaterial); + noteRecord.setConfessionMaterial(confessionMaterial); noteRecord.setLawAsker(lawAsker); noteRecord.setConfessionStartTime(confessionStartTime); noteRecord.setConfessionEndTime(confessionEndTime); @@ -91,7 +91,7 @@ public class NoteRecordReqVO { Assert.notEmpty(fileIdList, "笔录文件id集合不能为空"); Assert.notBlank(confessionStartTime, "供述开始时间不能为空"); Assert.notBlank(confessionEndTime, " 供述结束时间不能为空"); - Assert.notBlank(recordName, "笔录名称不能为空"); + Assert.notBlank(confessionMaterial, "笔录名称不能为空"); }