1. 修复证据改造bug

topo_dev
xueqingkun 7 months ago
parent aaa38eb09f
commit 0062594a62

@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.supervision.common.constant.EvidenceConstants;
import com.supervision.police.domain.CaseEvidence; import com.supervision.police.domain.CaseEvidence;
import com.supervision.police.domain.FileEvidenceProperty; import com.supervision.police.domain.FileEvidenceProperty;
import com.supervision.police.handler.NotePromptExtractAttributesTypeHandler; import com.supervision.police.handler.NotePromptExtractAttributesTypeHandler;
@ -102,7 +103,9 @@ public class CaseEvidenceDetailDTO {
this.evidenceName = caseEvidence.getEvidenceName(); this.evidenceName = caseEvidence.getEvidenceName();
this.evidenceType = caseEvidence.getEvidenceType(); this.evidenceType = caseEvidence.getEvidenceType();
this.provider = caseEvidence.getProvider(); this.provider = caseEvidence.getProvider();
this.processStatus = caseEvidence.getProcessStatus(); if (StrUtil.isNotEmpty(caseEvidence.getProcessStatus())){
this.processStatus = EvidenceConstants.PROCESS_STATUS_MAPPING.get(caseEvidence.getProcessStatus());
}
this.fileId = caseEvidence.getFileId(); this.fileId = caseEvidence.getFileId();
this.directoryId = caseEvidence.getDirectoryId(); this.directoryId = caseEvidence.getDirectoryId();
} }

@ -18,7 +18,6 @@ import com.supervision.police.mapper.CaseEvidenceMapper;
import com.supervision.police.service.*; import com.supervision.police.service.*;
import com.supervision.police.vo.EvidenceDirectoryReqVO; import com.supervision.police.vo.EvidenceDirectoryReqVO;
import com.supervision.police.vo.VerifyEvidenceReqVO; import com.supervision.police.vo.VerifyEvidenceReqVO;
import jakarta.annotation.Resource;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.aop.framework.AopContext; import org.springframework.aop.framework.AopContext;
@ -573,13 +572,12 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
} }
List<CaseEvidenceDetailDTO> caseEvidenceDetailDTOS = queryEvidenceList(caseId, batchNo); List<CaseEvidenceDetailDTO> caseEvidenceDetailDTOS = queryEvidenceList(caseId, batchNo);
EvidenceDirectoryDTO topDirectory = new EvidenceDirectoryDTO(listDirectoryTree(caseId));
Map<String, List<EvidenceVerifyDTO>> evidenceMap = evidenceVerifyDTOS.stream().collect(Collectors.groupingBy(EvidenceVerifyDTO::getEvidenceId)); Map<String, List<EvidenceVerifyDTO>> evidenceMap = evidenceVerifyDTOS.stream().collect(Collectors.groupingBy(EvidenceVerifyDTO::getEvidenceId));
for (Map.Entry<String, List<EvidenceVerifyDTO>> entry : evidenceMap.entrySet()) { for (Map.Entry<String, List<EvidenceVerifyDTO>> entry : evidenceMap.entrySet()) {
String evidenceId = entry.getKey(); String evidenceId = entry.getKey();
List<EvidenceVerifyDTO> value = entry.getValue(); List<EvidenceVerifyDTO> value = entry.getValue();
// 更新证据属性 // 更新证据属性 和 核实状态
this.lambdaUpdate().eq(CaseEvidence::getId, evidenceId) this.lambdaUpdate().eq(CaseEvidence::getId, evidenceId)
.set(CaseEvidence::getProperty, JSONUtil.toJsonStr(CollUtil.getFirst(value).getProperties())) .set(CaseEvidence::getProperty, JSONUtil.toJsonStr(CollUtil.getFirst(value).getProperties()))
.set(CaseEvidence::getTitle, CollUtil.getFirst(value).getTitle()) .set(CaseEvidence::getTitle, CollUtil.getFirst(value).getTitle())

Loading…
Cancel
Save