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

Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

Browse Source
beetlsql3-dev
Mlxa0324 2 years ago
parent b7bccb4a00 a58d401395
commit 22bc91c037
5 changed files with 135 additions and 1 deletions
Show Stats Download Patch File Download Diff File

13
web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnSimulationTasks.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.ibeetl.jlw.entity;
import javax.validation.constraints.NotNull;
import com.ibeetl.admin.core.entity.BaseEntity;
import com.ibeetl.jlw.entity.vo.HandsOnTaskProblemVo;
import org.beetl.sql.annotation.entity.*;
import com.ibeetl.admin.core.util.ValidateConfig;
@ -84,7 +85,17 @@ public class TeacherOpenCourseHandsOnSimulationTasks extends BaseEntity{
//添加时间
private Date addTime ;
private HandsOnTaskProblemVo handsOnTaskProblemVo;
public HandsOnTaskProblemVo getHandsOnTaskProblemVo() {
return handsOnTaskProblemVo;
}
public void setHandsOnTaskProblemVo(HandsOnTaskProblemVo handsOnTaskProblemVo) {
this.handsOnTaskProblemVo = handsOnTaskProblemVo;
}
public TeacherOpenCourseHandsOnSimulationTasks(){
}

67
web/src/main/java/com/ibeetl/jlw/entity/vo/HandsOnTaskProblemVo.java
Unescape Escape View File

@ -0,0 +1,67 @@
package com.ibeetl.jlw.entity.vo;
import lombok.Data;
/**
* 类功能说明
*
* @Version 0.0.1
* @Author 许良彤
* @Date 2022/11/1 21:51
*/
@Data
public class HandsOnTaskProblemVo {
/**
* 单选题选题量
*/
private Integer singleNum;
/**
* 单选题分值
*/
private Double singleScore;
/**
* 单选题合计
*/
private Double singleSumScore;
/**
* 多选题选题量
*/
private Integer multipleNum;
/**
* 多选题分值
*/
private Double multipleScore;
/**
* 多选题合计
*/
private Double multipleSumScore;
/**
* 多选题选题量
*/
private Integer judgeNum;
/**
* 多选题分值
*/
private Double judgeScore;
/**
* 多选题合计
*/
private Double judgeSumScore;
/**
* 总分
*/
private Double totalScore;
}

38
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java
Unescape Escape View File

@ -8,9 +8,11 @@ import com.ibeetl.admin.core.util.PlatformException;
import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.admin.core.web.JsonReturnCode;
import com.ibeetl.jlw.dao.TeacherOpenCourseHandsOnSimulationTasksDao;
import com.ibeetl.jlw.entity.ResourcesQuestion;
import com.ibeetl.jlw.entity.TaskTypeParam;
import com.ibeetl.jlw.entity.TeacherOpenCourseHandsOnSimulationTasks;
import com.ibeetl.jlw.entity.TeacherOpenCourseHandsOnSimulationTasksFile;
import com.ibeetl.jlw.entity.vo.HandsOnTaskProblemVo;
import com.ibeetl.jlw.web.query.TeacherOpenCourseHandsOnSimulationTasksFileQuery;
import com.ibeetl.jlw.web.query.TeacherOpenCourseHandsOnSimulationTasksQuery;
import org.apache.commons.collections4.CollectionUtils;
@ -24,6 +26,7 @@ import org.springframework.validation.annotation.Validated;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
* 教师开课-课程实操任务 Service
@ -39,6 +42,8 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
@Autowired private TeacherOpenCourseHandsOnSimulationTasksFileService teacherOpenCourseHandsOnSimulationTasksFileService;
@Autowired private ResourcesQuestionService resourcesQuestionService;
public PageQuery<TeacherOpenCourseHandsOnSimulationTasks>queryByCondition(PageQuery query){
PageQuery ret = teacherOpenCourseHandsOnSimulationTasksDao.queryByCondition(query);
queryListAfter(ret.getList());
@ -150,6 +155,10 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
teacherOpenCourseHandsOnSimulationTasksQuery.setTaskId(taskId);
List<TeacherOpenCourseHandsOnSimulationTasks> list = teacherOpenCourseHandsOnSimulationTasksDao.getValuesByQuery(teacherOpenCourseHandsOnSimulationTasksQuery);
if(null != list && list.size()>0){
for (TeacherOpenCourseHandsOnSimulationTasks teacherOpenCourseHandsOnSimulationTasks : list) {
HandsOnTaskProblemVo objectiveProblem = getObjectiveProblem(teacherOpenCourseHandsOnSimulationTasks.getTaskList());
teacherOpenCourseHandsOnSimulationTasks.setHandsOnTaskProblemVo(objectiveProblem);
}
return list.get(0);
}else{
return null;
@ -159,6 +168,12 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
public TeacherOpenCourseHandsOnSimulationTasks getInfo (TeacherOpenCourseHandsOnSimulationTasksQuery teacherOpenCourseHandsOnSimulationTasksQuery){
List<TeacherOpenCourseHandsOnSimulationTasks> list = teacherOpenCourseHandsOnSimulationTasksDao.getValuesByQuery(teacherOpenCourseHandsOnSimulationTasksQuery);
if(null != list && list.size()>0){
for (TeacherOpenCourseHandsOnSimulationTasks teacherOpenCourseHandsOnSimulationTasks : list) {
HandsOnTaskProblemVo objectiveProblem = getObjectiveProblem(teacherOpenCourseHandsOnSimulationTasks.getTaskList());
teacherOpenCourseHandsOnSimulationTasks.setHandsOnTaskProblemVo(objectiveProblem);
}
return list.get(0);
}else{
return null;
@ -169,4 +184,27 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
return null;
}
public HandsOnTaskProblemVo getObjectiveProblem(String problemIds) {
List<ResourcesQuestion> resourcesQuestions = resourcesQuestionService.getByIds(problemIds);
//单选题
List<ResourcesQuestion> collect1 = resourcesQuestions.stream().filter(v -> 1 == v.getQuestionType()).collect(Collectors.toList());
//多选题
List<ResourcesQuestion> collect2 = resourcesQuestions.stream().filter(v -> 2 == v.getQuestionType()).collect(Collectors.toList());
//判断题
List<ResourcesQuestion> collect3 = resourcesQuestions.stream().filter(v -> 3 == v.getQuestionType()).collect(Collectors.toList());
HandsOnTaskProblemVo handsOnTaskProblemVo = new HandsOnTaskProblemVo();
handsOnTaskProblemVo.setSingleNum(collect1.size());
handsOnTaskProblemVo.setSingleScore(collect1.stream().mapToDouble(v -> v.getQuestionScore().doubleValue()).average().orElse(0));
handsOnTaskProblemVo.setSingleSumScore(collect1.stream().mapToDouble(v -> v.getQuestionScore().doubleValue()).sum());
handsOnTaskProblemVo.setMultipleNum(collect2.size());
handsOnTaskProblemVo.setMultipleScore(collect2.stream().mapToDouble(v -> v.getQuestionScore().doubleValue()).average().orElse(0));
handsOnTaskProblemVo.setMultipleSumScore(collect2.stream().mapToDouble(v -> v.getQuestionScore().doubleValue()).sum());
handsOnTaskProblemVo.setJudgeNum(collect3.size());
handsOnTaskProblemVo.setJudgeScore(collect3.stream().mapToDouble(v -> v.getQuestionScore().doubleValue()).average().orElse(0));
handsOnTaskProblemVo.setJudgeSumScore(collect3.stream().mapToDouble(v -> v.getQuestionScore().doubleValue()).sum());
handsOnTaskProblemVo.setTotalScore(resourcesQuestions.stream().mapToDouble(v -> v.getQuestionScore().doubleValue()).sum());
return handsOnTaskProblemVo;
}
}

1
web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java
Unescape Escape View File

@ -464,6 +464,7 @@ public class TeacherOpenCourseHandsOnController{
/**
* 查看内容
* 根据课程id获取有哪些课程实操任务类型
* @param teacherOpenCourseId 课程开课id
* @return
*/

17
web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnSimulationTasksController.java
Unescape Escape View File

@ -8,6 +8,7 @@ import com.ibeetl.admin.core.file.FileService;
import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.jlw.entity.TaskTypeParam;
import com.ibeetl.jlw.entity.TeacherOpenCourseHandsOnSimulationTasks;
import com.ibeetl.jlw.entity.vo.HandsOnTaskProblemVo;
import com.ibeetl.jlw.service.TeacherOpenCourseHandsOnSimulationTasksService;
import com.ibeetl.jlw.web.query.TeacherOpenCourseHandsOnSimulationTasksQuery;
import org.apache.commons.lang3.StringUtils;
@ -91,6 +92,8 @@ public class TeacherOpenCourseHandsOnSimulationTasksController{
public ModelAndView edit(Long taskId) {
ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseHandsOnSimulationTasks/edit.html");
TeacherOpenCourseHandsOnSimulationTasks teacherOpenCourseHandsOnSimulationTasks = teacherOpenCourseHandsOnSimulationTasksService.queryById(taskId);
HandsOnTaskProblemVo objectiveProblem = getObjectiveProblem(teacherOpenCourseHandsOnSimulationTasks.getTaskList());
teacherOpenCourseHandsOnSimulationTasks.setHandsOnTaskProblemVo(objectiveProblem);
view.addObject("teacherOpenCourseHandsOnSimulationTasks", teacherOpenCourseHandsOnSimulationTasks);
return view;
}
@ -101,6 +104,8 @@ public class TeacherOpenCourseHandsOnSimulationTasksController{
ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseHandsOnSimulationTasks/add.html");
if(null != taskId){
TeacherOpenCourseHandsOnSimulationTasks teacherOpenCourseHandsOnSimulationTasks = teacherOpenCourseHandsOnSimulationTasksService.queryById(taskId);
HandsOnTaskProblemVo objectiveProblem = getObjectiveProblem(teacherOpenCourseHandsOnSimulationTasks.getTaskList());
teacherOpenCourseHandsOnSimulationTasks.setHandsOnTaskProblemVo(objectiveProblem);
view.addObject("teacherOpenCourseHandsOnSimulationTasks", teacherOpenCourseHandsOnSimulationTasks);
}else {
view.addObject("teacherOpenCourseHandsOnSimulationTasks", new TeacherOpenCourseHandsOnSimulationTasks());
@ -171,6 +176,8 @@ public class TeacherOpenCourseHandsOnSimulationTasksController{
@Function("teacherOpenCourseHandsOnSimulationTasks.query")
public JsonResult<TeacherOpenCourseHandsOnSimulationTasks>queryInfo(Long taskId) {
TeacherOpenCourseHandsOnSimulationTasks teacherOpenCourseHandsOnSimulationTasks = teacherOpenCourseHandsOnSimulationTasksService.queryById( taskId);
HandsOnTaskProblemVo objectiveProblem = getObjectiveProblem(teacherOpenCourseHandsOnSimulationTasks.getTaskList());
teacherOpenCourseHandsOnSimulationTasks.setHandsOnTaskProblemVo(objectiveProblem);
return JsonResult.success(teacherOpenCourseHandsOnSimulationTasks);
}
@ -228,6 +235,16 @@ public class TeacherOpenCourseHandsOnSimulationTasksController{
}
/**
* 获取题目的类型及数量
* @param problemIds
* @return
*/
@GetMapping(MODEL + "/getObjectiveProblem.do")
public HandsOnTaskProblemVo getObjectiveProblem(String problemIds) {
return teacherOpenCourseHandsOnSimulationTasksService.getObjectiveProblem(problemIds);
}
}

Write Preview
Loading…
Cancel
Save