审批功能联调

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ApprovalServiceImpl.java

@@ -48,10 +48,7 @@ public class ApprovalServiceImpl implements ApprovalService {
     @Override
     public void approve(ApprovalRequest approval) {
         ApprovalRequest info = approvalInfoMapper.queryById(approval.getId());
-        String contentTemplate="<b>{}</b>发布的{}<b>\"{}\"</b>审核已通过";
-        String contentFormat = StrUtil.format(contentTemplate,info.getApplicantName(),ApprovalType.getDescription(info.getType())
-                ,getModelNameByType(info.getContent(),info.getType()));
-        approval.setTitle(contentFormat);
+
         //更改审批单状态
         approval.setStatus(ApprovalStatus.APPROVED.getCode());
         approvalInfoMapper.updateApproval(approval);
@@ -62,6 +59,10 @@ public class ApprovalServiceImpl implements ApprovalService {
         String appContentFormat = StrUtil.format(applyContentTemplate,ApprovalType.getDescription(info.getType())
                 ,getModelNameByType(info.getContent(),info.getType()));
 
+        String contentTemplate="<b>{}</b>发布的{}<b>\"{}\"</b>审核已通过";
+        String contentFormat = StrUtil.format(contentTemplate,info.getApplicantName(),ApprovalType.getDescription(info.getType())
+                ,getModelNameByType(info.getContent(),info.getType()));
+
         newSysNotificationParamsVo.setType(2);
         newSysNotificationParamsVo.setSender(info.getApplicantId());
         newSysNotificationParamsVo.setNotification_url(info.getUrl());
@@ -87,10 +88,6 @@ public class ApprovalServiceImpl implements ApprovalService {
     public void reject(ApprovalRequest approval) {
         ApprovalRequest info = approvalInfoMapper.queryById(approval.getId());
 
-        String contentTemplate="<b>{}</b>发布的{}<b>\"{}\"</b>{}审核未通过";
-        String contentFormat = StrUtil.format(contentTemplate,info.getApplicantName(),ApprovalType.getDescription(info.getType())
-                ,getModelNameByType(info.getContent(),info.getType()));
-        approval.setTitle(contentFormat);
         //更改审批单状态
         approval.setStatus(ApprovalStatus.REJECTED.getCode());
         approvalInfoMapper.updateApproval(approval);
@@ -101,6 +98,10 @@ public class ApprovalServiceImpl implements ApprovalService {
         String appContentFormat = StrUtil.format(applyContentTemplate,ApprovalType.getDescription(info.getType())
                 ,getModelNameByType(info.getContent(),info.getType()));
 
+        String contentTemplate="<b>{}</b>发布的{}<b>\"{}\"</b>审核未通过";
+        String contentFormat = StrUtil.format(contentTemplate,info.getApplicantName(),ApprovalType.getDescription(info.getType())
+                ,getModelNameByType(info.getContent(),info.getType()));
+
         newSysNotificationParamsVo.setType(2);
         newSysNotificationParamsVo.setSender(info.getApplicantId());
         newSysNotificationParamsVo.setNotification_url(info.getUrl());