From 3808fd57df8860d8f954954daf35cf7a2180f412 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Thu, 17 Oct 2024 14:23:00 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E8=AF=81=E6=8D=AE=E6=94=B9=E9=80=A0?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/EvidenceConstants.java | 18 ++++ .../controller/CaseEvidenceController.java | 49 ++++++++--- .../police/dto/CaseEvidenceDetailDTO.java | 23 +++++ .../police/dto/EvidenceDirectoryDTO.java | 24 ++++++ .../police/dto/EvidenceProcessDTO.java | 5 +- .../police/service/CaseEvidenceService.java | 12 ++- .../service/impl/CaseEvidenceServiceImpl.java | 85 +++++++++++++++++-- .../impl/EvidenceDirectoryServiceImpl.java | 22 +---- .../police/vo/EvidenceDirectoryReqVO.java | 24 ++++++ .../police/vo/OcrAndExtractReqVO.java | 14 +++ .../police/vo/VerifyEvidenceReqVO.java | 25 ++++++ .../resources/mapper/CaseEvidenceMapper.xml | 1 + 12 files changed, 264 insertions(+), 38 deletions(-) create mode 100644 src/main/java/com/supervision/police/vo/EvidenceDirectoryReqVO.java create mode 100644 src/main/java/com/supervision/police/vo/OcrAndExtractReqVO.java create mode 100644 src/main/java/com/supervision/police/vo/VerifyEvidenceReqVO.java diff --git a/src/main/java/com/supervision/common/constant/EvidenceConstants.java b/src/main/java/com/supervision/common/constant/EvidenceConstants.java index 8850d35..5a28eef 100644 --- a/src/main/java/com/supervision/common/constant/EvidenceConstants.java +++ b/src/main/java/com/supervision/common/constant/EvidenceConstants.java @@ -1,5 +1,7 @@ package com.supervision.common.constant; +import java.util.Map; + public class EvidenceConstants { // 证据处理状态 /** @@ -31,4 +33,20 @@ public class EvidenceConstants { */ public static final String PROCESS_STATUS_VERIFIED = "6"; + /** + * 0:待处理：待识别、待提取 + * 1: 处理中：识别中、提取中 + * 2: 处理完毕：已提取 + * 3: 处理失败：识别失败、提取失败 + * 4: 已核实 + */ + public static final Map PROCESS_STATUS_MAPPING = + Map.of(PROCESS_STATUS_UNPROCESSED,"0", + PROCESS_STATUS_OCR_OK,"1", + PROCESS_STATUS_TITLE_EXTRACT_OK,"1", + PROCESS_STATUS_ATTR_EXTRACT_OK,"1", + PROCESS_STATUS_SUCCESS,"2", + PROCESS_STATUS_FAILED,"3", + PROCESS_STATUS_VERIFIED,"4"); + } diff --git a/src/main/java/com/supervision/police/controller/CaseEvidenceController.java b/src/main/java/com/supervision/police/controller/CaseEvidenceController.java index 7ab0f89..5d42a85 100644 --- a/src/main/java/com/supervision/police/controller/CaseEvidenceController.java +++ b/src/main/java/com/supervision/police/controller/CaseEvidenceController.java @@ -6,6 +6,9 @@ import com.supervision.common.domain.R; import com.supervision.police.domain.EvidenceDirectory; import com.supervision.police.dto.*; import com.supervision.police.service.CaseEvidenceService; +import com.supervision.police.vo.EvidenceDirectoryReqVO; +import com.supervision.police.vo.OcrAndExtractReqVO; +import com.supervision.police.vo.VerifyEvidenceReqVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -53,10 +56,11 @@ public class CaseEvidenceController { @Operation(summary = "分页查询案件证据信息列表") @GetMapping("/pageListEvidence") public R> pageListEvidence(@RequestParam @Parameter(name = "caseId",description = "案件id") String caseId, + @RequestParam(required = false) @Parameter(name = "directoryId",description = "目录id") String directoryId, @RequestParam(required = false) @Parameter(name = "evidenceName",description = "证据名") String evidenceName, @RequestParam(defaultValue = "1") @Parameter(name = "pageNum",description = "页码") Integer pageNum, @RequestParam(defaultValue = "10") @Parameter(name = "pageSize",description = "每页数量") Integer pageSize) { - IPage pageListEvidence = caseEvidenceService.pageListEvidence(caseId, evidenceName,pageNum, pageSize); + IPage pageListEvidence = caseEvidenceService.pageListEvidence(caseId, directoryId,evidenceName,pageNum, pageSize); return R.ok(pageListEvidence); } @@ -78,6 +82,22 @@ public class CaseEvidenceController { return R.ok(list); } + @Operation(summary = "查询案件证据文件树") + @GetMapping("/file/tree") + public R> listFileTree(@RequestParam("caseId") + @Parameter(name = "caseId",description = "案件id") String caseId) { + + List list = caseEvidenceService.listFileTree(caseId); + return R.ok(list); + } + + @Operation(summary = "创建证据目录信息") + @PostMapping("/directory/save") + public R createDirectory(@RequestBody EvidenceDirectoryReqVO evidenceDirectory) { + + EvidenceDirectory directory = caseEvidenceService.createDirectory(evidenceDirectory); + return R.ok(directory); + } @Operation(summary = "更新证据目录信息") @PostMapping("/directory/update") public R updateDirectory(@RequestBody EvidenceDirectory evidenceDirectory) { @@ -103,7 +123,7 @@ public class CaseEvidenceController { } @Operation(summary = "删除文件目录") - @PostMapping("/directory/directory/rm") + @PostMapping("/directory/rm") public R removeDirectory(@RequestBody List directoryIdList) { Boolean success = caseEvidenceService.removeDirectory(directoryIdList); @@ -112,9 +132,9 @@ public class CaseEvidenceController { @Operation(summary = "证据识别并提取") @PostMapping("/ocrAndExtract") - public R ocrAndExtract(@RequestBody List evidenceFileDTOS, @RequestParam(name = "caseId") String caseId) { + public R ocrAndExtract(@RequestBody OcrAndExtractReqVO ocrAndExtractReqVO) { - String batchNo = caseEvidenceService.ocrAndExtract(caseId, evidenceFileDTOS); + String batchNo = caseEvidenceService.ocrAndExtract(ocrAndExtractReqVO.getCaseId(), ocrAndExtractReqVO.getEvidenceFileList()); return R.ok(batchNo); } @@ -128,19 +148,28 @@ public class CaseEvidenceController { } @Operation(summary = "核实证据") - @GetMapping("/caseEvidence/verify") - public R> verifyEvidence(@RequestBody List evidenceVerifyDTOS, - @RequestParam("caseId") String caseId, - @RequestParam(value = "batchNo",required = false) String batchNo) { - caseEvidenceService.verifyEvidence(evidenceVerifyDTOS,caseId,batchNo); + @PostMapping("/verify") + public R> verifyEvidence(@RequestBody VerifyEvidenceReqVO verifyEvidenceReqVO) { + + caseEvidenceService.verifyEvidence(verifyEvidenceReqVO.getEvidenceVerifyList(), + verifyEvidenceReqVO.getCaseId(),verifyEvidenceReqVO.getBatchNo()); return R.ok(); } @Operation(summary = "查询证据详情-结果以树的方式展示") - @GetMapping("/caseEvidence/details") + @GetMapping("/details") public R> evidenceDetails(@RequestParam("caseId") String caseId, @RequestParam(value = "batchNo",required = false) String batchNo) { List evidenceDirectoryDTOS = caseEvidenceService.evidenceDetails(caseId,batchNo); return R.ok(evidenceDirectoryDTOS); } + + @Operation(summary = "查询证据详情-结果以树的方式展示") + @GetMapping("/directory/generateName") + public R generateDirectoryName(@RequestParam("caseId") String caseId, + @RequestParam(value = "categoryId") String categoryId, + @RequestParam(value = "provider") String provider) { + String directoryName = caseEvidenceService.generateDirectoryName(caseId,categoryId,provider); + return R.ok(directoryName); + } } diff --git a/src/main/java/com/supervision/police/dto/CaseEvidenceDetailDTO.java b/src/main/java/com/supervision/police/dto/CaseEvidenceDetailDTO.java index b8e9489..91b4404 100644 --- a/src/main/java/com/supervision/police/dto/CaseEvidenceDetailDTO.java +++ b/src/main/java/com/supervision/police/dto/CaseEvidenceDetailDTO.java @@ -32,6 +32,9 @@ public class CaseEvidenceDetailDTO { @Schema(description = "案件证据类型描述") private String evidenceTypeDesc; + @Schema(description = "案件证据文件格式 文件夹 .jpg ....") + private String evidenceFormat; + @Schema(description = "证据提供人") private String provider; @@ -56,11 +59,19 @@ public class CaseEvidenceDetailDTO { @Schema(description = "案件证据属性") private Map property= new HashMap<>(); + /** * 数据更新状态 -1：无需更新 0：删除 1：新增 */ private String updateStatus = "-1"; + /** + * 0:待处理：待识别、待提取 + * 1: 处理中：识别中、提取中 + * 2: 处理完毕：已提取 + * 3: 处理失败：识别失败、提取失败 + * 4: 已核实 + */ private String processStatus; public CaseEvidenceDetailDTO() { @@ -116,4 +127,16 @@ public class CaseEvidenceDetailDTO { return caseEvidence; } + + public void setEvidenceFormatValue(EvidenceDirectoryDTO directory){ + if (null == directory){ + return; + } + if (2 == directory.getLevel() && CollUtil.isNotEmpty(this.fileList)){ + this.evidenceFormat = CollUtil.getFirst(this.fileList).getFileType(); + } + if (3 == directory.getLevel()){ + this.evidenceFormat = "文件夹"; + } + } } diff --git a/src/main/java/com/supervision/police/dto/EvidenceDirectoryDTO.java b/src/main/java/com/supervision/police/dto/EvidenceDirectoryDTO.java index c89423f..e54952b 100644 --- a/src/main/java/com/supervision/police/dto/EvidenceDirectoryDTO.java +++ b/src/main/java/com/supervision/police/dto/EvidenceDirectoryDTO.java @@ -90,6 +90,21 @@ public class EvidenceDirectoryDTO { return null; } + public List findDirectoryIdList(String categoryId){ + List list = new ArrayList<>(); + if (StrUtil.equals(this.categoryId, categoryId)){ + list.add(this.id); + } + if (CollUtil.isNotEmpty(this.child)){ + for (EvidenceDirectoryDTO directoryDTO : this.child) { + if (StrUtil.equals(directoryDTO.getCategoryId(), categoryId)){ + list.addAll(directoryDTO.findDirectoryIdList(categoryId)); + } + } + } + return list; + } + public List listAllFileId(){ List fileIdList = new ArrayList<>(); if (CollUtil.isNotEmpty(this.fileIdList)){ @@ -134,6 +149,15 @@ public class EvidenceDirectoryDTO { return -1; } + public void setDirectoryLevel(int currentLevel){ + this.level = currentLevel; + if (CollUtil.isNotEmpty(this.child)){ + for (EvidenceDirectoryDTO directoryDTO : this.getChild()) { + directoryDTO.setDirectoryLevel(currentLevel + 1); + } + } + } + public void appendChildDirectory(){ if (CollUtil.isNotEmpty(this.child)){ for (EvidenceDirectoryDTO directoryDTO : child) { diff --git a/src/main/java/com/supervision/police/dto/EvidenceProcessDTO.java b/src/main/java/com/supervision/police/dto/EvidenceProcessDTO.java index ac2bbf7..fcadcb3 100644 --- a/src/main/java/com/supervision/police/dto/EvidenceProcessDTO.java +++ b/src/main/java/com/supervision/police/dto/EvidenceProcessDTO.java @@ -3,6 +3,7 @@ package com.supervision.police.dto; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.unit.DataSizeUtil; import cn.hutool.core.util.StrUtil; +import com.supervision.common.constant.EvidenceConstants; import com.supervision.police.domain.EvidenceCategory; import lombok.Data; @@ -82,7 +83,9 @@ public class EvidenceProcessDTO { this.attachmentSize = DataSizeUtil.format(sum); } this.evidenceType = caseEvidence.getEvidenceType(); - this.status = caseEvidence.getProcessStatus(); + if (StrUtil.isNotEmpty(caseEvidence.getProcessStatus())){ + this.status = EvidenceConstants.PROCESS_STATUS_MAPPING.get(caseEvidence.getProcessStatus()); + } } diff --git a/src/main/java/com/supervision/police/service/CaseEvidenceService.java b/src/main/java/com/supervision/police/service/CaseEvidenceService.java index ea507dd..21dd904 100644 --- a/src/main/java/com/supervision/police/service/CaseEvidenceService.java +++ b/src/main/java/com/supervision/police/service/CaseEvidenceService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.supervision.police.domain.CaseEvidence; import com.supervision.police.domain.EvidenceDirectory; import com.supervision.police.dto.*; +import com.supervision.police.vo.EvidenceDirectoryReqVO; import java.util.List; @@ -45,11 +46,12 @@ public interface CaseEvidenceService extends IService { /** * 分页查询案件证据信息列表 * @param caseId 案件id + * @param directoryId 目录id * @param pageNum 每页大小 * @param pageSize 当前页码 * @return */ - IPage pageListEvidence(String caseId,String evidenceName, Integer pageNum, Integer pageSize); + IPage pageListEvidence(String caseId,String directoryId,String evidenceName, Integer pageNum, Integer pageSize); CaseEvidenceDetailDTO queryEvidenceDetail(String evidenceId); @@ -66,6 +68,9 @@ public interface CaseEvidenceService extends IService { * @param caseId 案件id * @return */ + List listFileTree(String caseId); + + List listDirectoryTree(String caseId); /** @@ -123,4 +128,9 @@ public interface CaseEvidenceService extends IService { void verifyEvidence(List evidenceVerifyDTOS,String caseId,String batchNo); List evidenceDetails(String caseId, String batchNo); + + String generateDirectoryName(String caseId, String categoryId, String provider); + + EvidenceDirectory createDirectory(EvidenceDirectoryReqVO evidenceDirectory); + } diff --git a/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java b/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java index f51d5a4..b7291e1 100644 --- a/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java @@ -18,6 +18,7 @@ import com.supervision.police.domain.EvidenceFile; import com.supervision.common.constant.EvidenceConstants; import com.supervision.police.domain.*; import com.supervision.police.mapper.CaseEvidenceMapper; +import com.supervision.police.vo.EvidenceDirectoryReqVO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -157,10 +158,11 @@ public class CaseEvidenceServiceImpl extends ServiceImpl pageListEvidence(String caseId, String evidenceName, Integer pageNum, Integer pageSize) { + public IPage pageListEvidence(String caseId, String directoryId,String evidenceName, Integer pageNum, Integer pageSize) { Assert.notEmpty(caseId, "案件id不能为空"); Page caseEvidencePage = super.lambdaQuery().eq(CaseEvidence::getCaseId, caseId) + .eq(StrUtil.isNotEmpty(directoryId), CaseEvidence::getDirectoryId, directoryId) .like(StrUtil.isNotEmpty(evidenceName), CaseEvidence::getEvidenceName, evidenceName) .orderBy(true, false, CaseEvidence::getUpdateTime) .page(new Page<>(pageNum, pageSize)); @@ -177,6 +179,9 @@ public class CaseEvidenceServiceImpl extends ServiceImpl recordFileDTOS = fileOcrProcessService.queryFileList(fileInfoList.stream().map(EvidenceFileDTO::getFileId).toList()); + List evidenceDirectoryDTOS = listDirectoryTree(caseId); + + // 转换分页结果 //查询字典 List evidenceTypeDic = comDictionaryService.lambdaQuery().eq(ComDictionary::getType, "evidence_type").list(); @@ -185,6 +190,9 @@ public class CaseEvidenceServiceImpl extends ServiceImpl listDirectoryTree(String caseId) { + public List listFileTree(String caseId) { + Assert.notEmpty(caseId,"案件ID不能为空!"); List evidenceDirectoryDTOS = evidenceDirectoryService.listDirectoryTree(caseId); @@ -283,6 +292,13 @@ public class CaseEvidenceServiceImpl extends ServiceImpl listDirectoryTree(String caseId) { + Assert.notEmpty(caseId,"案件ID不能为空!"); + + return evidenceDirectoryService.listDirectoryTree(caseId); + } + @Override public void initCaseEvidenceDirectory(String caseId, String caseType) { @@ -359,7 +375,7 @@ public class CaseEvidenceServiceImpl extends ServiceImpl evidenceFileDTOS) { List oldEvidences = this.queryEvidenceList(caseId); - List evidenceDirectoryDTOS = listDirectoryTree(caseId); + List evidenceDirectoryDTOS = listFileTree(caseId); List newEvidences = toCaseCaseEvidenceDetailDTO(evidenceFileDTOS, evidenceDirectoryDTOS); newEvidences.forEach(caseEvidenceDetailDTO -> caseEvidenceDetailDTO.setCaseId(caseId)); @@ -394,6 +410,7 @@ public class CaseEvidenceServiceImpl extends ServiceImpl caseEvidenceDetailDTOS = this.queryEvidenceList(caseId,batchNo); - if (CollUtil.isNotEmpty(caseEvidenceDetailDTOS)){ + if (CollUtil.isEmpty(caseEvidenceDetailDTOS)){ return new ArrayList<>(); } List processDTOList = caseEvidenceDetailDTOS.stream().map(EvidenceProcessDTO::new).collect(Collectors.toList()); @@ -486,7 +503,7 @@ public class CaseEvidenceServiceImpl extends ServiceImpl evidenceDetails(String caseId, String batchNo) { - List evidenceDirectoryDTOS = listDirectoryTree(caseId); + List evidenceDirectoryDTOS = listFileTree(caseId); List caseEvidenceList = this.lambdaQuery().eq(CaseEvidence::getCaseId, caseId).list(); List categoryPromptDTOS = evidenceDirectoryService.listCategoryPrompt(caseId); @@ -505,6 +522,64 @@ public class CaseEvidenceServiceImpl extends ServiceImpl directoryList = evidenceDirectoryService.lambdaQuery() + .eq(EvidenceDirectory::getCaseId, caseId) + .eq(EvidenceDirectory::getCategoryId, categoryId).list(); + + String directoryName = category.getCategoryName() + provider; + long count = directoryList.stream().filter(d -> StrUtil.contains(d.getDirectoryName(), provider)).count(); + if (count > 0){ + directoryName = directoryName + count; + } + return directoryName; + } + + @Override + public EvidenceDirectory createDirectory(EvidenceDirectoryReqVO evidenceDirectory) { + + List evidenceDirectoryDTOS = listDirectoryTree(evidenceDirectory.getCaseId()); + List directoryIdList = null; + for (EvidenceDirectoryDTO evidenceDirectoryDTO : evidenceDirectoryDTOS) { + directoryIdList = evidenceDirectoryDTO.findDirectoryIdList(evidenceDirectory.getCategoryId()); + if (CollUtil.isNotEmpty(directoryIdList)){ + break; + } + } + Assert.notEmpty(directoryIdList, "目录分类不存在"); + EvidenceDirectoryDTO directory = null; + for (EvidenceDirectoryDTO evidenceDirectoryDTO : evidenceDirectoryDTOS) { + directory = evidenceDirectoryDTO.findDirectory(CollUtil.getFirst(directoryIdList)); + if (null != directory){ + break; + } + } + Assert.notNull(directory, "目录不存在"); + + long count = evidenceDirectoryService.lambdaQuery().eq(EvidenceDirectory::getParentId, directory.getId()) + .list().stream() + .filter(d -> StrUtil.contains(d.getDirectoryName(), evidenceDirectory.getDirectoryName())).count(); + if (count > 0){ + evidenceDirectory.setDirectoryName(evidenceDirectory.getDirectoryName() + count + 1); + } + + EvidenceDirectory directory1 = new EvidenceDirectory(); + directory1.setCaseId(evidenceDirectory.getCaseId()); + directory1.setCategoryId(evidenceDirectory.getCategoryId()); + directory1.setDirectoryName(evidenceDirectory.getDirectoryName()); + directory1.setParentId(directory.getId()); + evidenceDirectoryService.save(directory1); + return directory1; + } + private CaseEvidenceDetailDTO findEvidenceDetail(String evidenceId, List caseEvidenceDetailDTOS) { for (CaseEvidenceDetailDTO caseEvidenceDetailDTO : caseEvidenceDetailDTOS) { diff --git a/src/main/java/com/supervision/police/service/impl/EvidenceDirectoryServiceImpl.java b/src/main/java/com/supervision/police/service/impl/EvidenceDirectoryServiceImpl.java index 048cd53..e9440b9 100644 --- a/src/main/java/com/supervision/police/service/impl/EvidenceDirectoryServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/EvidenceDirectoryServiceImpl.java @@ -36,16 +36,7 @@ public class EvidenceDirectoryServiceImpl extends ServiceImpl StrUtil.equals(directoryDTO.getId(),item.getParentId())).toList()); } - List directoryDTOList = directoryDTOS.stream().filter(item -> StrUtil.isEmpty(item.getParentId())).toList(); - - List directoryIds = list.stream().map(EvidenceDirectory::getId).toList(); - for (String directoryId : directoryIds) { - // 设置目录层级 - setDirectoryLevel(directoryId, directoryDTOList); - } - - // 把文件也拼接到目录树中 - return directoryDTOS; + return directoryDTOS.stream().filter(item -> StrUtil.isEmpty(item.getParentId())).peek(item -> item.setDirectoryLevel(1)).toList(); } @Override @@ -81,17 +72,6 @@ public class EvidenceDirectoryServiceImpl extends ServiceImpl directoryDTOList) { - - for (EvidenceDirectoryDTO evidenceDirectoryDTO : directoryDTOList) { - int level = evidenceDirectoryDTO.evalLevel(directoryId, 1); - if (level > 0) { - evidenceDirectoryDTO.setLevel(level); - } - return; - } - } } diff --git a/src/main/java/com/supervision/police/vo/EvidenceDirectoryReqVO.java b/src/main/java/com/supervision/police/vo/EvidenceDirectoryReqVO.java new file mode 100644 index 0000000..415b10f --- /dev/null +++ b/src/main/java/com/supervision/police/vo/EvidenceDirectoryReqVO.java @@ -0,0 +1,24 @@ +package com.supervision.police.vo; + +import lombok.Data; + +/** + * 创建目录请求参数 + */ +@Data +public class EvidenceDirectoryReqVO { + /** + * 分类id + */ + private String caseId; + + /** + * 提供人 + */ + private String directoryName; + + /** + * 分类id + */ + private String categoryId; +} diff --git a/src/main/java/com/supervision/police/vo/OcrAndExtractReqVO.java b/src/main/java/com/supervision/police/vo/OcrAndExtractReqVO.java new file mode 100644 index 0000000..0550e04 --- /dev/null +++ b/src/main/java/com/supervision/police/vo/OcrAndExtractReqVO.java @@ -0,0 +1,14 @@ +package com.supervision.police.vo; + +import com.supervision.police.dto.EvidenceDirectoryDTO; +import lombok.Data; + +import java.util.List; + +@Data +public class OcrAndExtractReqVO { + + private String caseId; + + private List evidenceFileList; +} diff --git a/src/main/java/com/supervision/police/vo/VerifyEvidenceReqVO.java b/src/main/java/com/supervision/police/vo/VerifyEvidenceReqVO.java new file mode 100644 index 0000000..220ac62 --- /dev/null +++ b/src/main/java/com/supervision/police/vo/VerifyEvidenceReqVO.java @@ -0,0 +1,25 @@ +package com.supervision.police.vo; + +import com.supervision.police.dto.EvidenceVerifyDTO; +import lombok.Data; + +import java.util.List; + +@Data +public class VerifyEvidenceReqVO { + + /** + * 案件id + */ + private String caseId; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 待审核证据信息 + */ + private List evidenceVerifyList; +} diff --git a/src/main/resources/mapper/CaseEvidenceMapper.xml b/src/main/resources/mapper/CaseEvidenceMapper.xml index 3c0ca65..288caaf 100644 --- a/src/main/resources/mapper/CaseEvidenceMapper.xml +++ b/src/main/resources/mapper/CaseEvidenceMapper.xml @@ -56,6 +56,7 @@ ce.evidence_name, ce.evidence_type, ce.directory_id, + ce.process_status, ef.file_id, mf.filename, mf.file_type,