From 51bbde78d7ff1155f2dde454a535e0f5d21eb11d Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Fri, 16 Aug 2024 11:13:47 +0800 Subject: [PATCH] 1. fix bugs --- src/main/java/com/supervision/police/dto/NoteRecordDTO.java | 3 +++ .../java/com/supervision/police/dto/NoteRecordDetailDTO.java | 4 ++++ .../java/com/supervision/police/dto/user/UserInfoReqVo.java | 1 + src/main/resources/mapper/NoteRecordMapper.xml | 3 ++- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/supervision/police/dto/NoteRecordDTO.java b/src/main/java/com/supervision/police/dto/NoteRecordDTO.java index ddbb4f1..3fdb537 100644 --- a/src/main/java/com/supervision/police/dto/NoteRecordDTO.java +++ b/src/main/java/com/supervision/police/dto/NoteRecordDTO.java @@ -59,5 +59,8 @@ public class NoteRecordDTO { @Schema(description = "创建时间") private LocalDateTime createTime; + @Schema(description = "更新时间") + private LocalDateTime updateTime; + } diff --git a/src/main/java/com/supervision/police/dto/NoteRecordDetailDTO.java b/src/main/java/com/supervision/police/dto/NoteRecordDetailDTO.java index 40e5dd4..49cb531 100644 --- a/src/main/java/com/supervision/police/dto/NoteRecordDetailDTO.java +++ b/src/main/java/com/supervision/police/dto/NoteRecordDetailDTO.java @@ -85,6 +85,9 @@ public class NoteRecordDetailDTO { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; + private List children = new ArrayList<>(); public NoteRecordDetailDTO() { @@ -105,6 +108,7 @@ public class NoteRecordDetailDTO { this.confessionStartTime = noteRecordDTO.getConfessionStartTime(); this.confessionEndTime = noteRecordDTO.getConfessionEndTime(); this.createTime = noteRecordDTO.getCreateTime(); + this.updateTime = noteRecordDTO.getUpdateTime(); this.personIdCard = noteRecordDTO.getCasePersonIdCard(); if (StrUtil.isNotEmpty(noteRecordDTO.getFileIds())){ this.fileList = Arrays.stream(noteRecordDTO.getFileIds().split(",")).map(fileId->{ diff --git a/src/main/java/com/supervision/police/dto/user/UserInfoReqVo.java b/src/main/java/com/supervision/police/dto/user/UserInfoReqVo.java index 6bf39ca..3b0e72c 100644 --- a/src/main/java/com/supervision/police/dto/user/UserInfoReqVo.java +++ b/src/main/java/com/supervision/police/dto/user/UserInfoReqVo.java @@ -44,6 +44,7 @@ public class UserInfoReqVo { systemUser.setAccount(account); systemUser.setUserName(userName); systemUser.setUserPd(password); + systemUser.setPhoneNum(phoneNum); systemUser.setRemark(remark); systemUser.setStatus(null == status ? 0 : status); systemUser.setUserPd(UserUtil.signPassword(this.getPassword())); diff --git a/src/main/resources/mapper/NoteRecordMapper.xml b/src/main/resources/mapper/NoteRecordMapper.xml index e71e3bd..01dbd09 100644 --- a/src/main/resources/mapper/NoteRecordMapper.xml +++ b/src/main/resources/mapper/NoteRecordMapper.xml @@ -17,7 +17,8 @@ r.confession_start_time as confessionStartTime, r.confession_end_time as confessionEndTime, p.id_card as idCard, - r.create_time as createTime + r.create_time as createTime, + r.update_time as updateTime from note_record r left join case_person p on r.case_person_id = p.id where r.data_status = '1'