|
|
@@ -172,13 +172,13 @@ public class PaperService {
|
|
|
BBusiWishUniversities universities = wishUniversitiesService.selectBBusiWishUniversitiesById(universityId);
|
|
|
for(LearnDirectedKnowledge dk : directedKnowledgeList) {
|
|
|
TestPaperVO.PaperDef paperDef = new TestPaperVO.PaperDef();
|
|
|
- paperDef.setTotal(120L); // 120题
|
|
|
+ paperDef.setTotal(100L); // 120题
|
|
|
paperDef.setFillExclude(false);
|
|
|
paperDef.setKnowIds(Stream.of(dk.getKnowledges().split(",")).map(Long::parseLong).collect(Collectors.toList()));
|
|
|
List<TestPaperVO.TypeDef> typeDefList= Lists.newArrayList();
|
|
|
typeDefList.add(new TestPaperVO.TypeDef("单选题", "单选题", 40, 3));
|
|
|
typeDefList.add(new TestPaperVO.TypeDef("多选题", "多选题", 40, 3));
|
|
|
- typeDefList.add(new TestPaperVO.TypeDef("判断题", "判断题", 40, 3));
|
|
|
+ typeDefList.add(new TestPaperVO.TypeDef("判断题", "判断题", 20, 3));
|
|
|
paperDef.setTypes(typeDefList);
|
|
|
|
|
|
LearnPaper paper = new LearnPaper();
|
|
|
@@ -189,10 +189,10 @@ public class PaperService {
|
|
|
paper.setYear(dk.getYear());
|
|
|
paper.setStatus(PaperStatus.Valid.getVal());
|
|
|
paper.setDirectKey(universityId + "_" + dk.getExamineeTypes() + "_" + dk.getDirectKey());
|
|
|
- paper.setNumber(120);
|
|
|
- paper.setFenshu(360);
|
|
|
+ paper.setNumber(100);
|
|
|
+ paper.setFenshu(300);
|
|
|
AnswerSheet.PaperCond info = new AnswerSheet.PaperCond();
|
|
|
- info.setScore(360);
|
|
|
+ info.setScore(300);
|
|
|
info.setTime(90 * 60);
|
|
|
info.setTypes(typeDefList.stream().map(t -> new AnswerSheet.PaperCondType(t.getType(), t.getCount(), t.getScore())).collect(Collectors.toList()));
|
|
|
paper.setPaperInfo(JSONObject.toJSONString(info));
|
|
|
@@ -270,7 +270,7 @@ public class PaperService {
|
|
|
// 题型分布定义, 知识点列表, 分值定义
|
|
|
// 统计知识点+类型的有效数量 TODO 总量可以缓存
|
|
|
Map<String, KnowTypeAssign> knowTypeAssignMap = buildKnowTypeAssignMap(studentId, paperDef);
|
|
|
- assignKnowFirst(paperDef, knowTypeAssignMap); // 知识优先，类型可变
|
|
|
+ assignTypeFirstWithCount(paperDef, knowTypeAssignMap); // 知识优先，类型可变
|
|
|
return getQuestions(studentId, paperDef, knowTypeAssignMap);
|
|
|
}
|
|
|
|
mingfu