|
|
@ -133,7 +133,10 @@ public class LaborEducationServiceImpl implements LaborEducationService {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//examIds.add("c26e5766-597f-45b3-91ad-19e76426323b");
|
|
|
|
//examIds.add("c26e5766-597f-45b3-91ad-19e76426323b");
|
|
|
|
//获取所有课程下的课中活动
|
|
|
|
//获取所有课程下的课中活动
|
|
|
|
List<Exam> exams = examRepository.findExamsByIds(String.format(PK.EXAM, laborDto.getTmdId()), recordIds);
|
|
|
|
List<Exam> exams = new ArrayList<>();
|
|
|
|
|
|
|
|
if (!recordIds.isEmpty()) {
|
|
|
|
|
|
|
|
exams = examRepository.findExamsByIds(String.format(PK.EXAM, laborDto.getTmdId()), recordIds);
|
|
|
|
|
|
|
|
}
|
|
|
|
Map<String, List<List<String>>> knowledgeMap = new HashMap<>();
|
|
|
|
Map<String, List<List<String>>> knowledgeMap = new HashMap<>();
|
|
|
|
Map<String, List<Double>> point = new HashMap<>();
|
|
|
|
Map<String, List<Double>> point = new HashMap<>();
|
|
|
|
for (Exam exam : exams) {
|
|
|
|
for (Exam exam : exams) {
|
|
|
@ -149,8 +152,10 @@ public class LaborEducationServiceImpl implements LaborEducationService {
|
|
|
|
for (Exam exam : exams) {
|
|
|
|
for (Exam exam : exams) {
|
|
|
|
examIds.add(exam.getId());
|
|
|
|
examIds.add(exam.getId());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
List<ExamClassResult> examResults = examClassResultRepository.findAll(String.format(PK.CLASS_RESULT, laborDto.getCode()),examIds);
|
|
|
|
List<ExamClassResult> examResults = new ArrayList<>();
|
|
|
|
|
|
|
|
if (!examIds.isEmpty()) {
|
|
|
|
|
|
|
|
examResults = examClassResultRepository.findAll(String.format(PK.CLASS_RESULT, laborDto.getCode()),examIds);
|
|
|
|
|
|
|
|
}
|
|
|
|
Map<String, Object> resMap = new HashMap<>();
|
|
|
|
Map<String, Object> resMap = new HashMap<>();
|
|
|
|
//处理德育知识块和知识点的关联关系
|
|
|
|
//处理德育知识块和知识点的关联关系
|
|
|
|
resMap.put("subjectiveCount", res.size()); //主观评价数
|
|
|
|
resMap.put("subjectiveCount", res.size()); //主观评价数
|
|
|
|