驳回短信发送

distributed-print-business/src/main/java/com/qmth/distributed/print/business/activiti/DirectorApproveListener.java

@@ -72,7 +72,7 @@ public class DirectorApproveListener implements TaskListener {
             basicMessageService.sendNoticeTaskAuditFlow(examTask, sysUserList, MessageEnum.NOTICE_OF_AUDIT_CREATED);
         }
 
-        // 驳回短信
+        // 驳回短信（驳回给主任）
         if(tfFlowApprove.getStatus().equals(FlowStatusEnum.REJECT)
                 && tfFlowApprove.getSetup().equals(FlowGdykdxApproveSetupEnum.PRIMARY_APPROVE.getSetup())) {
             basicMessageService.sendNoticeTaskAuditFlow(examTask, sysUserList, MessageEnum.NOTICE_OF_AUDIT_REJECT);

distributed-print-business/src/main/java/com/qmth/distributed/print/business/activiti/PresidentApproveListener.java

@@ -78,11 +78,5 @@ public class PresidentApproveListener implements TaskListener {
                 && tfFlowApprove.getSetup().equals(FlowGdykdxApproveSetupEnum.SECOND_APPROVE.getSetup())) {
             basicMessageService.sendNoticeTaskAuditFlow(examTask, sysUserList, MessageEnum.NOTICE_OF_AUDIT_CREATED);
         }
-
-        // 驳回短信
-        if(tfFlowApprove.getStatus().equals(FlowStatusEnum.REJECT)
-                && tfFlowApprove.getSetup().equals(FlowGdykdxApproveSetupEnum.SECOND_APPROVE.getSetup())) {
-            basicMessageService.sendNoticeTaskAuditFlow(examTask, sysUserList, MessageEnum.NOTICE_OF_AUDIT_REJECT);
-        }
     }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicMessageServiceImpl.java

@@ -381,6 +381,10 @@ public class BasicMessageServiceImpl extends ServiceImpl<BasicMessageMapper, Bas
                 templateCode = dictionaryConfig.smsDomain().getAliyunSMSAuditOverdueCode();
                 templateContent = messageEnum.getTemplate();
                 break;
+            case NOTICE_OF_AUDIT_REJECT:
+                templateCode = dictionaryConfig.smsDomain().getAliyunSMSAuditRejectCode();
+                templateContent = messageEnum.getTemplate();
+                break;
         }
         result.put("templateContent", templateContent);
         result.put("templateCode", templateCode);

distributed-print/src/main/java/com/qmth/distributed/print/api/TFFlowController.java

@@ -2,6 +2,8 @@ package com.qmth.distributed.print.api;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.reflect.TypeToken;
+import com.google.gson.Gson;
 import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
@@ -17,19 +19,16 @@ import com.qmth.distributed.print.business.entity.ExamTask;
 import com.qmth.distributed.print.business.entity.TFFlow;
 import com.qmth.distributed.print.business.entity.TFFlowApprove;
 import com.qmth.distributed.print.business.entity.TFFlowApproveLog;
-import com.qmth.distributed.print.business.service.ActivitiService;
-import com.qmth.distributed.print.business.service.PrintCommonService;
-import com.qmth.distributed.print.business.service.TFFlowApproveLogService;
-import com.qmth.distributed.print.business.service.TFFlowService;
+import com.qmth.distributed.print.business.enums.MessageEnum;
+import com.qmth.distributed.print.business.service.*;
+import com.qmth.teachcloud.common.bean.params.ApproveUserResult;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicAttachment;
 import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.FieldUniqueEnum;
-import com.qmth.teachcloud.common.enums.FlowGdykdxApproveSetupEnum;
-import com.qmth.teachcloud.common.enums.UploadFileEnum;
+import com.qmth.teachcloud.common.enums.*;
 import com.qmth.teachcloud.common.service.BasicAttachmentService;
 import com.qmth.teachcloud.common.service.SysUserService;
+import com.qmth.teachcloud.common.util.JacksonUtil;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -49,9 +48,7 @@ import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * <p>
@@ -87,6 +84,9 @@ public class TFFlowController {
     @Autowired
     SysUserService sysUserService;
 
+    @Autowired
+    BasicMessageService basicMessageService;
+
     @ApiOperation(value = "注册流程")
     @Transactional
     @ApiResponses({@ApiResponse(code = 200, message = "常规信息", response = ResultUtil.class)})
@@ -177,9 +177,9 @@ public class TFFlowController {
         Map<String, Object> objectMap = activitiService.taskApprove(map);
         if (Objects.nonNull(objectMap)) {
             TFFlowApprove tfFlowApprove = (TFFlowApprove) objectMap.get("tfFlowApprove");
+            ExamTask examTask = (ExamTask) objectMap.get("examTask");
             //审核通过，生成pdf
             if (Objects.nonNull(tfFlowApprove) && FlowGdykdxApproveSetupEnum.FINISH.getSetup() == tfFlowApprove.getSetup()) {
-                ExamTask examTask = (ExamTask) objectMap.get("examTask");
                 // 取命题老师ID
                 SysUser sysUser = sysUserService.getById(examTask.getUserId());
                 try {
@@ -188,6 +188,14 @@ public class TFFlowController {
                     throw ExceptionResultEnum.ERROR.exception("生成pdf失败");
                 }
             }
+
+            // 驳回短信（驳回给提交老师）
+            if(tfFlowApprove.getStatus().equals(FlowStatusEnum.REJECT)
+                    && tfFlowApprove.getSetup().equals(FlowGdykdxApproveSetupEnum.SUBMIT.getSetup())) {
+                List<SysUser> sysUsers = sysUserService.listByIds(Arrays.asList(examTask.getUserId()));
+                List<ApproveUserResult> sysUserList = new Gson().fromJson(JacksonUtil.parseJson(sysUsers), new TypeToken<List<ApproveUserResult>>() {}.getType());
+                basicMessageService.sendNoticeTaskAuditFlow(examTask, sysUserList, MessageEnum.NOTICE_OF_AUDIT_REJECT);
+            }
         }
         return ResultUtil.ok();
     }

distributed-print/src/main/resources/application-release.properties

@@ -158,4 +158,6 @@ sms.config.aliyunSMSAuditReviewCode=SMS_217416269
 #\uFFFD\uFFFD\u02F4\uFFFD\uFFFD\uCD7D\uFFFD\uFFFD\u0524\uFFFD\uFFFD\u0368\u05AA
 sms.config.aliyunSMSAuditWillExpireCode=SMS_217436302
 #\uFFFD\uFFFD\u02F4\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0368\u05AA
-sms.config.aliyunSMSAuditOverdueCode=SMS_217416271
+sms.config.aliyunSMSAuditOverdueCode=SMS_217416271
+#²µ»Ø
+sms.config.aliyunSMSAuditRejectCode=SMS_225387112

distributed-print/src/main/resources/application-test.properties

@@ -159,4 +159,6 @@ sms.config.aliyunSMSAuditReviewCode=SMS_217416269
 #\u5BA1\u6838\u5F85\u529E\u5230\u671F\u9884\u8B66\u901A\u77E5\uFF08\u672A\u901A\u8FC7\uFF09
 sms.config.aliyunSMSAuditWillExpireCode=SMS_217436302
 #\u5BA1\u6838\u5F85\u529E\u903E\u671F\u901A\u77E5
-sms.config.aliyunSMSAuditOverdueCode=SMS_217416271
+sms.config.aliyunSMSAuditOverdueCode=SMS_217416271
+#²µ»Ø
+sms.config.aliyunSMSAuditRejectCode=SMS_225387112

teachcloud-common/src/main/java/com/qmth/teachcloud/common/domain/SmsDomain.java

@@ -23,6 +23,7 @@ public class SmsDomain {
     String aliyunSMSAuditReviewCode;
     String aliyunSMSAuditWillExpireCode;
     String aliyunSMSAuditOverdueCode;
+    String aliyunSMSAuditRejectCode;
 
     public String getSmsNormalCode() {
         return smsNormalCode;
@@ -167,4 +168,12 @@ public class SmsDomain {
     public void setAliyunSMSAuditOverdueCode(String aliyunSMSAuditOverdueCode) {
         this.aliyunSMSAuditOverdueCode = aliyunSMSAuditOverdueCode;
     }
+
+    public String getAliyunSMSAuditRejectCode() {
+        return aliyunSMSAuditRejectCode;
+    }
+
+    public void setAliyunSMSAuditRejectCode(String aliyunSMSAuditRejectCode) {
+        this.aliyunSMSAuditRejectCode = aliyunSMSAuditRejectCode;
+    }
 }