diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/shortmessagesendrecord/ShortMessageSendRecord.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/shortmessagesendrecord/ShortMessageSendRecord.java index 0b805576..ca7af3d1 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/shortmessagesendrecord/ShortMessageSendRecord.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/shortmessagesendrecord/ShortMessageSendRecord.java @@ -85,6 +85,12 @@ public class ShortMessageSendRecord extends BaseEntity { @ApiModelProperty(value = "推送结果状态码,success:成功,fail:失败") private String errorStatus; + /** + * 错误码信息描述 + */ + @ApiModelProperty(value = "错误码信息描述") + private String errMsg; + /** * PHONE_MSG:电话同时发短信时;COMMON:通用 */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/batchsendtaskinfo/impl/BatchSendTaskInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/batchsendtaskinfo/impl/BatchSendTaskInfoServiceImpl.java index 43439e28..08c5917d 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/batchsendtaskinfo/impl/BatchSendTaskInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/batchsendtaskinfo/impl/BatchSendTaskInfoServiceImpl.java @@ -304,7 +304,6 @@ public class BatchSendTaskInfoServiceImpl implements IBatchSendTaskInfoService { batchSendTaskRecordInfo.setRobotPublishId(batchSendTaskRecordDto.getRobotPublishId()); } batchSendTaskRecordInfo.setNodeExecuteStatus(NodeExecuteStatusEnum.EXECUTING.getInfo()); - batchSendTaskRecordInfo.setNodeContent(batchSendTaskRecordDto.getNodeContent()); batchSendTaskRecordInfo.setBatchTaskNumber(batchTaskNumber); batchSendTaskRecordInfo.setTaskExecuteType(TaskExcuteTypeEnum.BATCH_TASK.getInfo()); batchSendTaskRecordInfo.setNodePlanTime(batchSendTaskRecordDto.getNodePlanTime()); @@ -313,11 +312,6 @@ public class BatchSendTaskInfoServiceImpl implements IBatchSendTaskInfoService { batchSendTaskRecordInfo.setCreateTime(LocalDateTime.now()); batchSendTaskRecordInfo.setPhysicalExaminationLabel(batchSendTaskRecordDto.getPhysicalExaminationLabel()); batchSendTaskRecordInfo.setDelFlag(0); - int insertBatchSendTaskRecord = batchSendTaskRecordInfoMapper.insertBatchSendTaskRecordInfo(batchSendTaskRecordInfo); - if (insertBatchSendTaskRecord <= 0) { - log.info("新增批量推送任务记录失败"); - return AjaxResult.error("上传任务失败!请联系管理员!"); - } //保存短信变量 List batchSendTaskVariableInfos = new ArrayList<>(); if (Objects.nonNull(batchSendTaskRecordDto.getVars()) && batchSendTaskRecordDto.getBatchTaskSource().equals(BillSourceEnum.MESSAGE.getInfo())) { @@ -330,8 +324,15 @@ public class BatchSendTaskInfoServiceImpl implements IBatchSendTaskInfoService { batchSendTaskVariableInfo.setCreateBy(SecurityUtils.getUsername()); batchSendTaskRecordInfo.setCreateTime(LocalDateTime.now()); batchSendTaskVariableInfos.add(batchSendTaskVariableInfo); + batchSendTaskRecordDto.setMessageNodeContent(batchSendTaskRecordDto.getMessageNodeContent().replace("${ " + key + "}", batchSendTaskRecordDto.getVars().get(key))); + batchSendTaskRecordInfo.setNodeContent(batchSendTaskRecordDto.getMessageNodeContent()); } } + int insertBatchSendTaskRecord = batchSendTaskRecordInfoMapper.insertBatchSendTaskRecordInfo(batchSendTaskRecordInfo); + if (insertBatchSendTaskRecord <= 0) { + log.info("新增批量推送任务记录失败"); + return AjaxResult.error("上传任务失败!请联系管理员!"); + } List signPatientManageRoutes = new ArrayList<>(); List signPatientManageRouteNodes = new ArrayList<>(); String[] keys = new String[0]; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/batchsendtaskinfo/BatchSendTaskVo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/batchsendtaskinfo/BatchSendTaskVo.java index cc2508ea..d0266fde 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/batchsendtaskinfo/BatchSendTaskVo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/batchsendtaskinfo/BatchSendTaskVo.java @@ -35,4 +35,9 @@ public class BatchSendTaskVo extends BatchSendTaskInfo { */ @ApiModelProperty(value = "短信发送情况") private String messageNodeExecuteResultStatus; + + /** + * 任务状态 + */ + private String taskStatus; } diff --git a/postdischarge-manage/src/main/resources/mapper/manage/batchsendtaskrecordinfo/BatchSendTaskRecordInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/batchsendtaskrecordinfo/BatchSendTaskRecordInfoMapper.xml index e0f815de..d0f3e336 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/batchsendtaskrecordinfo/BatchSendTaskRecordInfoMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/batchsendtaskrecordinfo/BatchSendTaskRecordInfoMapper.xml @@ -66,6 +66,7 @@ + @@ -122,6 +123,7 @@ and physical_examination_label = #{physicalExaminationLabel} + ORDER BY create_time DESC