实训分数

beetlsql3-dev
maLix 2 years ago
parent 1e4effae8e
commit 9dbdb03d4e

@ -63,7 +63,7 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService<StudentHand
@Autowired
@Lazy
private TeacherOpenCourseHandsOnSimulationTasksService teacherOpenCourseHandsOnSimulationTasksService;
@Autowired private TeacherOpenCourseMergeResourcesQuestionService questionService;
@Autowired private TeacherOpenCourseMergeResourcesQuestionService teacherOpenCourseMergeResourcesQuestionService;
//存储学生临时答题
public static ConcurrentHashMap<String, Map<String, Object>> questions = new ConcurrentHashMap<>();
@ -401,7 +401,7 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService<StudentHand
String taskList = tasks.getTaskList();
TeacherOpenCourseMergeResourcesQuestionQuery questionQuery = new TeacherOpenCourseMergeResourcesQuestionQuery();
questionQuery.setTeacherOpenCourseMergeResourcesQuestionIdPlural(taskList);
List<TeacherOpenCourseMergeResourcesQuestion> resourcesQuestions = questionService.getValuesByQueryNotWithPermission(questionQuery);
List<TeacherOpenCourseMergeResourcesQuestion> resourcesQuestions = teacherOpenCourseMergeResourcesQuestionService.getValuesByQueryNotWithPermission(questionQuery);
if (CollectionUtils.isEmpty(resourcesQuestions)) {
return JsonResult.success(resourcesQuestions);
}
@ -460,10 +460,20 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService<StudentHand
TeacherOpenCourseMergeResourcesQuestionQuery questionQuery = new TeacherOpenCourseMergeResourcesQuestionQuery();
questionQuery.setTeacherOpenCourseMergeResourcesQuestionIdPlural(taskList);
questionQuery.setQuestionStatus(1);
List<TeacherOpenCourseMergeResourcesQuestion> resourcesQuestions = questionService.getValuesByQueryNotWithPermission(questionQuery);
List<TeacherOpenCourseMergeResourcesQuestion> resourcesQuestions = teacherOpenCourseMergeResourcesQuestionService.getValuesByQueryNotWithPermission(questionQuery);
if (CollectionUtils.isEmpty(resourcesQuestions)) {
return JsonResult.success(resourcesQuestions);
}
// 如果是已经做过的题,就把学生的题目分数带过来
resourcesQuestions.forEach(item -> {
boolean contains = ArrayUtil.contains(taskList.split(","), item.getTeacherOpenCourseMergeResourcesQuestionId().toString());
if (contains) {
item.setQuestionScore(tasks.getSingleScore());
}
});
return JsonResult.success(resourcesQuestions);
}
@ -521,7 +531,7 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService<StudentHand
String taskList = tasks.getTaskList();
TeacherOpenCourseMergeResourcesQuestionQuery questionQuery = new TeacherOpenCourseMergeResourcesQuestionQuery();
questionQuery.setTeacherOpenCourseMergeResourcesQuestionIdPlural(taskList);
List<TeacherOpenCourseMergeResourcesQuestion> resourcesQuestions = questionService.getValuesByQueryNotWithPermission(questionQuery);
List<TeacherOpenCourseMergeResourcesQuestion> resourcesQuestions = teacherOpenCourseMergeResourcesQuestionService.getValuesByQueryNotWithPermission(questionQuery);
List<StudentHandsOnTaskTheory> taskTheoryList = new ArrayList<>();
for (TeacherOpenCourseMergeResourcesQuestionVO resourcesQuestion : teacherOpenCourseMergeResourcesQuestionQueries) {

Loading…
Cancel
Save