| @@ -48,7 +48,7 @@ public class ApprovalServiceImpl implements ApprovalService { | |||||
| @Override | @Override | ||||
| public void approve(ApprovalRequest approval) { | public void approve(ApprovalRequest approval) { | ||||
| ApprovalRequest info = approvalInfoMapper.queryById(approval.getId()); | ApprovalRequest info = approvalInfoMapper.queryById(approval.getId()); | ||||
| String contentTemplate="<b>{}</b>发布的{}<b>\"{}\"</b>{}审核已通过"; | |||||
| String contentTemplate="<b>{}</b>发布的{}<b>\"{}\"</b>审核已通过"; | |||||
| String contentFormat = StrUtil.format(contentTemplate,info.getApplicantName(),ApprovalType.getDescription(info.getType()) | String contentFormat = StrUtil.format(contentTemplate,info.getApplicantName(),ApprovalType.getDescription(info.getType()) | ||||
| ,getModelNameByType(info.getContent(),info.getType())); | ,getModelNameByType(info.getContent(),info.getType())); | ||||
| approval.setTitle(contentFormat); | approval.setTitle(contentFormat); | ||||
| @@ -92,7 +92,7 @@ public class ApprovalServiceImpl implements ApprovalService { | |||||
| ,getModelNameByType(info.getContent(),info.getType())); | ,getModelNameByType(info.getContent(),info.getType())); | ||||
| approval.setTitle(contentFormat); | approval.setTitle(contentFormat); | ||||
| //更改审批单状态 | //更改审批单状态 | ||||
| approval.setStatus(ApprovalStatus.APPROVED.getCode()); | |||||
| approval.setStatus(ApprovalStatus.REJECTED.getCode()); | |||||
| approvalInfoMapper.updateApproval(approval); | approvalInfoMapper.updateApproval(approval); | ||||
| //推送消息给申请人 | //推送消息给申请人 | ||||
| NewSysNotificationParamsVo newSysNotificationParamsVo = new NewSysNotificationParamsVo(); | NewSysNotificationParamsVo newSysNotificationParamsVo = new NewSysNotificationParamsVo(); | ||||