浏览代码

3.4.5 update-20250423,bug修改

xiaofei 2 月之前
父节点
当前提交
cf7cd813b3

+ 4 - 2
teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkTaskServiceImpl.java

@@ -426,8 +426,10 @@ public class MarkTaskServiceImpl extends ServiceImpl<MarkTaskMapper, MarkTask> i
             record.setStatusDisplay(record.getStatus().getName());
             record.setStatusDisplay(record.getStatus().getName());
             // 分组题目
             // 分组题目
             MarkQuestion markQuestion = markQuestionService.getById(record.getQuestionId());
             MarkQuestion markQuestion = markQuestionService.getById(record.getQuestionId());
-            record.setQuestionNumber(markQuestion.getQuestionNumber());
-            record.setQuestionScore(markQuestion.getTotalScore());
+            if (markQuestion != null) {
+                record.setQuestionNumber(markQuestion.getQuestionNumber());
+                record.setQuestionScore(markQuestion.getTotalScore());
+            }
         }
         }
         return markTaskDtoIPage;
         return markTaskDtoIPage;
     }
     }

+ 1 - 0
teachcloud-mark/src/main/resources/mapper/MarkTaskMapper.xml

@@ -392,6 +392,7 @@
                 and bes.teach_class_name = #{teachClassName}
                 and bes.teach_class_name = #{teachClassName}
             </if>
             </if>
         </where>
         </where>
+            order by mt.main_number, mt.sub_number
     </select>
     </select>
     <select id="selectMarkedCountAndTotalCount"
     <select id="selectMarkedCountAndTotalCount"
             resultType="com.qmth.teachcloud.mark.dto.mark.manage.MarkManageDto">
             resultType="com.qmth.teachcloud.mark.dto.mark.manage.MarkManageDto">