|
@@ -210,22 +210,21 @@ public class ScoreController extends BaseExamController {
|
|
|
String paperType = null;
|
|
|
try {
|
|
|
List<ExamStudentDTO> list = new LinkedList<>();
|
|
|
- for (String subjectCode : subjectSet) {
|
|
|
- query.setSubjectCode(subjectCode);
|
|
|
- query.setPageNumber(1);
|
|
|
- query.setPageSize(Integer.MAX_VALUE);
|
|
|
- query = studentService.findByQuery(query);
|
|
|
- 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));
|
|
|
+ String subjectCodeIn = StringUtils.join(subjectSet, ",");
|
|
|
+ query.setSubjectCodeIn(subjectCodeIn);
|
|
|
+ query.setPageNumber(1);
|
|
|
+ query.setPageSize(Integer.MAX_VALUE);
|
|
|
+ query = studentService.findByQuery(query);
|
|
|
+ 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 (query.getSubjectCode() != null) {
|
|
|
+ if (StringUtils.isNotBlank(query.getSubjectCode())) {
|
|
|
List<String> headerList = getOptionHeader(exam.getId(), query.getSubjectCode(), paperType);
|
|
|
ExportStudentExcel excel = new ExportStudentExcel("成绩单", headerList, ExamStudentDTO.class);
|
|
|
excel.setDataList(list, true);
|