tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、我的课程-实操-理论

Browse Source
beetlsql3-dev
wgf 2 years ago
parent 058dd77c96
commit 0a84b3a406
4 changed files with 249 additions and 144 deletions
Show Stats Download Patch File Download Diff File

21
web/src/main/java/com/ibeetl/jlw/entity/vo/ResourcesQuestionVO.java
Unescape Escape View File

@ -0,0 +1,21 @@
package com.ibeetl.jlw.entity.vo;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.ibeetl.jlw.entity.ResourcesQuestion;
import lombok.Data;
/**
* 类功能说明
*
* @Version 0.0.1
* @Author 许良彤
* @Date 2022/12/7 21:42
*/
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class ResourcesQuestionVO extends ResourcesQuestion {
private String myOptions;
private String taskId;
}

355
web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskTheoryService.java
Unescape Escape View File

@ -19,6 +19,7 @@ import com.ibeetl.jlw.dao.HandsOnDao;
import com.ibeetl.jlw.dao.StudentHandsOnTaskTheoryDao; import com.ibeetl.jlw.dao.StudentHandsOnTaskTheoryDao;
import com.ibeetl.jlw.entity.*; import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.entity.dto.FillAndAnalysisScoreDTO; import com.ibeetl.jlw.entity.dto.FillAndAnalysisScoreDTO;
import com.ibeetl.jlw.entity.vo.ResourcesQuestionVO;
import com.ibeetl.jlw.entity.vo.TeacherOpenCourseMergeResourcesQuestionVO; import com.ibeetl.jlw.entity.vo.TeacherOpenCourseMergeResourcesQuestionVO;
import com.ibeetl.jlw.enums.HandsOnTaskEnum; import com.ibeetl.jlw.enums.HandsOnTaskEnum;
import com.ibeetl.jlw.service.handson.HandsOnTaskQueue; import com.ibeetl.jlw.service.handson.HandsOnTaskQueue;
@ -966,154 +967,226 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService<StudentHand
List<StudentHandsOnTaskTheory> taskTheoryList = new ArrayList<>(); List<StudentHandsOnTaskTheory> taskTheoryList = new ArrayList<>();
//1 教师开课 2 系统授权 TeacherOpenCourseHandsOnSimulationTasksQuery tasksQuery = new TeacherOpenCourseHandsOnSimulationTasksQuery();
if (ObjectUtil.equals(courseType, 2)) { tasksQuery.setTaskId(taskId);
HandsOnSimulationTasksQuery simulationTasksQuery = new HandsOnSimulationTasksQuery(); List<TeacherOpenCourseHandsOnSimulationTasks> tasksList = teacherOpenCourseHandsOnSimulationTasksService.getValuesByQueryNotWithPermission(tasksQuery);
simulationTasksQuery.setTaskId(taskId); if (CollectionUtils.isEmpty(tasksList)) {
List<HandsOnSimulationTasks> handsOnSimulationTasksList = handsOnSimulationTasksService.getValuesByQueryNotPermission(simulationTasksQuery); return JsonResult.fail();
if (CollectionUtils.isEmpty(handsOnSimulationTasksList)) { }
return JsonResult.fail(); TeacherOpenCourseHandsOnSimulationTasks tasks = tasksList.get(0);
} handsOnId = tasks.getHandsOnId();
HandsOnSimulationTasks handsOnSimulationTasks = handsOnSimulationTasksList.get(0); String taskList = tasks.getTaskList();
TeacherOpenCourseMergeResourcesQuestionQuery questionQuery = new TeacherOpenCourseMergeResourcesQuestionQuery();
handsOnId = handsOnSimulationTasks.getHandsOnId(); questionQuery.setTeacherOpenCourseMergeResourcesQuestionIdPlural(taskList);
List<TeacherOpenCourseMergeResourcesQuestion> resourcesQuestions = teacherOpenCourseMergeResourcesQuestionService.getValuesByQueryNotWithPermission(questionQuery);
String taskList = handsOnSimulationTasks.getTaskList();
ResourcesQuestionQuery questionQuery = new ResourcesQuestionQuery();
questionQuery.setResourcesQuestionIds(taskList); for (TeacherOpenCourseMergeResourcesQuestionVO resourcesQuestion : teacherOpenCourseMergeResourcesQuestionQueries) {
List<ResourcesQuestion> resourcesQuestionList = resourcesQuestionService.getValuesByQueryNotWithPermission(questionQuery); StudentHandsOnTaskTheory taskTheory = new StudentHandsOnTaskTheory();
taskTheory.setCourseType(courseType);
taskTheory.setTeacherOpenCourseId(tasks.getTeacherOpenCourseId());
for (TeacherOpenCourseMergeResourcesQuestionVO resourcesQuestion : teacherOpenCourseMergeResourcesQuestionQueries) { taskTheory.setHandsOnId(tasks.getHandsOnId());
//根据实操id 获取课程id taskTheory.setHandsOnTaskId(tasks.getTaskId());
List<HandsOn> handsOns = ObjectUtil.isEmpty(handsOnSimulationTasks.getHandsOnId()) ? new ArrayList<>() : handsOnDao.getByIds(handsOnSimulationTasks.getHandsOnId().toString()); taskTheory.setStem(resourcesQuestion.getQuestionStem());
StudentHandsOnTaskTheory taskTheory = new StudentHandsOnTaskTheory(); Integer questionType = resourcesQuestion.getQuestionType();
taskTheory.setCourseType(courseType); taskTheory.setQuestionType(questionType);
taskTheory.setTeacherOpenCourseId(CollectionUtils.isEmpty(handsOns) ? null : handsOns.get(0).getCourseInfoId()); String myOptions = ObjectUtil.defaultIfBlank(resourcesQuestion.getMyOptions(), "");
taskTheory.setHandsOnId(handsOnSimulationTasks.getHandsOnId()); taskTheory.setMyOptions(myOptions);
taskTheory.setHandsOnTaskId(handsOnSimulationTasks.getTaskId()); TeacherOpenCourseMergeResourcesQuestion teacherOpenCourseMergeResourcesQuestion = resourcesQuestions.stream().filter(v -> v.getTeacherOpenCourseMergeResourcesQuestionId().equals(resourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId())).findFirst().orElse(new TeacherOpenCourseMergeResourcesQuestion());
taskTheory.setStem(resourcesQuestion.getQuestionStem()); String questionAnswer = ObjectUtil.defaultIfBlank(teacherOpenCourseMergeResourcesQuestion.getQuestionAnswer(), "");
Integer questionType = resourcesQuestion.getQuestionType(); taskTheory.setRightKey(questionAnswer);
taskTheory.setQuestionType(questionType); if (questionType.equals(1)) {
String myOptions = ObjectUtil.defaultIfBlank(resourcesQuestion.getMyOptions(), ""); if (questionAnswer.contains(myOptions)) {
taskTheory.setMyOptions(myOptions); taskTheory.setTheoryScore(tasks.getSingleScore());
ResourcesQuestion resourcesQuestionItem = resourcesQuestionList.stream().filter(v -> v.getResourcesQuestionId().equals(resourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId())).findFirst().orElse(new ResourcesQuestion()); } else {
String questionAnswer = ObjectUtil.defaultIfBlank(resourcesQuestionItem.getQuestionAnswer(), ""); taskTheory.setTheoryScore(BigDecimal.ZERO);
taskTheory.setRightKey(questionAnswer); }
if (questionType.equals(1)) { } else if (questionType.equals(2)) {
if (questionAnswer.contains(myOptions)) { String[] split = Arrays.stream(questionAnswer.split(",")).sorted().toArray(String[]::new);
taskTheory.setTheoryScore(handsOnSimulationTasks.getSingleScore()); String[] split1 = Arrays.stream(myOptions.split(",")).sorted().toArray(String[]::new);
} else { ;
taskTheory.setTheoryScore(BigDecimal.ZERO); if (ArrayUtil.equals(split, split1)) {
} taskTheory.setTheoryScore(tasks.getMultipleScore());
} else if (questionType.equals(2)) { } else {
String[] split = Arrays.stream(questionAnswer.split(",")).sorted().toArray(String[]::new); taskTheory.setTheoryScore(BigDecimal.ZERO);
String[] split1 = Arrays.stream(myOptions.split(",")).sorted().toArray(String[]::new); }
; } else if (questionType.equals(3)) {
if (ArrayUtil.equals(split, split1)) { if (questionAnswer.contains(myOptions)) {
taskTheory.setTheoryScore(handsOnSimulationTasks.getMultipleScore()); taskTheory.setTheoryScore(tasks.getJudgeScore());
} else { } else {
taskTheory.setTheoryScore(BigDecimal.ZERO); taskTheory.setTheoryScore(BigDecimal.ZERO);
} }
} else if (questionType.equals(3)) { } else if (questionType.equals(4)) {
if (questionAnswer.contains(myOptions)) { if (questionAnswer.equals(myOptions)) {
taskTheory.setTheoryScore(handsOnSimulationTasks.getJudgeScore()); taskTheory.setTheoryScore(tasks.getFillScore());
} else { } else {
taskTheory.setTheoryScore(BigDecimal.ZERO); taskTheory.setTheoryScore(BigDecimal.ZERO);
} }
} else if (questionType.equals(4)) { } else if (questionType.equals(5)) {
if (questionAnswer.equals(myOptions)) { if (questionAnswer.equals(myOptions)) {
taskTheory.setTheoryScore(handsOnSimulationTasks.getFillScore()); taskTheory.setTheoryScore(tasks.getAnalysisScore());
} else { } else {
taskTheory.setTheoryScore(BigDecimal.ZERO); taskTheory.setTheoryScore(BigDecimal.ZERO);
}
} else if (questionType.equals(5)) {
if (questionAnswer.equals(myOptions)) {
taskTheory.setTheoryScore(handsOnSimulationTasks.getAnalysisScore());
} else {
taskTheory.setTheoryScore(BigDecimal.ZERO);
}
} }
taskTheory.setIsCourseCentre(2);
taskTheory.setCreateTime(new Date());
taskTheory.setStudentId(student.getStudentId());
taskTheory.setUserId(coreUser.getId());
taskTheory.setOrgId(resourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId());
taskTheoryList.add(taskTheory);
} }
taskTheory.setIsCourseCentre(2);
taskTheory.setCreateTime(new Date());
taskTheory.setStudentId(student.getStudentId());
taskTheory.setUserId(coreUser.getId());
taskTheory.setOrgId(resourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId());
taskTheoryList.add(taskTheory);
}
} else {
TeacherOpenCourseHandsOnSimulationTasksQuery tasksQuery = new TeacherOpenCourseHandsOnSimulationTasksQuery(); //更新成绩
tasksQuery.setTaskId(taskId); if (CollUtil.isNotEmpty(taskTheoryList)) {
List<TeacherOpenCourseHandsOnSimulationTasks> tasksList = teacherOpenCourseHandsOnSimulationTasksService.getValuesByQueryNotWithPermission(tasksQuery); BigDecimal totalScore = new BigDecimal(0);
if (CollectionUtils.isEmpty(tasksList)) { for (StudentHandsOnTaskTheory studentHandsOnTaskTheory : taskTheoryList) {
return JsonResult.fail(); BigDecimal theoryScore = studentHandsOnTaskTheory.getTheoryScore();
totalScore = totalScore.add(ObjectUtil.defaultIfNull(theoryScore, BigDecimal.ZERO));
} }
TeacherOpenCourseHandsOnSimulationTasks tasks = tasksList.get(0);
handsOnId = tasks.getHandsOnId(); HandsOnAchievement build = HandsOnAchievement.builder()
String taskList = tasks.getTaskList(); .handOnId(handsOnId)
TeacherOpenCourseMergeResourcesQuestionQuery questionQuery = new TeacherOpenCourseMergeResourcesQuestionQuery(); .studentId(student.getStudentId())
questionQuery.setTeacherOpenCourseMergeResourcesQuestionIdPlural(taskList); .classId(student.getClassId())
List<TeacherOpenCourseMergeResourcesQuestion> resourcesQuestions = teacherOpenCourseMergeResourcesQuestionService.getValuesByQueryNotWithPermission(questionQuery); .theoryScore(totalScore.toPlainString())
.courseType(courseType)
.isCourseCentre(2)
for (TeacherOpenCourseMergeResourcesQuestionVO resourcesQuestion : teacherOpenCourseMergeResourcesQuestionQueries) { .orgId(student.getOrgId())
StudentHandsOnTaskTheory taskTheory = new StudentHandsOnTaskTheory(); .userId(student.getUserId()).build();
taskTheory.setCourseType(courseType); handsOnAchievementService.setHandsOnAchievement(build, HandsOnTaskEnum.TASK_THEORY);
taskTheory.setTeacherOpenCourseId(tasks.getTeacherOpenCourseId()); }
taskTheory.setHandsOnId(tasks.getHandsOnId());
taskTheory.setHandsOnTaskId(tasks.getTaskId()); this.insertBatch(taskTheoryList);
taskTheory.setStem(resourcesQuestion.getQuestionStem()); questions.remove(s);
Integer questionType = resourcesQuestion.getQuestionType(); return JsonResult.success("提交成功");
taskTheory.setQuestionType(questionType); }
String myOptions = ObjectUtil.defaultIfBlank(resourcesQuestion.getMyOptions(), "");
taskTheory.setMyOptions(myOptions);
TeacherOpenCourseMergeResourcesQuestion teacherOpenCourseMergeResourcesQuestion = resourcesQuestions.stream().filter(v -> v.getTeacherOpenCourseMergeResourcesQuestionId().equals(resourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId())).findFirst().orElse(new TeacherOpenCourseMergeResourcesQuestion()); /**
String questionAnswer = ObjectUtil.defaultIfBlank(teacherOpenCourseMergeResourcesQuestion.getQuestionAnswer(), ""); * 课程中心添加（授权课程） 添加任务 理论测评
taskTheory.setRightKey(questionAnswer); *
if (questionType.equals(1)) { * @param
if (questionAnswer.contains(myOptions)) { * @param coreUser
taskTheory.setTheoryScore(tasks.getSingleScore()); * @param i 1强制提交 2临时提交
} else { * @param courseType 1 教师开课 2 系统授权
taskTheory.setTheoryScore(BigDecimal.ZERO); * @return
} */
} else if (questionType.equals(2)) { public JsonResult<String> addSystemTheoreticalEvaluation(List<ResourcesQuestionVO> resourcesQuestionQueries, CoreUser coreUser, int i, int courseType) {
String[] split = Arrays.stream(questionAnswer.split(",")).sorted().toArray(String[]::new); //查询登录用的学生id
String[] split1 = Arrays.stream(myOptions.split(",")).sorted().toArray(String[]::new); if (!coreUser.isStudent()) {
; return null;
if (ArrayUtil.equals(split, split1)) { }
taskTheory.setTheoryScore(tasks.getMultipleScore()); if (CollectionUtils.isEmpty(resourcesQuestionQueries)) {
} else { return JsonResult.fail();
taskTheory.setTheoryScore(BigDecimal.ZERO); }
} Long taskId = Long.parseLong(resourcesQuestionQueries.get(0).getTaskId() + "");
} else if (questionType.equals(3)) { Student student = studentService.getByUserId(coreUser.getId());
if (questionAnswer.contains(myOptions)) { String s = student.getStudentId() + "&" + taskId;
taskTheory.setTheoryScore(tasks.getJudgeScore()); //如果==2 说明是临时保存
} else { if (i == 2) {
taskTheory.setTheoryScore(BigDecimal.ZERO); Map<String, Object> map = questions.get(s);
} Record record = MapUtil.get(map, "record", Record.class);
} else if (questionType.equals(4)) { Map<String, Object> map1 = new HashMap<>();
if (questionAnswer.equals(myOptions)) { map1.put("resourcesQuestions", resourcesQuestionQueries);
taskTheory.setTheoryScore(tasks.getFillScore()); if (record == null) {
} else { record = new Record();
taskTheory.setTheoryScore(BigDecimal.ZERO); record.setStudentId(student.getStudentId());
} record.setTaskId(taskId);
} else if (questionType.equals(5)) { Date date = new Date();
if (questionAnswer.equals(myOptions)) { record.setStartTime(date);
taskTheory.setTheoryScore(tasks.getAnalysisScore()); record.setEndTime(DateUtil.offsetHour(date, 3));
} else {
taskTheory.setTheoryScore(BigDecimal.ZERO);
}
}
taskTheory.setIsCourseCentre(2);
taskTheory.setCreateTime(new Date());
taskTheory.setStudentId(student.getStudentId());
taskTheory.setUserId(coreUser.getId());
taskTheory.setOrgId(resourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId());
taskTheoryList.add(taskTheory);
} }
map1.put("record", record);
questions.put(s, map1);
return JsonResult.success("临时保存成功");
}
List<StudentHandsOnTaskTheory> theoryList = this.sqlManager.lambdaQuery(StudentHandsOnTaskTheory.class).andEq(StudentHandsOnTaskTheory::getHandsOnTaskId, taskId)
.andEq(StudentHandsOnTaskTheory::getCourseType, courseType)
.andEq(StudentHandsOnTaskTheory::getIsCourseCentre,2)
.andEq(StudentHandsOnTaskTheory::getStudentId, student.getStudentId()).select();
if (CollectionUtils.isNotEmpty(theoryList)) {
return JsonResult.fail("已提交,重复提交");
}
Long handsOnId = null;
List<StudentHandsOnTaskTheory> taskTheoryList = new ArrayList<>();
HandsOnSimulationTasksQuery simulationTasksQuery = new HandsOnSimulationTasksQuery();
simulationTasksQuery.setTaskId(taskId);
List<HandsOnSimulationTasks> handsOnSimulationTasksList = handsOnSimulationTasksService.getValuesByQueryNotPermission(simulationTasksQuery);
if (CollectionUtils.isEmpty(handsOnSimulationTasksList)) {
return JsonResult.fail();
}
HandsOnSimulationTasks handsOnSimulationTasks = handsOnSimulationTasksList.get(0);
handsOnId = handsOnSimulationTasks.getHandsOnId();
String taskList = handsOnSimulationTasks.getTaskList();
ResourcesQuestionQuery questionQuery = new ResourcesQuestionQuery();
questionQuery.setResourcesQuestionIds(taskList);
List<ResourcesQuestion> resourcesQuestionList = resourcesQuestionService.getValuesByQueryNotWithPermission(questionQuery);
for (ResourcesQuestionVO resourcesQuestion : resourcesQuestionQueries) {
//根据实操id 获取课程id
List<HandsOn> handsOns = ObjectUtil.isEmpty(handsOnSimulationTasks.getHandsOnId()) ? new ArrayList<>() : handsOnDao.getByIds(handsOnSimulationTasks.getHandsOnId().toString());
StudentHandsOnTaskTheory taskTheory = new StudentHandsOnTaskTheory();
taskTheory.setCourseType(courseType);
taskTheory.setTeacherOpenCourseId(CollectionUtils.isEmpty(handsOns) ? null : handsOns.get(0).getCourseInfoId());
taskTheory.setHandsOnId(handsOnSimulationTasks.getHandsOnId());
taskTheory.setHandsOnTaskId(handsOnSimulationTasks.getTaskId());
taskTheory.setStem(resourcesQuestion.getQuestionStem());
Integer questionType = resourcesQuestion.getQuestionType();
taskTheory.setQuestionType(questionType);
String myOptions = ObjectUtil.defaultIfBlank(resourcesQuestion.getMyOptions(), "");
taskTheory.setMyOptions(myOptions);
ResourcesQuestion resourcesQuestionItem = resourcesQuestionList.stream().filter(v -> v.getResourcesQuestionId().equals(resourcesQuestion.getResourcesQuestionId())).findFirst().orElse(new ResourcesQuestion());
String questionAnswer = ObjectUtil.defaultIfBlank(resourcesQuestionItem.getQuestionAnswer(), "");
taskTheory.setRightKey(questionAnswer);
if (questionType.equals(1)) {
if (questionAnswer.contains(myOptions)) {
taskTheory.setTheoryScore(handsOnSimulationTasks.getSingleScore());
} else {
taskTheory.setTheoryScore(BigDecimal.ZERO);
}
} else if (questionType.equals(2)) {
String[] split = Arrays.stream(questionAnswer.split(",")).sorted().toArray(String[]::new);
String[] split1 = Arrays.stream(myOptions.split(",")).sorted().toArray(String[]::new);
;
if (ArrayUtil.equals(split, split1)) {
taskTheory.setTheoryScore(handsOnSimulationTasks.getMultipleScore());
} else {
taskTheory.setTheoryScore(BigDecimal.ZERO);
}
} else if (questionType.equals(3)) {
if (questionAnswer.contains(myOptions)) {
taskTheory.setTheoryScore(handsOnSimulationTasks.getJudgeScore());
} else {
taskTheory.setTheoryScore(BigDecimal.ZERO);
}
} else if (questionType.equals(4)) {
if (questionAnswer.equals(myOptions)) {
taskTheory.setTheoryScore(handsOnSimulationTasks.getFillScore());
} else {
taskTheory.setTheoryScore(BigDecimal.ZERO);
}
} else if (questionType.equals(5)) {
if (questionAnswer.equals(myOptions)) {
taskTheory.setTheoryScore(handsOnSimulationTasks.getAnalysisScore());
} else {
taskTheory.setTheoryScore(BigDecimal.ZERO);
}
}
taskTheory.setIsCourseCentre(2);
taskTheory.setCreateTime(new Date());
taskTheory.setStudentId(student.getStudentId());
taskTheory.setUserId(coreUser.getId());
taskTheory.setOrgId(resourcesQuestion.getOrgId());
taskTheoryList.add(taskTheory);
} }

7
web/src/main/java/com/ibeetl/jlw/web/HandsOnController.java
Unescape Escape View File

@ -431,6 +431,11 @@ public class HandsOnController{
*/ */
@GetMapping(API + "/getCourseCentreHandsListCenterByOpenCourseId.do") @GetMapping(API + "/getCourseCentreHandsListCenterByOpenCourseId.do")
public JsonResult getCourseCentreHandsListCenterByOpenCourseId(Long courseInfoId,@SCoreUser CoreUser coreUser) { public JsonResult getCourseCentreHandsListCenterByOpenCourseId(Long courseInfoId,@SCoreUser CoreUser coreUser) {
return handsOnService.getCourseCentreHandsListByOpenCourseIdAndStudent(courseInfoId,coreUser); if (coreUser.isTeacher()){
List<StudentHandsOnVO> handsListCenterByOpenCourseId = handsOnService.getHandsListCenterByOpenCourseId(courseInfoId);
return JsonResult.success(handsListCenterByOpenCourseId);
}else {
return handsOnService.getCourseCentreHandsListByOpenCourseIdAndStudent(courseInfoId,coreUser);
}
} }
} }

10
web/src/main/java/com/ibeetl/jlw/web/StudentHandsOnTaskTheoryController.java
Unescape Escape View File

@ -20,6 +20,7 @@ import com.ibeetl.jlw.entity.ResourcesQuestion;
import com.ibeetl.jlw.entity.StudentHandsOnTaskTheory; import com.ibeetl.jlw.entity.StudentHandsOnTaskTheory;
import com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesQuestion; import com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesQuestion;
import com.ibeetl.jlw.entity.dto.FillAndAnalysisScoreDTO; import com.ibeetl.jlw.entity.dto.FillAndAnalysisScoreDTO;
import com.ibeetl.jlw.entity.vo.ResourcesQuestionVO;
import com.ibeetl.jlw.entity.vo.TeacherOpenCourseMergeResourcesQuestionVO; import com.ibeetl.jlw.entity.vo.TeacherOpenCourseMergeResourcesQuestionVO;
import com.ibeetl.jlw.enums.ResourcesQuestionTypeEnum; import com.ibeetl.jlw.enums.ResourcesQuestionTypeEnum;
import com.ibeetl.jlw.service.StudentHandsOnTaskTheoryService; import com.ibeetl.jlw.service.StudentHandsOnTaskTheoryService;
@ -715,9 +716,14 @@ public class StudentHandsOnTaskTheoryController {
if (ObjectUtil.isEmpty(courseType)){ if (ObjectUtil.isEmpty(courseType)){
return JsonResult.failMessage("缺少课程类型" ); return JsonResult.failMessage("缺少课程类型" );
} }
List<TeacherOpenCourseMergeResourcesQuestionVO> teacherOpenCourseMergeResourcesQuestionVOS = JSONObject.parseArray(teacherOpenCourseMergeResourcesQuestionQuery,TeacherOpenCourseMergeResourcesQuestionVO.class); if (ObjectUtil.equals(courseType,2)){
List<ResourcesQuestionVO> teacherOpenCourseMergeResourcesQuestionVOS = JSONObject.parseArray(teacherOpenCourseMergeResourcesQuestionQuery,ResourcesQuestionVO.class);
return studentHandsOnTaskTheoryService.addSystemTheoreticalEvaluation(teacherOpenCourseMergeResourcesQuestionVOS, coreUser, temporarily,courseType);
}else {
List<TeacherOpenCourseMergeResourcesQuestionVO> teacherOpenCourseMergeResourcesQuestionVOS = JSONObject.parseArray(teacherOpenCourseMergeResourcesQuestionQuery,TeacherOpenCourseMergeResourcesQuestionVO.class);
return studentHandsOnTaskTheoryService.addTheoreticalEvaluation(teacherOpenCourseMergeResourcesQuestionVOS, coreUser, temporarily,courseType); return studentHandsOnTaskTheoryService.addTheoreticalEvaluation(teacherOpenCourseMergeResourcesQuestionVOS, coreUser, temporarily,courseType);
}
} }
} }

Write Preview
Loading…
Cancel
Save