xinyilu/PostDischargePatientManage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改记录查询时间

Browse Source
This commit is contained in:
zhangheng 2026-09-23 09:56:24 +08:00
parent 3a8cdfc752
commit 1605462870
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
postdischarge-manage/src/main/resources/mapper/manage/phonedialrecord/PhoneDialRecordMapper.xml
View File

@ -136,7 +136,7 @@
</if> </if>
<if test="dialTimeStart != null and dialTimeEnd != null"> <if test="dialTimeStart != null and dialTimeEnd != null">
and record.dial_time &gt;= #{dialTimeStart} and record.dial_time &gt;= #{dialTimeStart}
and record.dial_time &lt; #{dialTimeEnd} and record.dial_time &lt;= #{dialTimeEnd}
</if> </if>
<if test="phoneTemplateId != null and phoneTemplateId != ''"> <if test="phoneTemplateId != null and phoneTemplateId != ''">
and record.phone_template_id = #{phoneTemplateId} and record.phone_template_id = #{phoneTemplateId}

2
postdischarge-manage/src/main/resources/mapper/manage/shortmessagesendrecord/ShortMessageSendRecordMapper.xml
View File

@ -130,7 +130,7 @@
</if> </if>
<if test="sendTimeStart != null and sendTimeEnd != null"> <if test="sendTimeStart != null and sendTimeEnd != null">
and record.send_time &gt;= #{sendTimeStart} and record.send_time &gt;= #{sendTimeStart}
and record.send_time &lt; #{sendTimeEnd} and record.send_time &lt;= #{sendTimeEnd}
</if> </if>
<if test="messageTemplateId != null"> <if test="messageTemplateId != null">
and record.message_template_id = #{messageTemplateId} and record.message_template_id = #{messageTemplateId}

2
postdischarge-quartz/src/main/java/com/xinelu/quartz/controller/SendTextMessageController.java
View File

@ -71,7 +71,7 @@ public class SendTextMessageController {
if (Objects.isNull(signPatientManageRoute.getId())){ if (Objects.isNull(signPatientManageRoute.getId())){
return retObj; return retObj;
} }
BigDecimal price = BigDecimal.valueOf(0.00); BigDecimal price = null;
List<SysDictData> sysDictDataList = iSysDictTypeService.selectDictDataByType("unit_price"); List<SysDictData> sysDictDataList = iSysDictTypeService.selectDictDataByType("unit_price");
if (CollectionUtils.isNotEmpty(sysDictDataList)){ if (CollectionUtils.isNotEmpty(sysDictDataList)){
SysDictData message = sysDictDataList.stream().filter(Objects::nonNull).filter(item -> item.getDictLabel().equals("message")).findFirst().orElse(new SysDictData()); SysDictData message = sysDictDataList.stream().filter(Objects::nonNull).filter(item -> item.getDictLabel().equals("message")).findFirst().orElse(new SysDictData());

2
postdischarge-quartz/src/main/java/com/xinelu/quartz/service/impl/SendTextMessageServiceImpl.java
View File

@ -286,6 +286,8 @@ public class SendTextMessageServiceImpl implements SendTextMessageService {
shortMessageSendRecord.setMessageType("COMMON"); shortMessageSendRecord.setMessageType("COMMON");
if (StringUtils.isNotBlank(data.getSms_size())){ if (StringUtils.isNotBlank(data.getSms_size())){
shortMessageSendRecord.setMessageQuantity(Long.valueOf(data.getSms_size())); shortMessageSendRecord.setMessageQuantity(Long.valueOf(data.getSms_size()));
}
if (Objects.nonNull(price)){
shortMessageSendRecord.setMessageUnitPrice(price); shortMessageSendRecord.setMessageUnitPrice(price);
} }
shortMessageSendRecord.setCreateBy("system"); shortMessageSendRecord.setCreateBy("system");

2
postdischarge-quartz/src/main/java/com/xinelu/quartz/task/SendTextMessageTask.java
View File

@ -85,7 +85,7 @@ public class SendTextMessageTask {
log.info("短信数据缺少任务信息！"); log.info("短信数据缺少任务信息！");
return; return;
} }
BigDecimal price = BigDecimal.valueOf(0.00); BigDecimal price = null;
List<SysDictData> sysDictDataList = iSysDictTypeService.selectDictDataByType("unit_price"); List<SysDictData> sysDictDataList = iSysDictTypeService.selectDictDataByType("unit_price");
if (CollectionUtils.isNotEmpty(sysDictDataList)){ if (CollectionUtils.isNotEmpty(sysDictDataList)){
SysDictData message = sysDictDataList.stream().filter(Objects::nonNull).filter(item -> item.getDictLabel().equals("message")).findFirst().orElse(new SysDictData()); SysDictData message = sysDictDataList.stream().filter(Objects::nonNull).filter(item -> item.getDictLabel().equals("message")).findFirst().orElse(new SysDictData());