wangliang 4 سال پیش
والد
کامیت
f92cc8cac8

+ 4 - 6
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/TBExamStudentServiceImpl.java

@@ -141,13 +141,12 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Long orgId = sysUser.getOrgId();
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        Page<TeachCollegeResult> page = new Page<>(pageNumber, pageSize);
         List<Long> collegeIds = sysOrgService.findCollegeIds(sysUser.getOrgId());
         IPage<TeachCollegeResult> listPage;
         if (Objects.nonNull(collegeIds) && collegeIds.size() > 0) {
-            listPage = tbExamStudentMapper.listTeachCollegeResult(page, schoolId, semester, examId, courseCode, current, inspectCollegeId, orgId, teacherId, studentParam, collegeIds, column, Objects.nonNull(order) ? order.name() : null);
+            listPage = tbExamStudentMapper.listTeachCollegeResult(new Page<>(pageNumber, pageSize), schoolId, semester, examId, courseCode, current, inspectCollegeId, orgId, teacherId, studentParam, collegeIds, column, Objects.nonNull(order) ? order.name() : null);
         } else {
-            listPage = tbExamStudentMapper.listTeachCollegeResult(page, schoolId, semester, examId, courseCode, current, inspectCollegeId, orgId, teacherId, studentParam, Objects.nonNull(sysUser.getOrgId()) ? Arrays.asList(sysUser.getOrgId()) : null, column, Objects.nonNull(order) ? order.name() : null);
+            listPage = tbExamStudentMapper.listTeachCollegeResult(new Page<>(pageNumber, pageSize), schoolId, semester, examId, courseCode, current, inspectCollegeId, orgId, teacherId, studentParam, Objects.nonNull(sysUser.getOrgId()) ? Arrays.asList(sysUser.getOrgId()) : null, column, Objects.nonNull(order) ? order.name() : null);
         }
         return listPage;
     }
@@ -228,15 +227,14 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
     @Override
     public IPage<InspectCollegeResult> listInspectCollegeResult(String semester, Long examId, String courseCode, Boolean current, Long teachCollegeId, Long teacherId, String studentParam, Integer pageNumber, Integer pageSize, String column, OrderEnum order) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        Page<InspectCollegeResult> page = new Page<>(pageNumber, pageSize);
-        return tbExamStudentMapper.listInspectCollegeResult(page, schoolId, semester, examId, courseCode, current, teachCollegeId, teacherId, studentParam, column, Objects.nonNull(order) ? order.name() : null);
+        return tbExamStudentMapper.listInspectCollegeResult(new Page<>(pageNumber, pageSize), schoolId, semester, examId, courseCode, current, teachCollegeId, teacherId, studentParam, column, Objects.nonNull(order) ? order.name() : null);
     }
 
     @Override
     public void exportInspectCollegeResult(String semester, Long examId, String courseCode, Boolean current, Long teachCollegeId, Long teacherId, String studentParam, HttpServletResponse response, String column, OrderEnum order) throws Exception {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         List<InspectCollegeResult> list = tbExamStudentMapper.listInspectCollegeResult(schoolId, semester, examId, courseCode, current, teachCollegeId, teacherId, studentParam, column, Objects.nonNull(order) ? order.name() : null);
-        ExcelUtil.excelExport("开课成绩查询", InspectCollegeResult.class, list, response);
+        ExcelUtil.excelExport("考查成绩查询", InspectCollegeResult.class, list, response);
     }
 
     /**