diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/phonedialrecord/impl/PhoneDialRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/phonedialrecord/impl/PhoneDialRecordServiceImpl.java index f545d564..4cef4767 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/phonedialrecord/impl/PhoneDialRecordServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/phonedialrecord/impl/PhoneDialRecordServiceImpl.java @@ -45,6 +45,9 @@ public class PhoneDialRecordServiceImpl implements IPhoneDialRecordService { */ @Override public List selectPhoneDialRecordList(BillPhoneDialVo phoneDialRecord) { + if (Objects.nonNull(phoneDialRecord.getDialTimeEnd())){ + phoneDialRecord.setDialTimeEnd(phoneDialRecord.getDialTimeEnd().plusDays(1)); + } return phoneDialRecordMapper.selectPhoneDialRecords(phoneDialRecord); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/shortmessagesendrecord/impl/ShortMessageSendRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/shortmessagesendrecord/impl/ShortMessageSendRecordServiceImpl.java index a0381019..06df9f36 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/shortmessagesendrecord/impl/ShortMessageSendRecordServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/shortmessagesendrecord/impl/ShortMessageSendRecordServiceImpl.java @@ -45,6 +45,9 @@ public class ShortMessageSendRecordServiceImpl implements IShortMessageSendRecor */ @Override public List selectShortMessageSendRecordList(ShortMessageSendRecordVo shortMessageSendRecord) { + if (Objects.nonNull(shortMessageSendRecord.getSendTimeEnd())){ + shortMessageSendRecord.setSendTimeEnd(shortMessageSendRecord.getSendTimeEnd().plusDays(1)); + } return shortMessageSendRecordMapper.selectShortMessageSendRecords(shortMessageSendRecord); } diff --git a/postdischarge-manage/src/main/resources/mapper/manage/phonedialrecord/PhoneDialRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/phonedialrecord/PhoneDialRecordMapper.xml index a0a45f36..5747959a 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/phonedialrecord/PhoneDialRecordMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/phonedialrecord/PhoneDialRecordMapper.xml @@ -136,7 +136,7 @@ and record.dial_time >= #{dialTimeStart} - and record.dial_time <= #{dialTimeEnd} + and record.dial_time < #{dialTimeEnd} and record.phone_template_id = #{phoneTemplateId} diff --git a/postdischarge-manage/src/main/resources/mapper/manage/shortmessagesendrecord/ShortMessageSendRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/shortmessagesendrecord/ShortMessageSendRecordMapper.xml index afa15d47..10a54c7a 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/shortmessagesendrecord/ShortMessageSendRecordMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/shortmessagesendrecord/ShortMessageSendRecordMapper.xml @@ -130,7 +130,7 @@ and record.send_time >= #{sendTimeStart} - and record.send_time <= #{sendTimeEnd} + and record.send_time < #{sendTimeEnd} and record.message_template_id = #{messageTemplateId}