|
@@ -239,7 +239,7 @@ public class ScoreController extends BaseParameterController {
|
|
|
String subjectCode = RequestUtils.getSession(request).getParameter("subjectCode");
|
|
|
if (examId > 0) {
|
|
|
query.setExamId(examId);
|
|
|
- query.setUpload(true);
|
|
|
+// query.setUpload(true);
|
|
|
// query.setAbsent(false);
|
|
|
query.setPageNumber(1);
|
|
|
query.setPageSize(Integer.MAX_VALUE);
|
|
@@ -254,6 +254,10 @@ public class ScoreController extends BaseParameterController {
|
|
|
fileName = subjectService.find(examId, subjectCode).getName()+"-机阅考试成绩表";
|
|
|
List<ScoreExportDTO> list = new LinkedList<ScoreExportDTO>();
|
|
|
for (ExamStudent student : query.getResult()) {
|
|
|
+ if(student.isBreach() || student.isAbsent()){
|
|
|
+ student.setObjectiveScore(0d);
|
|
|
+ student.setSubjectiveScore(0d);
|
|
|
+ }
|
|
|
list.add(new ScoreExportDTO(student));
|
|
|
}
|
|
|
new ExportExcel(subjectCode+"-"+subjectService.find(examId, subjectCode).getName(), ScoreExportDTO.class).setDataList(list).write(response, fileName + ".xlsx").dispose();
|
|
@@ -261,6 +265,10 @@ public class ScoreController extends BaseParameterController {
|
|
|
}
|
|
|
List<ExamStudentDTO> list = new LinkedList<ExamStudentDTO>();
|
|
|
for (ExamStudent student : query.getResult()) {
|
|
|
+ if(student.isBreach() || student.isAbsent()){
|
|
|
+ student.setObjectiveScore(0d);
|
|
|
+ student.setSubjectiveScore(0d);
|
|
|
+ }
|
|
|
list.add(new ExamStudentDTO(student));
|
|
|
}
|
|
|
new ExportExcel("成绩单", ExamStudentDTO.class).setDataList(list).write(response, fileName).dispose();
|