|
@@ -93,13 +93,8 @@ public class TIeReportServiceImpl implements TIeReportService {
|
|
|
@Override
|
|
|
public IPage<ExamViewCountListBean> examViewCount(Long orgId, Long examId, Long examActivityId, String roomCode, String courseCode, String name,
|
|
|
String identity, int pageNumber, int pageSize) {
|
|
|
- IPage<ExamViewCountListBean> total = examStudentMapper.getTotalCountInfo(new Page<>(pageNumber, pageSize),
|
|
|
+ return examStudentMapper.getTotalCountInfo(new Page<>(pageNumber, pageSize),
|
|
|
orgId, examId, examActivityId, roomCode, courseCode);
|
|
|
- List<ExamViewCountListBean> data = total.getRecords();
|
|
|
- if (data == null || data.size() == 0) {
|
|
|
- return total;
|
|
|
- }
|
|
|
- return total;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -120,13 +115,8 @@ public class TIeReportServiceImpl implements TIeReportService {
|
|
|
Page<ExamDeficiencyListBean> ipage = new Page<>(pageNumber, pageSize);
|
|
|
ipage.addOrder(OrderItem.asc("t.exam_activity_id"));
|
|
|
ipage.addOrder(OrderItem.asc("t.room_code"));
|
|
|
- IPage<ExamDeficiencyListBean> total = examStudentMapper.getExamDeficiencyPage(ipage, examId, examActivityId,
|
|
|
+ return examStudentMapper.getExamDeficiencyPage(ipage, examId, examActivityId,
|
|
|
roomCode, courseCode, name, identity, absentActivityIds);
|
|
|
- List<ExamDeficiencyListBean> data = total.getRecords();
|
|
|
- if (data == null || data.size() == 0) {
|
|
|
- return total;
|
|
|
- }
|
|
|
- return total;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -135,23 +125,13 @@ public class TIeReportServiceImpl implements TIeReportService {
|
|
|
TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
|
|
|
Page<ExamExceptionListBean> ipage = new Page<>(pageNumber, pageSize);
|
|
|
ipage.addOrder(OrderItem.asc("f.exam_student_id"));
|
|
|
- IPage<ExamExceptionListBean> total = invigilateExceptionInfoMapper.getExamExceptionPage(ipage, tbUser.getOrgId(), examId,
|
|
|
+ return invigilateExceptionInfoMapper.getExamExceptionPage(ipage, tbUser.getOrgId(), examId,
|
|
|
examActivityId, roomCode, courseCode, name, identity);
|
|
|
- List<ExamExceptionListBean> data = total.getRecords();
|
|
|
- if (data == null || data.size() == 0) {
|
|
|
- return total;
|
|
|
- }
|
|
|
- return total;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public IPage<ExamExceptionDetailListBean> examExceptionDetailList(Long examStudentId, int pageNumber, int pageSize) {
|
|
|
- IPage<ExamExceptionDetailListBean> total = invigilateExceptionInfoMapper.getExamExceptionDetailList(new Page<>(pageNumber, pageSize), examStudentId);
|
|
|
- List<ExamExceptionDetailListBean> data = total.getRecords();
|
|
|
- if (data == null || data.size() == 0) {
|
|
|
- return total;
|
|
|
- }
|
|
|
- return total;
|
|
|
+ return invigilateExceptionInfoMapper.getExamExceptionDetailList(new Page<>(pageNumber, pageSize), examStudentId);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -160,13 +140,8 @@ public class TIeReportServiceImpl implements TIeReportService {
|
|
|
TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
|
|
|
Page<ExamReexamListBean> ipage = new Page<>(pageNumber, pageSize);
|
|
|
ipage.addOrder(OrderItem.asc("f.exam_student_id"));
|
|
|
- IPage<ExamReexamListBean> total = examReexamMapper.getExamReexamPage(ipage, tbUser.getOrgId(), examId, examActivityId, roomCode,
|
|
|
+ return examReexamMapper.getExamReexamPage(ipage, tbUser.getOrgId(), examId, examActivityId, roomCode,
|
|
|
courseCode, name, identity);
|
|
|
- List<ExamReexamListBean> data = total.getRecords();
|
|
|
- if (data == null || data.size() == 0) {
|
|
|
- return total;
|
|
|
- }
|
|
|
- return total;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -175,23 +150,13 @@ public class TIeReportServiceImpl implements TIeReportService {
|
|
|
TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
|
|
|
Page<ExamBreachListBean> ipage = new Page<>(pageNumber, pageSize);
|
|
|
ipage.addOrder(OrderItem.asc("f.exam_student_id"));
|
|
|
- IPage<ExamBreachListBean> total = examBreachLogMapper.getExamBreachPage(ipage, tbUser.getOrgId(), examId, examActivityId, roomCode,
|
|
|
+ return examBreachLogMapper.getExamBreachPage(ipage, tbUser.getOrgId(), examId, examActivityId, roomCode,
|
|
|
courseCode, name, identity);
|
|
|
- List<ExamBreachListBean> data = total.getRecords();
|
|
|
- if (data == null || data.size() == 0) {
|
|
|
- return total;
|
|
|
- }
|
|
|
- return total;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public IPage<ExamBreachDetailListBean> examBreachListDetail(Long examStudentId, Integer status, int pageNumber, int pageSize) {
|
|
|
- IPage<ExamBreachDetailListBean> total = examBreachLogMapper.getExamBreachDetailList(new Page<>(pageNumber, pageSize), examStudentId, status);
|
|
|
- List<ExamBreachDetailListBean> data = total.getRecords();
|
|
|
- if (data == null || data.size() == 0) {
|
|
|
- return total;
|
|
|
- }
|
|
|
- return total;
|
|
|
+ return examBreachLogMapper.getExamBreachDetailList(new Page<>(pageNumber, pageSize), examStudentId, status);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -200,23 +165,13 @@ public class TIeReportServiceImpl implements TIeReportService {
|
|
|
TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
|
|
|
Page<ExamBreachListBean> ipage = new Page<>(pageNumber, pageSize);
|
|
|
ipage.addOrder(OrderItem.asc("f.exam_student_id"));
|
|
|
- IPage<ExamBreachListBean> total = examBreachLogMapper.getExamRevokeBreachPage(ipage, tbUser.getOrgId(), examId, examActivityId,
|
|
|
+ return examBreachLogMapper.getExamRevokeBreachPage(ipage, tbUser.getOrgId(), examId, examActivityId,
|
|
|
roomCode, courseCode, name, identity);
|
|
|
- List<ExamBreachListBean> data = total.getRecords();
|
|
|
- if (data == null || data.size() == 0) {
|
|
|
- return total;
|
|
|
- }
|
|
|
- return total;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public IPage<ExamBreachDetailListBean> examRevokeBreachListDetail(Long examStudentId, Integer status, int pageNumber, int pageSize) {
|
|
|
- IPage<ExamBreachDetailListBean> total = examBreachLogMapper.getExamBreachDetailList(new Page<>(pageNumber, pageSize), examStudentId, status);
|
|
|
- List<ExamBreachDetailListBean> data = total.getRecords();
|
|
|
- if (data == null || data.size() == 0) {
|
|
|
- return total;
|
|
|
- }
|
|
|
- return total;
|
|
|
+ return examBreachLogMapper.getExamBreachDetailList(new Page<>(pageNumber, pageSize), examStudentId, status);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -225,13 +180,8 @@ public class TIeReportServiceImpl implements TIeReportService {
|
|
|
TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
|
|
|
Page<ExamStudentLogListBean> ipage = new Page<>(pageNumber, pageSize);
|
|
|
ipage.addOrder(OrderItem.asc("t.id"));
|
|
|
- IPage<ExamStudentLogListBean> total = examStudentMapper.getPageForStudentLog(ipage, tbUser.getOrgId(), examId, examActivityId,
|
|
|
+ return examStudentMapper.getPageForStudentLog(ipage, tbUser.getOrgId(), examId, examActivityId,
|
|
|
roomCode, courseCode, name, identity);
|
|
|
- List<ExamStudentLogListBean> data = total.getRecords();
|
|
|
- if (data == null || data.size() == 0) {
|
|
|
- return total;
|
|
|
- }
|
|
|
- return total;
|
|
|
}
|
|
|
|
|
|
@Override
|