|
|
|
@ -1,12 +1,13 @@
|
|
|
|
|
package com.supervision.police.dto;
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.date.LocalDateTimeUtil;
|
|
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
|
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
|
|
|
import com.supervision.minio.domain.MinioFile;
|
|
|
|
|
import com.supervision.police.domain.NoteRecord;
|
|
|
|
|
import lombok.Data;
|
|
|
|
|
|
|
|
|
|
import java.time.LocalDateTime;
|
|
|
|
|
import java.time.format.DateTimeFormatter;
|
|
|
|
|
import java.util.*;
|
|
|
|
|
|
|
|
|
|
@Data
|
|
|
|
@ -105,8 +106,14 @@ public class NoteRecordDetailDTO {
|
|
|
|
|
this.role = noteRecordDTO.getRole();
|
|
|
|
|
this.confessionMaterial = String.valueOf(noteRecordDTO.getConfessionMaterial());
|
|
|
|
|
this.lawAsker = noteRecordDTO.getLawAsker();
|
|
|
|
|
this.confessionStartTime = noteRecordDTO.getConfessionStartTime();
|
|
|
|
|
this.confessionEndTime = noteRecordDTO.getConfessionEndTime();
|
|
|
|
|
if (StrUtil.isNotEmpty(noteRecordDTO.getConfessionStartTime())){
|
|
|
|
|
this.confessionStartTime = LocalDateTimeUtil.parse(noteRecordDTO.getConfessionStartTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))
|
|
|
|
|
.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
|
|
|
|
|
}
|
|
|
|
|
if (StrUtil.isNotEmpty(noteRecordDTO.getConfessionEndTime())){
|
|
|
|
|
this.confessionEndTime = LocalDateTimeUtil.parse(noteRecordDTO.getConfessionEndTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))
|
|
|
|
|
.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
|
|
|
|
|
}
|
|
|
|
|
this.createTime = noteRecordDTO.getCreateTime();
|
|
|
|
|
this.updateTime = noteRecordDTO.getUpdateTime();
|
|
|
|
|
this.personIdCard = noteRecordDTO.getCasePersonIdCard();
|
|
|
|
|