浏览代码

3.4.4 update-20250429,bug修改

xiaofei 1 月之前
父节点
当前提交
30c5d63267

+ 3 - 2
teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkQuestionServiceImpl.java

@@ -238,11 +238,12 @@ public class MarkQuestionServiceImpl extends ServiceImpl<MarkQuestionMapper, Mar
         // 更新客观题满分、主观题满分、总分
         this.updateMarkPaperScore(examId, paperNumber);
 
+        // 命题老师,任课老师,默认为评卷员
+        markUserQuestionService.saveDefaultMarker(examId, paperNumber);
+
         // 更新评卷设置中的状态
         markPaperService.updateQuestionStatus(examId, paperNumber);
         markPaperService.updateGroupStatus(examId, paperNumber);
-        // 命题老师,任课老师,默认为评卷员
-        markUserQuestionService.saveDefaultMarker(examId, paperNumber);
 
         // 主观题结构有变动
         List<MarkQuestion> subjectiveQuestions = questions.stream().filter(m -> m.getObjective()).collect(Collectors.toList());

+ 6 - 3
teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkUserQuestionServiceImpl.java

@@ -483,6 +483,9 @@ public class MarkUserQuestionServiceImpl extends ServiceImpl<MarkUserQuestionMap
         BasicMessageDto basicMessageDto = null;
         String templateCode = null;
         try {
+            basicMessageDto = new BasicMessageDto(schoolId, userId, userName, mobileNumber, paperNumber,
+                    courseCode, variableParams, messageType, createId,
+                    remark, templateCode);
             // code和content
             Map<String, String> enumInfo = smsSendUtil.getCodeAndContentByEnum(messageType);
             if (!enumInfo.containsKey("templateCode")) {
@@ -516,9 +519,6 @@ public class MarkUserQuestionServiceImpl extends ServiceImpl<MarkUserQuestionMap
                 throw ExceptionResultEnum.ERROR.exception("短信内容参数值必填");
             }
 
-            basicMessageDto = new BasicMessageDto(schoolId, userId, userName, mobileNumber, paperNumber,
-                    courseCode, variableParams, messageType, createId,
-                    remark, templateCode);
             // 调用阿里云短信平台发送短信
             Map<String, Object> templateParam = JSON.parseObject(variableParams, Map.class);
             SmsResponseResult smsResponseResult = smsSendUtil.sendSms(mobileNumber, templateCode, templateParam);
@@ -548,6 +548,9 @@ public class MarkUserQuestionServiceImpl extends ServiceImpl<MarkUserQuestionMap
         List<MarkTaskSmsDto> markTaskSmsDtoList = this.findMarkTaskSms(examId, courseId, paperNumber);
         if (CollectionUtils.isNotEmpty(markTaskSmsDtoList)) {
             for (MarkTaskSmsDto m : markTaskSmsDtoList) {
+                if(StringUtils.isBlank(m.getMobileNumber())){
+                    continue;
+                }
                 StringJoiner stringJoiner = new StringJoiner("-");
                 stringJoiner.add(m.getExamId().toString()).add(m.getCourseId().toString()).add(m.getPaperNumber());
                 int count = this.smsConditionCount(m.getUserId(), m.getMobileNumber(), stringJoiner.toString());