|
@@ -225,17 +225,20 @@ public class ScoreController extends BaseExamController {
|
|
|
subjectFilter(query, wu);
|
|
|
query = studentService.findByQuery(query);
|
|
|
String fileName = "成绩单.xlsx";
|
|
|
+ String paperType = null;
|
|
|
try {
|
|
|
List<ExamStudentDTO> list = new LinkedList<ExamStudentDTO>();
|
|
|
for (ExamStudent student : query.getResult()) {
|
|
|
if (student.isBreach() || student.isAbsent()) {
|
|
|
student.setObjectiveScore(0d);
|
|
|
student.setSubjectiveScore(0d);
|
|
|
+ }else if(paperType == null){
|
|
|
+ paperType = student.getPaperType();
|
|
|
}
|
|
|
list.add(new ExamStudentDTO(student));
|
|
|
}
|
|
|
if (StringUtils.isNotBlank(query.getSubjectCode()) && !query.getResult().isEmpty()) {
|
|
|
- List<String> headerList = getOptionHeader(examId, query.getSubjectCode(),query.getResult().get(0).getPaperType());
|
|
|
+ List<String> headerList = getOptionHeader(examId, query.getSubjectCode(),paperType);
|
|
|
ExportStudentExcel excel = new ExportStudentExcel("成绩单", headerList, ExamStudentDTO.class);
|
|
|
excel.setDataList(list,true);
|
|
|
excel.write(response, fileName).dispose();
|