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 5747959a..a0a45f36 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 10a54c7a..afa15d47 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} diff --git a/postdischarge-quartz/src/main/java/com/xinelu/quartz/controller/SendTextMessageController.java b/postdischarge-quartz/src/main/java/com/xinelu/quartz/controller/SendTextMessageController.java index 02da846b..abd7640f 100644 --- a/postdischarge-quartz/src/main/java/com/xinelu/quartz/controller/SendTextMessageController.java +++ b/postdischarge-quartz/src/main/java/com/xinelu/quartz/controller/SendTextMessageController.java @@ -71,7 +71,7 @@ public class SendTextMessageController { if (Objects.isNull(signPatientManageRoute.getId())){ return retObj; } - BigDecimal price = BigDecimal.valueOf(0.00); + BigDecimal price = null; List sysDictDataList = iSysDictTypeService.selectDictDataByType("unit_price"); if (CollectionUtils.isNotEmpty(sysDictDataList)){ SysDictData message = sysDictDataList.stream().filter(Objects::nonNull).filter(item -> item.getDictLabel().equals("message")).findFirst().orElse(new SysDictData()); diff --git a/postdischarge-quartz/src/main/java/com/xinelu/quartz/service/impl/SendTextMessageServiceImpl.java b/postdischarge-quartz/src/main/java/com/xinelu/quartz/service/impl/SendTextMessageServiceImpl.java index 464a9064..45005285 100644 --- a/postdischarge-quartz/src/main/java/com/xinelu/quartz/service/impl/SendTextMessageServiceImpl.java +++ b/postdischarge-quartz/src/main/java/com/xinelu/quartz/service/impl/SendTextMessageServiceImpl.java @@ -286,6 +286,8 @@ public class SendTextMessageServiceImpl implements SendTextMessageService { shortMessageSendRecord.setMessageType("COMMON"); if (StringUtils.isNotBlank(data.getSms_size())){ shortMessageSendRecord.setMessageQuantity(Long.valueOf(data.getSms_size())); + } + if (Objects.nonNull(price)){ shortMessageSendRecord.setMessageUnitPrice(price); } shortMessageSendRecord.setCreateBy("system"); diff --git a/postdischarge-quartz/src/main/java/com/xinelu/quartz/task/SendTextMessageTask.java b/postdischarge-quartz/src/main/java/com/xinelu/quartz/task/SendTextMessageTask.java index 493c758d..304c9a75 100644 --- a/postdischarge-quartz/src/main/java/com/xinelu/quartz/task/SendTextMessageTask.java +++ b/postdischarge-quartz/src/main/java/com/xinelu/quartz/task/SendTextMessageTask.java @@ -85,7 +85,7 @@ public class SendTextMessageTask { log.info("短信数据缺少任务信息!"); return; } - BigDecimal price = BigDecimal.valueOf(0.00); + BigDecimal price = null; List sysDictDataList = iSysDictTypeService.selectDictDataByType("unit_price"); if (CollectionUtils.isNotEmpty(sysDictDataList)){ SysDictData message = sysDictDataList.stream().filter(Objects::nonNull).filter(item -> item.getDictLabel().equals("message")).findFirst().orElse(new SysDictData());