|
@@ -197,18 +197,18 @@ public class TaskMarkResultStandardExportTemplete implements TaskExportTemplete
|
|
|
objectiveAnswerCacheBeanMap = teExamPaperService.getPaperStructCacheBean(m.getPaperId());
|
|
|
paperObjectiveAnswerMap.put(m.getPaperId(), objectiveAnswerCacheBeanMap);
|
|
|
objectiveAnswerCacheBeanMap.forEach((k, v) -> {
|
|
|
- if (v != 6) {//套题暂不展现
|
|
|
- String title = QuestionTypeEnum.convertToTitle(v) + k;
|
|
|
- if (v >= 1 && v < 4) {
|
|
|
- ExcelDto excelAnswerDto = new ExcelDto(title + "作答");
|
|
|
- ExcelDto excelScoreDto = new ExcelDto(title + "得分");
|
|
|
- dynamicExcelHead.add(m.getPaperId(), excelAnswerDto);
|
|
|
- dynamicExcelHead.add(m.getPaperId(), excelScoreDto);
|
|
|
- } else {
|
|
|
- ExcelDto excelScoreDto = new ExcelDto(title + "得分");
|
|
|
- dynamicExcelHead.add(m.getPaperId(), excelScoreDto);
|
|
|
- }
|
|
|
+// if (v != 6) {//套题暂不展现
|
|
|
+ String title = QuestionTypeEnum.convertToTitle(v) + k;
|
|
|
+ if (v >= 1 && v < 4) {
|
|
|
+ ExcelDto excelAnswerDto = new ExcelDto(title + "作答");
|
|
|
+ ExcelDto excelScoreDto = new ExcelDto(title + "得分");
|
|
|
+ dynamicExcelHead.add(m.getPaperId(), excelAnswerDto);
|
|
|
+ dynamicExcelHead.add(m.getPaperId(), excelScoreDto);
|
|
|
+ } else {
|
|
|
+ ExcelDto excelScoreDto = new ExcelDto(title + "得分");
|
|
|
+ dynamicExcelHead.add(m.getPaperId(), excelScoreDto);
|
|
|
}
|
|
|
+// }
|
|
|
});
|
|
|
} else {
|
|
|
objectiveAnswerCacheBeanMap = paperObjectiveAnswerMap.get(m.getPaperId());
|