3.4.1 bug修复

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamTaskMapper.java

@@ -59,7 +59,7 @@ public interface ExamTaskMapper extends BaseMapper<ExamTask> {
 
     List<ExamTask> listExamTaskAuditExpire(@Param("startTime") Long startTime, @Param("endTime") Long endTime);
 
-    List<ExamTaskDetailDto> listTaskPaper(@Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber,
+    List<ExamTaskDetailDto> listTaskPaper(@Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("openCollegeId") Long openCollegeId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber,
             @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("dpr") DataPermissionRule dpr, @Param("orgIds") Set<Long> orgIds, @Param("containsQuestionTeacher") boolean containsQuestionTeacher,
             @Param("userId") Long userId);
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/ExamTaskService.java

@@ -66,7 +66,7 @@ public interface ExamTaskService extends IService<ExamTask> {
 
     IPage<ExamTaskDto> listTaskReviewAudited(Long semesterId, Long examId, Long openCollegeId, Long courseId, String paperNumber, Long userId, Long startTime, Long endTime, Long startCreateTime, Long endCreateTime, Integer pageNumber, Integer pageSize);
 
-    IPage<ExamTaskDetailDto> listTaskPaper(Long semesterId, Long examId,Long openCollegeId, Long courseId, String paperNumber, Long startTime, Long endTime, Integer pageNumber, Integer pageSize);
+    IPage<ExamTaskDetailDto> listTaskPaper(Long semesterId, Long examId, Long openCollegeId, Long courseId, String paperNumber, Long startTime, Long endTime, Integer pageNumber, Integer pageSize);
 
     List<RelatePaperDto> listPaperTypes(Long examTaskId, Long printPlanId, Long courseId);
 
@@ -86,9 +86,9 @@ public interface ExamTaskService extends IService<ExamTask> {
      */
     void checkDataByExamination(Long printPlanId, List<Long> examDetailIdList, SysUser user) throws IOException;
 
-    List<ExamTaskDetailDto> listTaskPaper(Long semesterId, Long examId, Long courseId, String paperNumber, Long startTime, Long endTime);
+    List<ExamTaskDetailDto> listTaskPaper(Long semesterId, Long examId, Long openCollegeId, Long courseId, String paperNumber, Long startTime, Long endTime);
 
-    TBTask taskDownloadPdf(Long semesterId, Long examId, Long courseId, String paperNumber, Long startTime, Long endTime);
+    TBTask taskDownloadPdf(Long semesterId, Long examId, Long openCollegeId, Long courseId, String paperNumber, Long startTime, Long endTime);
 
     /**
      * 获取待办任务

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskServiceImpl.java

@@ -970,7 +970,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     }
 
     @Override
-    public List<ExamTaskDetailDto> listTaskPaper(Long semesterId, Long examId, Long courseId, String paperNumber, Long startTime, Long
+    public List<ExamTaskDetailDto> listTaskPaper(Long semesterId, Long examId, Long openCollegeId, Long courseId, String paperNumber, Long startTime, Long
             endTime) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         // 查询用户角色是否包含命题老师
@@ -979,12 +979,12 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(null);
         DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(schoolId, sysUser.getId(), ServletUtil.getRequest().getServletPath());
-        return this.baseMapper.listTaskPaper(schoolId, semesterId, examId, courseId, paperNumber, startTime, endTime, dpr, orgIds, containsQuestionTeacher, sysUser.getId());
+        return this.baseMapper.listTaskPaper(schoolId, semesterId, examId, openCollegeId, courseId, paperNumber, startTime, endTime, dpr, orgIds, containsQuestionTeacher, sysUser.getId());
     }
 
     @Override
-    public TBTask taskDownloadPdf(Long semesterId, Long examId, Long courseId, String paperNumber, Long startTime, Long endTime) {
-        List<ExamTaskDetailDto> examTasks = this.listTaskPaper(semesterId, examId, courseId, paperNumber, startTime, endTime);
+    public TBTask taskDownloadPdf(Long semesterId, Long examId, Long openCollegeId, Long courseId, String paperNumber, Long startTime, Long endTime) {
+        List<ExamTaskDetailDto> examTasks = this.listTaskPaper(semesterId, examId, openCollegeId, courseId, paperNumber, startTime, endTime);
         if (CollectionUtils.isEmpty(examTasks)) {
             throw ExceptionResultEnum.ERROR.exception("没有可导出数据");
         }

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamTaskQueryController.java

@@ -155,6 +155,7 @@ public class ExamTaskQueryController {
     @OperationLogDetail(operationType = OperationTypeEnum.EXPORT, detail = "批量下载试卷PDF、题卡操作，考试ID：{{examId}}、课程代码：{{courseCode}}、试卷编号：{{paperNumber}}")
     public Result paperCardDownloadPdf(@ApiParam(value = "学期ID") @RequestParam(value = "semesterId", required = false) Long semesterId,
                                        @ApiParam(value = "考试ID") @RequestParam(value = "examId", required = false) Long examId,
+                                       @ApiParam(value = "考试ID") @RequestParam(value = "openCollegeId", required = false) Long openCollegeId,
                                        @ApiParam(value = "课程ID") @RequestParam(value = "courseCode", required = false) Long courseId,
                                        @ApiParam(value = "试卷编号") @RequestParam(value = "paperNumber", required = false) String paperNumber,
                                        @ApiParam(value = "入库时间（开始）") @RequestParam(value = "startTime", required = false) Long startTime,
@@ -165,7 +166,7 @@ public class ExamTaskQueryController {
         if (examId == null) {
             throw ExceptionResultEnum.EXAM_ID_IS_NULL.exception();
         }
-        TBTask tbTask = examTaskService.taskDownloadPdf(semesterId, examId, courseId, paperNumber, startTime, endTime);
+        TBTask tbTask = examTaskService.taskDownloadPdf(semesterId, examId, openCollegeId, courseId, paperNumber, startTime, endTime);
         return Objects.nonNull(tbTask) ? ResultUtil.ok(new EditResult(tbTask.getId())) : ResultUtil.error("创建任务失败");
     }