From 841ff915acc6039d4b9179a9494439ae9112c41e Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Wed, 21 Aug 2024 16:33:14 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E7=AC=94=E5=BD=95?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervision/police/dto/NoteRecordDetailDTO.java | 13 ++++++++++--- .../service/impl/NoteRecordSplitServiceImpl.java | 2 -- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/supervision/police/dto/NoteRecordDetailDTO.java b/src/main/java/com/supervision/police/dto/NoteRecordDetailDTO.java index 49cb531..a9aed9f 100644 --- a/src/main/java/com/supervision/police/dto/NoteRecordDetailDTO.java +++ b/src/main/java/com/supervision/police/dto/NoteRecordDetailDTO.java @@ -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(); 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 e494c0d..f51c474 100644 --- a/src/main/java/com/supervision/police/service/impl/NoteRecordSplitServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/NoteRecordSplitServiceImpl.java @@ -34,8 +34,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.io.BufferedInputStream; -import java.io.File; import java.io.IOException; import java.io.InputStream; import java.time.LocalDateTime;