1. fix bugs

topo_dev
xueqingkun 9 months ago
parent 0fe52a464b
commit 51bbde78d7

@ -59,5 +59,8 @@ public class NoteRecordDTO {
@Schema(description = "创建时间")
private LocalDateTime createTime;
@Schema(description = "更新时间")
private LocalDateTime updateTime;
}

@ -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<NoteRecordDetailDTO> 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->{

@ -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()));

@ -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'

Loading…
Cancel
Save