|
|
@ -1,10 +1,12 @@
|
|
|
|
package com.supervision.police.dto;
|
|
|
|
package com.supervision.police.dto;
|
|
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
|
|
|
|
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
|
|
import com.supervision.minio.domain.MinioFile;
|
|
|
|
import com.supervision.minio.domain.MinioFile;
|
|
|
|
import com.supervision.police.domain.NoteRecord;
|
|
|
|
import com.supervision.police.domain.NoteRecord;
|
|
|
|
import lombok.Data;
|
|
|
|
import lombok.Data;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import java.time.LocalDateTime;
|
|
|
|
import java.util.*;
|
|
|
|
import java.util.*;
|
|
|
|
|
|
|
|
|
|
|
|
@Data
|
|
|
|
@Data
|
|
|
@ -62,6 +64,12 @@ public class NoteRecordDetailDTO {
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
private String percentage;
|
|
|
|
private String percentage;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* 创建时间
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
|
|
|
|
|
|
private LocalDateTime createTime;
|
|
|
|
|
|
|
|
|
|
|
|
private List<NoteRecordDetailDTO> children = new ArrayList<>();
|
|
|
|
private List<NoteRecordDetailDTO> children = new ArrayList<>();
|
|
|
|
|
|
|
|
|
|
|
|
public NoteRecordDetailDTO() {
|
|
|
|
public NoteRecordDetailDTO() {
|
|
|
@ -80,6 +88,7 @@ public class NoteRecordDetailDTO {
|
|
|
|
this.lawAsker = noteRecord.getLawAsker();
|
|
|
|
this.lawAsker = noteRecord.getLawAsker();
|
|
|
|
this.confessionStartTime = noteRecord.getConfessionStartTime();
|
|
|
|
this.confessionStartTime = noteRecord.getConfessionStartTime();
|
|
|
|
this.confessionEndTime = noteRecord.getConfessionEndTime();
|
|
|
|
this.confessionEndTime = noteRecord.getConfessionEndTime();
|
|
|
|
|
|
|
|
this.createTime = noteRecord.getCreateTime();
|
|
|
|
if (StrUtil.isNotEmpty(noteRecord.getFileIds())){
|
|
|
|
if (StrUtil.isNotEmpty(noteRecord.getFileIds())){
|
|
|
|
this.fileList = Arrays.stream(noteRecord.getFileIds().split(",")).map(fileId->{
|
|
|
|
this.fileList = Arrays.stream(noteRecord.getFileIds().split(",")).map(fileId->{
|
|
|
|
MinioFile minioFile = fileMap.get(fileId);
|
|
|
|
MinioFile minioFile = fileMap.get(fileId);
|
|
|
|