bug修复

teachcloud-common/src/main/java/com/qmth/teachcloud/common/util/ExcelUtil.java

@@ -58,7 +58,6 @@ public class ExcelUtil {
         ServletOutputStream outputStream = response.getOutputStream();
 
         ExcelWriter excelExporter = new ExcelWriter();
-//        excelExporter.write(dataset.get(0), outputStream);
         for (int i = 0; i < dataClass.size(); i++) {
             Class clazz = dataClass.get(i);
             String sheetName = sheetNames.get(i);

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/TAExamCourseService.java

@@ -132,6 +132,7 @@ public interface TAExamCourseService extends IService<TAExamCourse> {
      * @param examId
      * @param semester
      * @param schoolId
+     * @param courseCode
      */
-    void courseExport(Long examId, SemesterEnum semester, Long schoolId);
+    void courseExport(Long examId, SemesterEnum semester, Long schoolId, String courseCode) throws Exception;
 }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/TAExamTotalService.java

@@ -23,7 +23,7 @@ public interface TAExamTotalService extends IService<TAExamTotal> {
 
     IPage<TAExamCourse> getCourseSummary(SemesterEnum semester, Long examId, Integer pageNumber, Integer pageSize, String column, OrderEnum order);
 
-    void exportCourseSummary(SemesterEnum semester, Long examId, String column, OrderEnum order, HttpServletResponse response) throws Exception;
+    void exportCourseSummary(SemesterEnum semester, Long examId, String column, OrderEnum order) throws Exception;
 
-    void exportDataAnalysis(SemesterEnum semester, Long examId, String courseCode, HttpServletResponse response);
+    void exportDataAnalysis(SemesterEnum semester, Long examId, String courseCode);
 }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/TBExamStudentService.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.teachcloud.report.business.bean.result.*;
 import com.qmth.teachcloud.report.business.entity.TBExamStudent;
 import com.qmth.teachcloud.report.business.enums.OrderEnum;
-import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
@@ -122,12 +121,11 @@ public interface TBExamStudentService extends IService<TBExamStudent> {
      * @param inspectCollegeId
      * @param teacherId
      * @param studentParam
-     * @param response
      * @param column
      * @param order
      * @throws Exception
      */
-    void exportTeachCollegeResult(String semester, Long examId, String courseCode, Boolean current, Long inspectCollegeId, Long teacherId, String studentParam, HttpServletResponse response, String column, OrderEnum order) throws Exception;
+    void exportTeachCollegeResult(String semester, Long examId, String courseCode, Boolean current, Long inspectCollegeId, Long teacherId, String studentParam, String column, OrderEnum order) throws Exception;
 
     /**
      * 考查成绩查询
@@ -157,11 +155,10 @@ public interface TBExamStudentService extends IService<TBExamStudent> {
      * @param teachCollegeId
      * @param teacherId
      * @param studentParam
-     * @param response
      * @param column
      * @param order
      */
-    void exportInspectCollegeResult(String semester, Long examId, String courseCode, Boolean current, Long teachCollegeId, Long teacherId, String studentParam, HttpServletResponse response, String column, OrderEnum order) throws Exception;
+    void exportInspectCollegeResult(String semester, Long examId, String courseCode, Boolean current, Long teachCollegeId, Long teacherId, String studentParam, String column, OrderEnum order) throws Exception;
 
     /**
      * 学生报告预览-列表接口

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/TAExamCourseServiceImpl.java

@@ -2,12 +2,18 @@ package com.qmth.teachcloud.report.business.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.reflect.TypeToken;
+import com.google.gson.Gson;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.service.SysOrgService;
+import com.qmth.teachcloud.common.util.ExcelUtil;
+import com.qmth.teachcloud.common.util.JacksonUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
+import com.qmth.teachcloud.report.business.bean.dto.excel.TAExamCourseExportDto;
 import com.qmth.teachcloud.report.business.bean.result.*;
 import com.qmth.teachcloud.report.business.entity.TAExamCourse;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseRecord;
@@ -18,10 +24,7 @@ import com.qmth.teachcloud.report.business.enums.PublishStatusEnum;
 import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import com.qmth.teachcloud.report.business.mapper.TAExamCourseMapper;
 import com.qmth.teachcloud.report.business.mapper.TAExamCourseRecordMapper;
-import com.qmth.teachcloud.report.business.service.ReportCommonService;
-import com.qmth.teachcloud.report.business.service.TAExamCourseService;
-import com.qmth.teachcloud.report.business.service.TBExamService;
-import com.qmth.teachcloud.report.business.service.TBPaperService;
+import com.qmth.teachcloud.report.business.service.*;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
@@ -59,6 +62,9 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
     @Resource
     TBExamService tbExamService;
 
+    @Resource
+    TBExamStudentService tbExamStudentService;
+
     /**
      * 开课课程考试总览列表接口
      *
@@ -335,10 +341,16 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
      * @param examId
      * @param semester
      * @param schoolId
+     * @param courseCode
      */
     @Override
-    public void courseExport(Long examId, SemesterEnum semester, Long schoolId) {
+    public void courseExport(Long examId, SemesterEnum semester, Long schoolId, String courseCode) throws Exception {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        IPage<TeachCollegeResult> teachCollegeResultIPage = tbExamStudentService.listTeachCollegeResult(Objects.nonNull(semester) ? semester.name() : null, examId, courseCode, null, null, null, null, SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE, null, null);
+        List<String> sheetList = Arrays.asList("成绩对比明细", "全校卷面分数段", "全校赋分分数段(全部)", "全校赋分分数段(应届)", "各课堂应届生卷面非零平均成绩及排名");
+        List<Class<?>> classList = Arrays.asList(TeachCollegeResult.class);
+        List<Collection<?>> collectionList = Arrays.asList(teachCollegeResultIPage.getRecords());
+        ExcelUtil.excelExportBatchSheet("课程分析", sheetList, classList, collectionList, ServletUtil.getResponse());
     }
 
 

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/TAExamTotalServiceImpl.java

@@ -63,16 +63,16 @@ public class TAExamTotalServiceImpl extends ServiceImpl<TAExamTotalMapper, TAExa
     }
 
     @Override
-    public void exportCourseSummary(SemesterEnum semester, Long examId, String column, OrderEnum order, HttpServletResponse response) throws Exception {
+    public void exportCourseSummary(SemesterEnum semester, Long examId, String column, OrderEnum order) throws Exception {
         IPage<TAExamCourse> taExamCourseIPage = this.getCourseSummary(semester, examId, SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE, column, order);
         Gson gson = new Gson();
         List<TAExamCourseDto> examStudentCourseDtoList = gson.fromJson(JacksonUtil.parseJson(taExamCourseIPage.getRecords()), new TypeToken<List<TAExamCourseDto>>() {
         }.getType());
-        ExcelUtil.excelExport("课程分析", TAExamCourseDto.class, examStudentCourseDtoList, response);
+        ExcelUtil.excelExport("课程分析", TAExamCourseDto.class, examStudentCourseDtoList, ServletUtil.getResponse());
     }
 
     @Override
-    public void exportDataAnalysis(SemesterEnum semester, Long examId, String courseCode, HttpServletResponse response) {
+    public void exportDataAnalysis(SemesterEnum semester, Long examId, String courseCode) {
 
     }
 }

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

@@ -167,7 +167,8 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
     public IPage<TeachCollegeResult> listTeachCollegeResult(String semester, Long examId, String courseCode, Boolean current, Long inspectCollegeId, Long teacherId, String studentParam, Integer pageNumber, Integer pageSize, String column, OrderEnum order) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Long orgId = sysUser.getOrgId();
-        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+//        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        Long schoolId = sysUser.getSchoolId();
         List<Long> collegeIds = sysOrgService.findCollegeIds(sysUser.getOrgId());
         IPage<TeachCollegeResult> listPage;
         if (Objects.nonNull(collegeIds) && collegeIds.size() > 0) {
@@ -238,7 +239,7 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
     }
 
     @Override
-    public void exportTeachCollegeResult(String semester, Long examId, String courseCode, Boolean current, Long inspectCollegeId, Long teacherId, String studentParam, HttpServletResponse response, String column, OrderEnum order) throws Exception {
+    public void exportTeachCollegeResult(String semester, Long examId, String courseCode, Boolean current, Long inspectCollegeId, Long teacherId, String studentParam, String column, OrderEnum order) throws Exception {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         List<Long> collegeIds = sysOrgService.findCollegeIds(sysUser.getOrgId());
@@ -248,7 +249,7 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
         } else {
             list = tbExamStudentMapper.listTeachCollegeResult(schoolId, semester, examId, courseCode, current, inspectCollegeId, teacherId, studentParam, Objects.nonNull(sysUser.getOrgId()) ? Arrays.asList(sysUser.getOrgId()) : null, column, Objects.nonNull(order) ? order.name() : null);
         }
-        ExcelUtil.excelExport("开课成绩查询", TeachCollegeResult.class, list, response);
+        ExcelUtil.excelExport("开课成绩查询", TeachCollegeResult.class, list, ServletUtil.getResponse());
     }
 
     @Override
@@ -258,10 +259,10 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
     }
 
     @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 {
+    public void exportInspectCollegeResult(String semester, Long examId, String courseCode, Boolean current, Long teachCollegeId, Long teacherId, String studentParam, 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, ServletUtil.getResponse());
     }
 
     /**

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/CourseController.java

@@ -12,36 +12,27 @@ import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.TaskTypeEnum;
 import com.qmth.teachcloud.common.service.TBTaskService;
 import com.qmth.teachcloud.common.util.*;
-import com.qmth.teachcloud.report.business.bean.dto.excel.TAExamCourseDto;
 import com.qmth.teachcloud.report.business.bean.dto.excel.TAExamCourseExportDto;
 import com.qmth.teachcloud.report.business.bean.result.*;
 import com.qmth.teachcloud.report.business.bean.result.inspectCourseExamTotal.InspectCourseTotalReportResult;
-import com.qmth.teachcloud.report.business.entity.TBExamCourse;
 import com.qmth.teachcloud.report.business.entity.TBPaper;
 import com.qmth.teachcloud.report.business.enums.OrderEnum;
 import com.qmth.teachcloud.report.business.enums.PublishStatusEnum;
 import com.qmth.teachcloud.report.business.enums.SemesterEnum;
-import com.qmth.teachcloud.report.business.service.*;
+import com.qmth.teachcloud.report.business.service.AnalyzeForReportService;
+import com.qmth.teachcloud.report.business.service.CourseReportService;
+import com.qmth.teachcloud.report.business.service.TAExamCourseService;
+import com.qmth.teachcloud.report.business.service.TBPaperService;
 import com.qmth.teachcloud.report.business.templete.execute.AsyncDataCalculateTempleteService;
 import io.swagger.annotations.*;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFCellStyle;
-import org.apache.poi.xssf.usermodel.XSSFColor;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
-import java.awt.Color;
 import java.math.BigDecimal;
-import java.net.URLEncoder;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -90,13 +81,12 @@ public class CourseController {
                        @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
                        @ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId,
                        @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
-                       @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order,
-                       HttpServletResponse response) throws Exception {
+                       @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) throws Exception {
         IPage<TAExamCourseResult> taExamCourseResultIPage = taExamCourseService.surveyTeacherList(new Page<>(SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE), SystemConstant.convertIdToLong(examId), semester, Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), column, order);
         Gson gson = new Gson();
         List<TAExamCourseExportDto> taExamCourseExportDtoList = gson.fromJson(JacksonUtil.parseJson(taExamCourseResultIPage.getRecords()), new TypeToken<List<TAExamCourseExportDto>>() {
         }.getType());
-        ExcelUtil.excelExport("开课课程考试总览", TAExamCourseExportDto.class, taExamCourseExportDtoList, response);
+        ExcelUtil.excelExport("开课课程考试总览", TAExamCourseExportDto.class, taExamCourseExportDtoList, ServletUtil.getResponse());
     }
 
     @ApiOperation(value = "导出课程分析接口")
@@ -105,68 +95,13 @@ public class CourseController {
     public void courseExport(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
                              @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
                              @ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId,
-                             HttpServletResponse response) throws Exception {
-        IPage<TAExamCourseResult> taExamCourseResultIPage = taExamCourseService.surveyTeacherList(new Page<>(0, 10), SystemConstant.convertIdToLong(examId), semester, Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), null, null);
-        Gson gson = new Gson();
-        List<TAExamCourseExportDto> taExamCourseExportDtoList = gson.fromJson(JacksonUtil.parseJson(taExamCourseResultIPage.getRecords()), new TypeToken<List<TAExamCourseExportDto>>() {
-        }.getType());
-        ExcelUtil.excelExportBatchSheet("测试", Arrays.asList("测试1", "测试2"), Arrays.asList(TAExamCourseExportDto.class, TAExamCourseExportDto.class), Arrays.asList(taExamCourseExportDtoList, taExamCourseExportDtoList), response);
-
-//        //创建excel
-//        XSSFWorkbook wb = new XSSFWorkbook();
-//        Sheet sheet = wb.createSheet("成绩对比明细");
-//        XSSFCellStyle style = wb.createCellStyle();
-//        style.setFillForegroundColor(new XSSFColor(new Color(227, 239, 217)));
-//        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-//        style.setAlignment(HorizontalAlignment.CENTER); // 水平居中格式
-//        style.setVerticalAlignment(VerticalAlignment.CENTER); //垂直居中
-//        Row row = sheet.createRow(0);
-//
-//        Cell cell = row.createCell(0);
-//        cell.setCellValue("测试1");
-//        cell.setCellStyle(style);
-////        CellRangeAddress region1 = new CellRangeAddress(0, 1, (short) 0, (short) 0);
-////        sheet.addMergedRegion(region1);
-//        sheet.setColumnWidth(0, 15 * 256);
-//
-//        Cell cell1 = row.createCell(1);
-//        cell1.setCellValue("测试2");
-//        cell1.setCellStyle(style);
-////        CellRangeAddress region2 = new CellRangeAddress(0, 1, (short) 1, (short) 1);
-////        sheet.addMergedRegion(region2);
-//        sheet.setColumnWidth(1, 15 * 256);
-//
-//        /***************************************/
-//
-//        Sheet sheet1 = wb.createSheet("全校卷面分数段分布");
-//        XSSFCellStyle style1 = wb.createCellStyle();
-//        style1.setFillForegroundColor(new XSSFColor(new Color(227, 239, 217)));
-//        style1.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-//        style1.setAlignment(HorizontalAlignment.CENTER); // 水平居中格式
-//        style1.setVerticalAlignment(VerticalAlignment.CENTER); //垂直居中
-//        Row row1 = sheet1.createRow(0);
-//
-//        Cell cell2 = row1.createCell(0);
-//        cell2.setCellValue("测试3");
-//        cell2.setCellStyle(style);
-////        CellRangeAddress region1 = new CellRangeAddress(0, 1, (short) 0, (short) 0);
-////        sheet.addMergedRegion(region1);
-//        sheet1.setColumnWidth(0, 15 * 256);
-//
-//        Cell cell3 = row1.createCell(1);
-//        cell3.setCellValue("测试4");
-//        cell3.setCellStyle(style);
-////        CellRangeAddress region2 = new CellRangeAddress(0, 1, (short) 1, (short) 1);
-////        sheet.addMergedRegion(region2);
-//        sheet1.setColumnWidth(1, 15 * 256);
-//
-//        response.setHeader("Content-Disposition", "inline; filename="
-//                + URLEncoder.encode("测试", "UTF-8") + ".xlsx");
-//        response.setContentType("application/vnd.ms-excel");
-//        ServletOutputStream outputStream = response.getOutputStream();
-//        wb.write(outputStream);
-//        outputStream.flush();
-//        outputStream.close();
+                             @ApiParam(value = "科目编码", required = false) @RequestParam(required = false) String courseCode) throws Exception {
+//        IPage<TAExamCourseResult> taExamCourseResultIPage = taExamCourseService.surveyTeacherList(new Page<>(0, 10), SystemConstant.convertIdToLong(examId), semester, Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), null, null);
+//        Gson gson = new Gson();
+//        List<TAExamCourseExportDto> taExamCourseExportDtoList = gson.fromJson(JacksonUtil.parseJson(taExamCourseResultIPage.getRecords()), new TypeToken<List<TAExamCourseExportDto>>() {
+//        }.getType());
+//        ExcelUtil.excelExportBatchSheet("测试", Arrays.asList("测试1", "测试2"), Arrays.asList(TAExamCourseExportDto.class, TAExamCourseExportDto.class), Arrays.asList(taExamCourseExportDtoList, taExamCourseExportDtoList), response);
+        taExamCourseService.courseExport(SystemConstant.convertIdToLong(examId), semester, Objects.nonNull(schoolId) ? SystemConstant.convertIdToLong(schoolId) : null, courseCode);
     }
 
     @ApiOperation(value = "开课课程考试总览-教师各课堂成绩排名接口")

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/DataDriveController.java

@@ -62,9 +62,8 @@ public class DataDriveController {
     public void exportCourseSummary(@ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
                                     @ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
                                     @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
-                                    @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order,
-                                    HttpServletResponse response) throws Exception {
-        taExamTotalService.exportCourseSummary(semester, examId, column, order, response);
+                                    @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) throws Exception {
+        taExamTotalService.exportCourseSummary(semester, examId, column, order);
     }
 
     @ApiOperation(value = "全校课程考试分析-全校考试概况")
@@ -102,9 +101,8 @@ public class DataDriveController {
     @RequestMapping(value = "/course/export_data_analysis", method = RequestMethod.POST)
     public void exportDataAnalysis(@ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
                                    @ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
-                                   @ApiParam(value = "课程代码", required = true) @RequestParam String courseCode,
-                                   HttpServletResponse response) {
-        taExamTotalService.exportDataAnalysis(semester, examId, courseCode, response);
+                                   @ApiParam(value = "课程代码", required = true) @RequestParam String courseCode) {
+        taExamTotalService.exportDataAnalysis(semester, examId, courseCode);
     }
 
     @ApiOperation(value = "全校教师各课堂成绩排名")

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/TBExamStudentController.java

@@ -100,10 +100,9 @@ public class TBExamStudentController {
             @ApiParam(value = "考查学院ID", required = true) @RequestParam(required = false) Long inspectCollegeId,
             @ApiParam(value = "教师ID", required = true) @RequestParam(required = false) Long teacherId,
             @ApiParam(value = "模糊查询", required = true) @RequestParam(required = false) String studentParam,
-            HttpServletResponse response,
             @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
             @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) throws Exception {
-        tbExamStudentService.exportTeachCollegeResult(semester, examId, courseCode, current, inspectCollegeId, teacherId, studentParam, response, column, order);
+        tbExamStudentService.exportTeachCollegeResult(semester, examId, courseCode, current, inspectCollegeId, teacherId, studentParam, column, order);
     }
 
     @ApiOperation(value = "考查成绩查询")
@@ -137,9 +136,8 @@ public class TBExamStudentController {
             @ApiParam(value = "开课学院ID", required = true) @RequestParam(required = false) Long teachCollegeId,
             @ApiParam(value = "教师ID", required = true) @RequestParam(required = false) Long teacherId,
             @ApiParam(value = "模糊查询", required = true) @RequestParam(required = false) String studentParam,
-            HttpServletResponse response,
             @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
             @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) throws Exception {
-        tbExamStudentService.exportInspectCollegeResult(semester, examId, courseCode, current, teachCollegeId, teacherId, studentParam, response, column, order);
+        tbExamStudentService.exportInspectCollegeResult(semester, examId, courseCode, current, teachCollegeId, teacherId, studentParam, column, order);
     }
 }