add.

1.课程,试卷编号公共查询条件更改
2.涉及开课学院查询更改

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

@@ -21,17 +21,18 @@ public interface ConditionMapper {
     List<String> listPaperNumber(@Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("courseId") Long courseId, @Param("printPlanIds") List<String> printPlanIds,
             @Param("dpr") DataPermissionRule dpr);
 
-    List<BasicCourse> listCourseForApply(@Param("examId") Long examId, @Param("userId") Long userId);
+    List<BasicCourse> listCourseForApply(@Param("examId") Long examId, @Param("openCollegeId") Long openCollegeId, @Param("userId") Long userId);
 
-    List<BasicCourse> listCourseForAudit(@Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("enable") Boolean enable);
+    List<BasicCourse> listCourseForAudit(@Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("openCollegeId") Long openCollegeId, @Param("enable") Boolean enable);
 
-    List<String> listPaperNumberForApply(@Param("examId") Long examId, @Param("courseId") Long courseId, @Param("userId") Long userId);
+    List<String> listPaperNumberForApply(@Param("examId") Long examId,@Param("openCollegeId") Long openCollegeId, @Param("courseId") Long courseId, @Param("userId") Long userId);
 
-    List<String> listPaperNumberAudit(@Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("courseId") Long courseId);
+    List<String> listPaperNumberAudit(@Param("semesterId") Long semesterId, @Param("examId") Long examId,@Param("openCollegeId") Long openCollegeId, @Param("courseId") Long courseId);
 
     List<PrintPlanBrief> listPrintPlan(@Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("dpr") DataPermissionRule dpr);
 
-    List<BasicCourse> listCourseForScore(@Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("status") String status, @Param("dpr") DataPermissionRule dpr);
+    List<BasicCourse> listCourseForScore(@Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("openCollegeId") Long openCollegeId, @Param("status") String status,
+            @Param("dpr") DataPermissionRule dpr);
 
     List<PrintPlanBrief> listPrintPlanForClient(@Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("examDetailStatus") String[] examDetailStatus);
 
@@ -40,25 +41,26 @@ public interface ConditionMapper {
     List<String> listPaperNumberPlanTask(@Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("printPlanIds") List<String> printPlanIds, @Param("courseId") Long courseId,
             @Param("dpr") DataPermissionRule dpr);
 
-    List<BasicCourse> listCourseForEntrance(@Param("examId") Long examId, @Param("userId") Long userId, @Param("status") String status);
+    List<BasicCourse> listCourseForEntrance(@Param("examId") Long examId, @Param("openCollegeId") Long openCollegeId, @Param("userId") Long userId, @Param("status") String status);
 
-    List<String> listPaperNumberForEntrance(@Param("examId") Long examId, @Param("userId") Long userId, @Param("courseId") Long courseId, @Param("status") String status);
+    List<String> listPaperNumberForEntrance(@Param("examId") Long examId,@Param("openCollegeId") Long openCollegeId, @Param("userId") Long userId, @Param("courseId") Long courseId, @Param("status") String status);
 
-    List<BasicCourse> listCourseFromMarkPaper(@Param("examId") Long examId, @Param("dpr") DataPermissionRule dpr);
+    List<BasicCourse> listCourseFromMarkPaper(@Param("examId") Long examId, @Param("openCollegeId") Long openCollegeId,
+            @Param("dpr") DataPermissionRule dpr);
 
-    List<String> listPaperNumberFromMarkPaper(@Param("examId") Long examId, @Param("courseId") Long courseId, @Param("dpr") DataPermissionRule dpr);
+    List<String> listPaperNumberFromMarkPaper(@Param("examId") Long examId,@Param("openCollegeId") Long openCollegeId, @Param("courseId") Long courseId, @Param("dpr") DataPermissionRule dpr);
 
-    List<BasicCourse> listCourseFromExamTaskByCreateId(@Param("examId") Long examId, @Param("dpr") DataPermissionRule dpr);
+    List<BasicCourse> listCourseFromExamTaskByCreateId(@Param("examId") Long examId, @Param("openCollegeId") Long openCollegeId, @Param("dpr") DataPermissionRule dpr);
 
     List<BasicCourse> listCourseFromExamTaskByUserId(@Param("examId") Long examId, @Param("dpr") DataPermissionRule dpr);
 
-    List<String> listPaperNumberFromExamTaskByCreateId(@Param("examId") Long examId, @Param("courseId") Long courseId, @Param("dpr") DataPermissionRule dpr);
+    List<String> listPaperNumberFromExamTaskByCreateId(@Param("examId") Long examId,@Param("openCollegeId") Long openCollegeId, @Param("courseId") Long courseId, @Param("dpr") DataPermissionRule dpr);
 
     List<String> listPaperNumberFromExamTaskByUserIdAndPass(@Param("examId") Long examId, @Param("courseId") Long courseId, @Param("dpr") DataPermissionRule dpr);
 
-    List<BasicCourse> listCourseForQuery(@Param("examId") Long examId, @Param("dpr") DataPermissionRule dpr);
+    List<BasicCourse> listCourseForQuery(@Param("examId") Long examId, @Param("openCollegeId") Long openCollegeId, @Param("dpr") DataPermissionRule dpr);
 
-    List<String> listPaperNumberForQuery(@Param("examId") Long examId, @Param("courseId") Long courseId, @Param("dpr") DataPermissionRule dpr);
+    List<String> listPaperNumberForQuery(@Param("examId") Long examId,@Param("openCollegeId") Long openCollegeId, @Param("courseId") Long courseId, @Param("dpr") DataPermissionRule dpr);
 
     List<BasicCourse> listCourseForApproveHistory(@Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("dpr") DataPermissionRule dpr);
 
@@ -72,11 +74,11 @@ public interface ConditionMapper {
     List<BasicCourse> listCultureProgramCourse(@Param("schoolId") Long schoolId, @Param("professionalId") Long professionalId, @Param("cultureProgramId") Long cultureProgramId,
             @Param("semesterId") Long semesterId, @Param("dpr") DataPermissionRule dpr);
 
-    List<BasicCourse> listCourseForDocument(@Param("examId") Long examId, @Param("dpr") DataPermissionRule dpr);
+    List<BasicCourse> listCourseForDocument(@Param("examId") Long examId, @Param("openCollegeId") Long openCollegeId, @Param("dpr") DataPermissionRule dpr);
 
     List<BasicCourse> listCourseForBasicExamStudent(@Param("examId") Long examId, @Param("openCollegeId") Long openCollegeId, @Param("dpr") DataPermissionRule dpr);
 
-    List<String> listPaperNumberFromBasicExamStudent(@Param("examId") Long examId, @Param("courseId") Long courseId, @Param("dpr") DataPermissionRule dpr);
+    List<String> listPaperNumberFromBasicExamStudent(@Param("examId") Long examId,@Param("openCollegeId") Long openCollegeId, @Param("courseId") Long courseId, @Param("dpr") DataPermissionRule dpr);
 
     List<BasicCourse> listCourseForPrintCount(@Param("examId") Long examId, @Param("openCollegeId") Long openCollegeId,
             @Param("dpr") DataPermissionRule dpr);
@@ -99,5 +101,6 @@ public interface ConditionMapper {
 
     List<BasicCourse> listCourseForExamDetail(@Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("printPlanIds") List<String> printPlanIds, @Param("dpr") DataPermissionRule dpr);
 
-    List<String> listPaperNumberForExamDetail(@Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("printPlanIds") List<String> printPlanIds, @Param("courseId") Long courseId, @Param("dpr") DataPermissionRule dpr);
+    List<String> listPaperNumberForExamDetail(@Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("printPlanIds") List<String> printPlanIds, @Param("courseId") Long courseId,
+            @Param("dpr") DataPermissionRule dpr);
 }

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

@@ -29,17 +29,29 @@ import java.util.Set;
  */
 public interface ExamTaskMapper extends BaseMapper<ExamTask> {
 
-    IPage<ExamTaskDto> listPage(Page<ExamTaskDto> page, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("enable") Boolean enable, @Param("status") String status, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("userName") String userName, @Param("dpr") DataPermissionRule dpr);
+    IPage<ExamTaskDto> listPage(Page<ExamTaskDto> page, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("enable") Boolean enable,
+            @Param("status") String status, @Param("openCollegeId") Long openCollegeId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber,
+            @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("userName") String userName, @Param("dpr") DataPermissionRule dpr);
 
     List<BlurryUserDto> listUser(@Param("schoolId") Long schoolId, @Param("param") String param, @Param("orgIds") Set<Long> orgIds);
 
-    IPage<ExamTaskDto> listTaskApply(Page<ExamTaskDto> page, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("auditStatus") String auditStatus, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("userId") Long userId, @Param("userName") String userName);
+    IPage<ExamTaskDto> listTaskApply(Page<ExamTaskDto> page, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId,
+            @Param("auditStatus") String auditStatus, @Param("openCollegeId") Long openCollegeId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber,
+            @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("userId") Long userId, @Param("userName") String userName);
 
-    IPage<ExamTaskDto> listTaskReviewUnaudited(Page<ExamTaskDto> page, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("userId") Long userId, @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("startCreateTime") Long startCreateTime, @Param("endCreateTime") Long endCreateTime, @Param("currentUserId") Long currentUserId);
+    IPage<ExamTaskDto> listTaskReviewUnaudited(Page<ExamTaskDto> page, @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("userId") Long userId, @Param("startTime") Long startTime,
+            @Param("endTime") Long endTime, @Param("startCreateTime") Long startCreateTime, @Param("endCreateTime") Long endCreateTime, @Param("currentUserId") Long currentUserId);
 
-    IPage<ExamTaskDto> listTaskReviewAudited(Page<ExamTaskDto> page, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("userId") Long userId, @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("orgIds") Set<Long> orgIds, @Param("startCreateTime") Long startCreateTime, @Param("endCreateTime") Long endCreateTime, @Param("currentUserId") Long currentUserId);
+    IPage<ExamTaskDto> listTaskReviewAudited(Page<ExamTaskDto> page, @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("userId") Long userId, @Param("startTime") Long startTime,
+            @Param("endTime") Long endTime, @Param("orgIds") Set<Long> orgIds, @Param("startCreateTime") Long startCreateTime, @Param("endCreateTime") Long endCreateTime,
+            @Param("currentUserId") Long currentUserId);
 
-    IPage<ExamTaskDetailDto> listTaskPaper(Page<ExamTaskDetailDto> page, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("dpr") DataPermissionRule dpr, @Param("containsQuestionTeacher") boolean containsQuestionTeacher, @Param("userId") Long userId);
+    IPage<ExamTaskDetailDto> listTaskPaper(Page<ExamTaskDetailDto> page, @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("containsQuestionTeacher") boolean containsQuestionTeacher, @Param("userId") Long userId);
 
     ExamTaskDetailCardDto applyGetOne(@Param("examTaskId") Long examTaskId, @Param("source") String source);
 
@@ -47,7 +59,9 @@ 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, @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);
+    List<ExamTaskDetailDto> listTaskPaper(@Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @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);
 
     /**
      * 获取待办任务
@@ -59,7 +73,8 @@ public interface ExamTaskMapper extends BaseMapper<ExamTask> {
     /**
      * 根据流程状态查找命题任务
      */
-    List<ExamTask> findExamTaskByFlowStatus(@Param("schoolId") Long schoolId, @Param("examId") Long examId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("flowStatus") String flowStatus);
+    List<ExamTask> findExamTaskByFlowStatus(@Param("schoolId") Long schoolId, @Param("examId") Long examId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber,
+            @Param("flowStatus") String flowStatus);
 
     /**
      * 根据试卷编号查询考场详细数据集（印刷计划状态为‘PRINTING’、‘PRINTING_FINISH‘的）
@@ -68,13 +83,15 @@ public interface ExamTaskMapper extends BaseMapper<ExamTask> {
      * @param printPlanStatusEnumList 印刷计划状态集合
      * @return 数据集
      */
-    List<ExamPackageDetail> findExamPackageDetailByPaperNumber(@Param("schoolId") Long schoolId, @Param("examId") Long examId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("printPlanStatusEnumList") List<PrintPlanStatusEnum> printPlanStatusEnumList);
+    List<ExamPackageDetail> findExamPackageDetailByPaperNumber(@Param("schoolId") Long schoolId, @Param("examId") Long examId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber,
+            @Param("printPlanStatusEnumList") List<PrintPlanStatusEnum> printPlanStatusEnumList);
 
     ExamTask findByFlowId(@Param("flowId") Long flowId);
 
     ExamTaskDto getByExamTaskId(Long examTaskId);
 
-    IPage<ExamTaskDetailDto> listExamTaskDetailDownload(@Param("page") Page<ExamTaskDetailDto> page, @Param("examId") Long examId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("orgId") Long orgId, @Param("userParam") String userParam, @Param("dpr") DataPermissionRule dpr);
+    IPage<ExamTaskDetailDto> listExamTaskDetailDownload(@Param("page") Page<ExamTaskDetailDto> page, @Param("examId") Long examId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber,
+            @Param("orgId") Long orgId, @Param("userParam") String userParam, @Param("dpr") DataPermissionRule dpr);
 
     /**
      * 根据条件查询要下载的试卷文件
@@ -86,7 +103,8 @@ public interface ExamTaskMapper extends BaseMapper<ExamTask> {
      * @param dpr
      * @return 命题任务试卷信息
      */
-    List<ExamTaskDetailDto> listExamTaskDetailDownloadByQuery(@Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("courseName") String courseName, @Param("orgId") Long orgId, @Param("idSet") Set<Long> idSet, @Param("dpr") DataPermissionRule dpr);
+    List<ExamTaskDetailDto> listExamTaskDetailDownloadByQuery(@Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("courseName") String courseName, @Param("orgId") Long orgId,
+            @Param("idSet") Set<Long> idSet, @Param("dpr") DataPermissionRule dpr);
 
     /**
      * 根据流程id和任务节点id获取待办
@@ -97,7 +115,8 @@ public interface ExamTaskMapper extends BaseMapper<ExamTask> {
      */
     public WorkResult getFlowInfo(@Param("flowId") Long flowId, @Param("taskId") Long taskId);
 
-    IPage<MakeupExamTaskDto> listMakeupExamTask(@Param("page") Page<MakeupExamTaskDto> page, @Param("printPlanId") Long printPlanId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("collegeId") Long collegeId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("userName") String userName);
+    IPage<MakeupExamTaskDto> listMakeupExamTask(@Param("page") Page<MakeupExamTaskDto> page, @Param("printPlanId") Long printPlanId, @Param("semesterId") Long semesterId, @Param("examId") Long examId,
+            @Param("collegeId") Long collegeId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("userName") String userName);
 
     /**
      * 命题任务统计查询
@@ -115,7 +134,9 @@ public interface ExamTaskMapper extends BaseMapper<ExamTask> {
      * @param dpr
      * @return
      */
-    IPage<PrintCountResult> printCountList(IPage<Map> iPage, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("printPlanId") Long printPlanId, @Param("collegeId") Long collegeId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("cardType") String cardType, @Param("finishStatus") String finishStatus, @Param("dpr") DataPermissionRule dpr);
+    IPage<PrintCountResult> printCountList(IPage<Map> iPage, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("printPlanId") Long printPlanId,
+            @Param("collegeId") Long collegeId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("cardType") String cardType,
+            @Param("finishStatus") String finishStatus, @Param("dpr") DataPermissionRule dpr);
 
     /**
      * 命题任务统计导出
@@ -132,7 +153,9 @@ public interface ExamTaskMapper extends BaseMapper<ExamTask> {
      * @param dpr
      * @return
      */
-    List<PrintCountResult> printCountListExport(@Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("printPlanId") Long printPlanId, @Param("collegeId") Long collegeId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("cardType") String cardType, @Param("finishStatus") String finishStatus, @Param("dpr") DataPermissionRule dpr);
+    List<PrintCountResult> printCountListExport(@Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId,
+            @Param("examId") Long examId, @Param("printPlanId") Long printPlanId, @Param("collegeId") Long collegeId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber,
+            @Param("cardType") String cardType, @Param("finishStatus") String finishStatus, @Param("dpr") DataPermissionRule dpr);
 
     /**
      * 印刷任务统计查询
@@ -148,7 +171,8 @@ public interface ExamTaskMapper extends BaseMapper<ExamTask> {
      * @param dpr
      * @return
      */
-    IPage<ScanCountResult> scanCountList(IPage<Map> iPage, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("collegeId") Long collegeId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("cardType") String cardType, @Param("dpr") DataPermissionRule dpr);
+    IPage<ScanCountResult> scanCountList(IPage<Map> iPage, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("collegeId") Long collegeId,
+            @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("cardType") String cardType, @Param("dpr") DataPermissionRule dpr);
 
     /**
      * 印刷任务统计导出
@@ -163,7 +187,8 @@ public interface ExamTaskMapper extends BaseMapper<ExamTask> {
      * @param dpr
      * @return
      */
-    List<ScanCountResult> scanCountListExport(@Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("collegeId") Long collegeId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("cardType") String cardType, @Param("dpr") DataPermissionRule dpr);
+    List<ScanCountResult> scanCountListExport(@Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("collegeId") Long collegeId, @Param("courseId") Long courseId,
+            @Param("paperNumber") String paperNumber, @Param("cardType") String cardType, @Param("dpr") DataPermissionRule dpr);
 
     /**
      * 统计计算

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

@@ -21,7 +21,7 @@ public interface ConditionService {
 
     List<BasicCourse> listCourse(Long semesterId, Long examId, Boolean enable, List<String> printPlanId, Long openCollegeId);
 
-    List<String> listPaperNumber(Long semesterId, Long examId, Long courseId, List<String> printPlanId);
+    List<String> listPaperNumber(Long semesterId, Long examId, Long openCollegeId, Long courseId, List<String> printPlanId);
 
     List<PrintPlanBrief> listPrintPlan(Long semesterId, Long examId, String source);
 

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

@@ -41,7 +41,7 @@ import java.util.Map;
  */
 public interface ExamTaskService extends IService<ExamTask> {
 
-    IPage<ExamTaskDto> list(Long semesterId, Long examId, Boolean enable, String status, Long courseId, String paperNumber, Long startTime, Long endTime, String userName, Integer pageNumber, Integer pageSize);
+    IPage<ExamTaskDto> list(Long semesterId, Long examId, Boolean enable, String status,Long openCollegeId, Long courseId, String paperNumber, Long startTime, Long endTime, String userName, Integer pageNumber, Integer pageSize);
 
     List<BlurryUserDto> listUser(String param);
 
@@ -61,13 +61,13 @@ public interface ExamTaskService extends IService<ExamTask> {
 
     List<ExamTask> saveBatch(ExamTask task);
 
-    IPage<ExamTaskDto> listTaskApply(Long semesterId, Long examId, String auditStatus, Long courseId, String paperNumber, Long startTime, Long endTime, String userName, Integer pageNumber, Integer pageSize);
+    IPage<ExamTaskDto> listTaskApply(Long semesterId, Long examId, String auditStatus,Long openCollegeId, Long courseId, String paperNumber, Long startTime, Long endTime, String userName, Integer pageNumber, Integer pageSize);
 
-    IPage<ExamTaskDto> listTaskReviewUnaudited(Long semesterId, Long examId, Long courseId, String paperNumber, Long userId, Long startTime, Long endTime, Long startCreateTime, Long endCreateTime, Integer pageNumber, Integer pageSize);
+    IPage<ExamTaskDto> listTaskReviewUnaudited(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<ExamTaskDto> listTaskReviewAudited(Long semesterId, Long examId, Long courseId, String paperNumber, Long userId, Long startTime, Long endTime, Long startCreateTime, Long endCreateTime, Integer pageNumber, Integer pageSize);
+    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 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);
 

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

@@ -42,9 +42,6 @@ public class ConditionServiceImpl implements ConditionService {
     @Resource
     BasicRoleDataPermissionService basicRoleDataPermissionService;
 
-    @Resource
-    TeachCourseService teachCourseService;
-
     @Resource
     SysOrgService sysOrgService;
 
@@ -98,19 +95,19 @@ public class ConditionServiceImpl implements ConditionService {
         }
         // 命题任务管理（39）
         else if ("39".equals(privilegeIdString)) {
-            return conditionMapper.listCourseFromExamTaskByCreateId(examId, dpr);
+            return conditionMapper.listCourseFromExamTaskByCreateId(examId, openCollegeId, dpr);
         }
         // 入库申请（40）
         else if ("40".equals(privilegeIdString)) {
-            return conditionMapper.listCourseForApply(examId, sysUser.getId());
+            return conditionMapper.listCourseForApply(examId, openCollegeId, sysUser.getId());
         }
         // 入库审核（41）
         else if ("41".equals(privilegeIdString)) {
-            return conditionMapper.listCourseForAudit(semesterId, examId, enable);
+            return conditionMapper.listCourseForAudit(semesterId, examId, openCollegeId, enable);
         }
         // 卷库查询（42）
         else if ("42".equals(privilegeIdString)) {
-            return conditionMapper.listCourseForQuery(examId, dpr);
+            return conditionMapper.listCourseForQuery(examId, openCollegeId, dpr);
         }
         // 考务数据导入（44）、考务明细查询（45）
         else if ("44".equals(privilegeIdString) || "45".equals(privilegeIdString)) {
@@ -126,11 +123,12 @@ public class ConditionServiceImpl implements ConditionService {
         }
         // 成绩查询
         else if ("487".equals(privilegeIdString) || "2001".equals(privilegeIdString)) {
-            return conditionMapper.listCourseForScore(semesterId, examId, MarkPaperStatus.FINISH.name(), dpr);
+            return conditionMapper.listCourseForScore(semesterId, examId, openCollegeId, MarkPaperStatus.FINISH.name(),
+                    dpr);
         }
         // 评卷入口（491）
         else if ("491".equals(privilegeIdString)) {
-            return conditionMapper.listCourseForEntrance(examId, sysUser.getId(), MarkPaperStatus.FORMAL.name());
+            return conditionMapper.listCourseForEntrance(examId, openCollegeId, sysUser.getId(), MarkPaperStatus.FORMAL.name());
         }
         // 分析批次管理&&蓝图设置
         else if ("681".equals(privilegeIdString) || "708".equals(privilegeIdString)) {
@@ -138,7 +136,7 @@ public class ConditionServiceImpl implements ConditionService {
         }
         // 评卷设置（897）、评卷管理（917）、成绩检查（946）
         else if ("897".equals(privilegeIdString) || "917".equals(privilegeIdString) || "946".equals(privilegeIdString)) {
-            return conditionMapper.listCourseFromMarkPaper(examId, dpr);
+            return conditionMapper.listCourseFromMarkPaper(examId, openCollegeId, dpr);
         }
         // 下载管理（653)
         else if ("653".equals(privilegeIdString)) {
@@ -146,7 +144,7 @@ public class ConditionServiceImpl implements ConditionService {
         }
         // 文档管理（577）
         else if ("577".equals(privilegeIdString)) {
-            return conditionMapper.listCourseForDocument(examId, dpr);
+            return conditionMapper.listCourseForDocument(examId, openCollegeId, dpr);
         } // 印刷任务统计（2088）
         else if ("2088".equals(privilegeIdString)) {
             return conditionMapper.listCourseForPrintCount(examId, openCollegeId, dpr);
@@ -159,7 +157,7 @@ public class ConditionServiceImpl implements ConditionService {
     }
 
     @Override
-    public List<String> listPaperNumber(Long semesterId, Long examId, Long courseId, List<String> printPlanIds) {
+    public List<String> listPaperNumber(Long semesterId, Long examId, Long openCollegeId, Long courseId, List<String> printPlanIds) {
         // 考试ID为空，默认返回空
         if (examId == null) {
             return new ArrayList<>();
@@ -172,22 +170,22 @@ public class ConditionServiceImpl implements ConditionService {
 
         // 考生管理（1100）
         if ("1100".equals(privilegeIdString)) {
-            return conditionMapper.listPaperNumberFromBasicExamStudent(examId, courseId, dpr);
+            return conditionMapper.listPaperNumberFromBasicExamStudent(examId, openCollegeId, courseId, dpr);
         }// 命题任务管理（39）
         else if ("39".equals(privilegeIdString)) {
-            return conditionMapper.listPaperNumberFromExamTaskByCreateId(examId, courseId, dpr);
+            return conditionMapper.listPaperNumberFromExamTaskByCreateId(examId, openCollegeId, courseId, dpr);
         }
         // 入库申请（40）
         else if ("40".equals(privilegeIdString)) {
-            return conditionMapper.listPaperNumberForApply(examId, courseId, sysUser.getId());
+            return conditionMapper.listPaperNumberForApply(examId, openCollegeId, courseId, sysUser.getId());
         }
         // 入库审核（41）
         else if ("41".equals(privilegeIdString)) {
-            return conditionMapper.listPaperNumberAudit(semesterId, examId, courseId);
+            return conditionMapper.listPaperNumberAudit(semesterId, examId, openCollegeId, courseId);
         }
         // 卷库查询（42）
         else if ("42".equals(privilegeIdString)) {
-            return conditionMapper.listPaperNumberForQuery(examId, courseId, dpr);
+            return conditionMapper.listPaperNumberForQuery(examId, openCollegeId, courseId, dpr);
         }
         // 考务数据导入（44）、考务明细查询（45）
         else if ("44".equals(privilegeIdString) || "45".equals(privilegeIdString)) {
@@ -207,11 +205,12 @@ public class ConditionServiceImpl implements ConditionService {
         }
         // 评卷入口（491）
         else if ("491".equals(privilegeIdString)) {
-            return conditionMapper.listPaperNumberForEntrance(examId, sysUser.getId(), courseId, MarkPaperStatus.FORMAL.name());
+            return conditionMapper.listPaperNumberForEntrance(examId, openCollegeId, sysUser.getId(), courseId,
+                    MarkPaperStatus.FORMAL.name());
         }
         // 评卷设置（897）、评卷管理（917）、成绩检查（946）
         else if ("897".equals(privilegeIdString) || "917".equals(privilegeIdString) || "946".equals(privilegeIdString)) {
-            return conditionMapper.listPaperNumberFromMarkPaper(examId, courseId, dpr);
+            return conditionMapper.listPaperNumberFromMarkPaper(examId, openCollegeId, courseId, dpr);
         }
         // 下载管理（653)
         else if ("653".equals(privilegeIdString)) {
@@ -235,8 +234,8 @@ public class ConditionServiceImpl implements ConditionService {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
 
         if ("client".equals(source)) {
-            String[] examDetailStatus = new String[]{ExamDetailStatusEnum.NEW.name(),
-                    PrintPlanStatusEnum.READY.name()};
+            String[] examDetailStatus = new String[] { ExamDetailStatusEnum.NEW.name(),
+                    PrintPlanStatusEnum.READY.name() };
             return conditionMapper.listPrintPlanForClient(semesterId, examId, examDetailStatus);
         } else {
             // 如果byAssignUser为true时，不能通过层级关系查询

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

@@ -163,20 +163,23 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     private TikuUtils tikuUtils;
 
     @Override
-    public IPage<ExamTaskDto> list(Long semesterId, Long examId, Boolean enable, String status, Long courseId, String paperNumber, Long startTime, Long endTime, String userName, Integer pageNumber, Integer pageSize) {
+    public IPage<ExamTaskDto> list(Long semesterId, Long examId, Boolean enable, String status, Long openCollegeId, Long courseId, String paperNumber, Long startTime, Long endTime, String userName, Integer pageNumber, Integer pageSize) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         userName = SystemConstant.translateSpecificSign(userName);
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(schoolId, requestUser.getId(), ServletUtil.getRequest().getServletPath());
+        DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(schoolId, requestUser.getId(),
+                ServletUtil.getRequest().getServletPath());
         Page<ExamTaskDto> page = new Page<>(pageNumber, pageSize);
-        IPage<ExamTaskDto> examTaskDtoIPage = this.baseMapper.listPage(page, schoolId, semesterId, examId, enable, status, courseId, paperNumber, startTime, endTime, userName, dpr);
+        IPage<ExamTaskDto> examTaskDtoIPage = this.baseMapper.listPage(page, schoolId, semesterId, examId, enable,
+                status, openCollegeId, courseId, paperNumber, startTime, endTime, userName, dpr);
         for (ExamTaskDto record : examTaskDtoIPage.getRecords()) {
             // 判断审批表状态
             String cellPaperNumber = record.getPaperNumber();
             List<PrintPlanStatusEnum> printPlanStatusEnumList = new ArrayList<>();
             printPlanStatusEnumList.add(PrintPlanStatusEnum.PRINTING);
             printPlanStatusEnumList.add(PrintPlanStatusEnum.FINISH);
-            List<ExamPackageDetail> examPackageDetailDatasource = this.baseMapper.findExamPackageDetailByPaperNumber(schoolId, examId, record.getCourseId(), cellPaperNumber, printPlanStatusEnumList);
+            List<ExamPackageDetail> examPackageDetailDatasource = this.baseMapper.findExamPackageDetailByPaperNumber(
+                    schoolId, examId, record.getCourseId(), cellPaperNumber, printPlanStatusEnumList);
             record.setApproveFormStatus(examPackageDetailDatasource.size() > 0);
         }
         return examTaskDtoIPage;
@@ -628,11 +631,11 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     }
 
     @Override
-    public IPage<ExamTaskDto> listTaskApply(Long semesterId, Long examId, String auditStatus, Long courseId, String paperNumber, Long startTime, Long endTime, String userName, Integer pageNumber, Integer pageSize) {
+    public IPage<ExamTaskDto> listTaskApply(Long semesterId, Long examId, String auditStatus,Long openCollegeId, Long courseId, String paperNumber, Long startTime, Long endTime, String userName, Integer pageNumber, Integer pageSize) {
         userName = SystemConstant.translateSpecificSign(userName);
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        IPage<ExamTaskDto> examTaskDtoIPage = this.baseMapper.listTaskApply(new Page<>(pageNumber, pageSize), schoolId, semesterId, examId, auditStatus, courseId, paperNumber, startTime, endTime, sysUser.getId(), userName);
+        IPage<ExamTaskDto> examTaskDtoIPage = this.baseMapper.listTaskApply(new Page<>(pageNumber, pageSize), schoolId, semesterId, examId, auditStatus,openCollegeId, courseId, paperNumber, startTime, endTime, sysUser.getId(), userName);
         for (ExamTaskDto record : examTaskDtoIPage.getRecords()) {
             if ((Objects.nonNull(record.getReview()) && record.getReview() && FlowStatusEnum.FINISH.name().equals(record.getAuditStatus()) && !ExamModelEnum.MODEL3.equals(record.getExamModel()))) {
                 record.setApproveFormStatus(true);
@@ -644,30 +647,35 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     }
 
     @Override
-    public IPage<ExamTaskDto> listTaskReviewUnaudited(Long semesterId, Long examId, Long courseId, String paperNumber, Long userId, Long startTime, Long endTime, Long startCreateTime, Long endCreateTime, Integer pageNumber, Integer pageSize) {
+    public IPage<ExamTaskDto> listTaskReviewUnaudited(Long semesterId, Long examId, Long openCollegeId, Long courseId, String paperNumber, Long userId, Long startTime, Long endTime, Long startCreateTime, Long endCreateTime, Integer pageNumber, Integer pageSize) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        return this.baseMapper.listTaskReviewUnaudited(new Page<>(pageNumber, pageSize), schoolId, semesterId, examId, courseId, paperNumber, userId, startTime, endTime, startCreateTime, endCreateTime, sysUser.getId());
+        return this.baseMapper.listTaskReviewUnaudited(new Page<>(pageNumber, pageSize), schoolId, semesterId, examId,
+                openCollegeId, courseId, paperNumber, userId, startTime, endTime, startCreateTime, endCreateTime,
+                sysUser.getId());
     }
 
     @Override
-    public IPage<ExamTaskDto> listTaskReviewAudited(Long semesterId, Long examId, Long courseId, String
+    public 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) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(null);
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        return this.baseMapper.listTaskReviewAudited(new Page<>(pageNumber, pageSize), schoolId, semesterId, examId, courseId, paperNumber, userId, startTime, endTime, orgIds, startCreateTime, endCreateTime, sysUser.getId());
+        return this.baseMapper.listTaskReviewAudited(new Page<>(pageNumber, pageSize), schoolId, semesterId, examId,
+                openCollegeId, courseId, paperNumber, userId, startTime, endTime, orgIds, startCreateTime, endCreateTime, sysUser.getId());
     }
 
     @Override
-    public IPage<ExamTaskDetailDto> listTaskPaper(Long semesterId, Long examId, Long courseId, String paperNumber, Long startTime, Long endTime, Integer pageNumber, Integer pageSize) {
+    public IPage<ExamTaskDetailDto> listTaskPaper(Long semesterId, Long examId,Long openCollegeId, Long courseId, String paperNumber, Long startTime, Long endTime, Integer pageNumber, Integer pageSize) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         boolean containsQuestionTeacher = false;
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(schoolId, requestUser.getId(), ServletUtil.getRequest().getServletPath());
+        DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(schoolId, requestUser.getId(),
+                ServletUtil.getRequest().getServletPath());
         Page<ExamTaskDetailDto> page = new Page<>(pageNumber, pageSize);
-        return this.baseMapper.listTaskPaper(page, schoolId, semesterId, examId, courseId, paperNumber, startTime, endTime, dpr, containsQuestionTeacher, sysUser.getId());
+        return this.baseMapper.listTaskPaper(page, schoolId, semesterId, examId, openCollegeId, courseId, paperNumber,
+                startTime, endTime, dpr, containsQuestionTeacher, sysUser.getId());
     }
 
     @Override

distributed-print-business/src/main/resources/mapper/ConditionMapper.xml

@@ -97,8 +97,11 @@
             bc.code,
             bc.name
         from basic_course bc
-            where
-                exists (
+            <where>
+                <if test="openCollegeId != null">
+                    AND bc.teaching_room_id = #{openCollegeId}
+                </if>
+                and exists (
                     select 1 FROM exam_task et
                 <where>
                     bc.id = et.course_id
@@ -111,6 +114,7 @@
                     </if>
                 </where>
                 )
+            </where>
     </select>
     <select id="listCourseForAudit" resultType="com.qmth.teachcloud.common.entity.BasicCourse">
         SELECT
@@ -119,7 +123,10 @@
         FROM
             basic_course bc
         <where>
-            EXISTS( SELECT
+            <if test="openCollegeId != null">
+                AND bc.teaching_room_id = #{openCollegeId}
+            </if>
+            AND EXISTS( SELECT
             1
             FROM
                 exam_task et
@@ -150,6 +157,9 @@
             <if test="examId != null">
                 and et.exam_id = #{examId}
             </if>
+            <if test="openCollegeId != null">
+                AND EXISTS (SELECT 1 FROM basic_course bc WHERE bc.id = et.course_id AND bc.teaching_room_id = #{openCollegeId})
+            </if>
             <if test="courseId != null">
                 and et.course_id = #{courseId}
             </if>
@@ -174,6 +184,9 @@
             <if test="courseId != null">
                 AND et.course_id = #{courseId}
             </if>
+            <if test="openCollegeId != null">
+                AND EXISTS (SELECT 1 FROM basic_course bc WHERE bc.id = et.course_id AND bc.teaching_room_id = #{openCollegeId})
+            </if>
         </where>
         order by et.paper_number
     </select>
@@ -213,6 +226,9 @@
             and mp.status = #{status}
                 AND be.semester_id = #{semesterId}
                 AND mp.exam_id = #{examId}
+            <if test="openCollegeId != null">
+                AND bc.teaching_room_id = #{openCollegeId}
+            </if>
             <if test="dpr != null">
                 <if test="dpr.requestUserId != null">
                     AND mp.user_id = #{dpr.requestUserId}
@@ -274,7 +290,7 @@
                     JOIN
                     basic_exam e ON a.exam_id = e.id
                     <where>
-                        bc.id = c.course_id
+                        AND bc.id = c.course_id
                         <if test="semesterId != null and semesterId != ''">
                             and e.semester_id = #{semesterId}
                         </if>
@@ -356,8 +372,11 @@
                 bc.code,
                 bc.name
             from basic_course bc
-            where
-                exists (select 1
+            <where>
+                <if test="openCollegeId != null">
+                    AND bc.teaching_room_id = #{openCollegeId}
+                </if>
+                AND exists (select 1
                 FROM
                 mark_user_group mug
                 LEFT JOIN
@@ -374,6 +393,7 @@
                     </if>
                 </where>)
                 order by bc.code
+            </where>
     </select>
     <select id="listPaperNumberForEntrance" resultType="java.lang.String">
         SELECT
@@ -389,6 +409,9 @@
             <if test="courseId != null">
                 and mg.course_id = #{courseId}
             </if>
+            <if test="openCollegeId != null">
+                AND EXISTS (SELECT 1 FROM basic_course bc WHERE bc.id = mg.course_id AND bc.teaching_room_id = #{openCollegeId})
+            </if>
             and mug.user_id = #{userId} and mg.task_count > 0
             <if test="status != null and status != ''">
                 and exists (select 1 from mark_paper mp where mp.exam_id = mg.exam_id and mp.paper_number = mg.paper_number and mp.status = #{status})
@@ -404,22 +427,27 @@
         FROM
         mark_paper mp
         LEFT JOIN basic_course bc ON mp.course_id = bc.id
-        where  mp.exam_id = #{examId}
-        <if test="dpr != null">
-            <if test="dpr.requestUserId != null">
-                AND mp.user_id = #{dpr.requestUserId}
-            </if>
-            <if test="dpr.courseUserId != null">
-                AND EXISTS( SELECT 1 FROM (select course_id from teach_course where exam_id = #{examId} and user_id =
-                #{dpr.courseUserId}) tc WHERE tc.course_id = mp.course_id)
+        <where>
+            AND mp.exam_id = #{examId}
+            <if test="openCollegeId != null">
+                AND bc.teaching_room_id = #{openCollegeId}
             </if>
-            <if test="dpr.orgIdSet != null and dpr.orgIdSet != '' and dpr.orgIdSet.size > 0">
-                AND bc.teaching_room_id IN
-                <foreach collection="dpr.orgIdSet" item="item" index="index" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
+            <if test="dpr != null">
+                <if test="dpr.requestUserId != null">
+                    AND mp.user_id = #{dpr.requestUserId}
+                </if>
+                <if test="dpr.courseUserId != null">
+                    AND EXISTS( SELECT 1 FROM (select course_id from teach_course where exam_id = #{examId} and user_id =
+                    #{dpr.courseUserId}) tc WHERE tc.course_id = mp.course_id)
+                </if>
+                <if test="dpr.orgIdSet != null and dpr.orgIdSet != '' and dpr.orgIdSet.size > 0">
+                    AND bc.teaching_room_id IN
+                    <foreach collection="dpr.orgIdSet" item="item" index="index" open="(" separator="," close=")">
+                        #{item}
+                    </foreach>
+                </if>
             </if>
-        </if>
+        </where>
     </select>
     <select id="listPaperNumberFromMarkPaper" resultType="java.lang.String">
         SELECT
@@ -428,6 +456,9 @@
         mark_paper mp
         LEFT JOIN basic_course bc ON mp.course_id = bc.id
         where mp.exam_id = #{examId}
+        <if test="openCollegeId != null">
+            AND bc.teaching_room_id = #{openCollegeId}
+        </if>
         <if test="courseId != null">
             AND mp.course_id = #{courseId}
         </if>
@@ -451,14 +482,17 @@
             bc.code,
             bc.name
         from basic_course bc
-            where
-                exists (select 1
+            <where>
+                <if test="openCollegeId != null">
+                    AND bc.teaching_room_id = #{openCollegeId}
+                </if>
+                and exists (select 1
                     FROM
                     exam_task a
                     LEFT JOIN
                     sys_user d ON a.create_id = d.id
                     <where>
-                        bc.id = a.course_id
+                        and bc.id = a.course_id
                         <if test="examId != null">
                             and a.exam_id = #{examId}
                         </if>
@@ -478,6 +512,7 @@
                         </if>
                     </where>
                     )
+            </where>
     </select>
     <select id="listCourseFromExamTaskByUserId" resultType="com.qmth.teachcloud.common.entity.BasicCourse">
         SELECT
@@ -493,7 +528,7 @@
         LEFT JOIN
         sys_user d ON a.user_id = d.id
         <where>
-            bc.id = a.course_id and a.status = 'SUBMIT' AND (a.review = 0 OR (a.review = 1 AND g.status = 'FINISH'))
+            AND bc.id = a.course_id and a.status = 'SUBMIT' AND (a.review = 0 OR (a.review = 1 AND g.status = 'FINISH'))
             <if test="examId != null">
                 and a.exam_id = #{examId}
             </if>
@@ -528,6 +563,9 @@
             <if test="courseId != null">
                 and a.course_id = #{courseId}
             </if>
+            <if test="openCollegeId != null">
+                AND EXISTS(SELECT 1 FROM basic_course bc WHERE bc.id = a.course_id AND bc.teaching_room_id = #{openCollegeId})
+            </if>
             <if test="dpr != null">
                 <if test="dpr.requestUserId != null">
                     AND a.create_id = #{dpr.requestUserId}
@@ -585,36 +623,40 @@
             bc.code,
             bc.name
         from basic_course bc
-            where
-            exists (select 1
-                    FROM
-                exam_task a
-                    LEFT JOIN
-                t_f_flow_approve g ON g.flow_id = a.flow_id
-                    LEFT JOIN
-                sys_user d ON a.create_id = d.id
             <where>
-                bc.id = a.course_id
-                and a.status = 'SUBMIT' and (a.flow_id is null or (a.flow_id is not null and g.status = 'FINISH'))
-                <if test="examId != null">
-                    and a.exam_id = #{examId}
+                <if test="openCollegeId != null">
+                    AND bc.teaching_room_id = #{openCollegeId}
                 </if>
-                <if test="dpr != null">
-                    <if test="dpr.requestUserId != null">
-                        AND a.create_id = #{dpr.requestUserId}
-                    </if>
-                    <if test="dpr.courseUserId != null">
-                        AND EXISTS( SELECT 1 FROM (select course_id from teach_course where exam_id = #{examId} and user_id = #{dpr.courseUserId}) tc WHERE tc.course_id = a.course_id)
+                and exists (select 1
+                        FROM
+                    exam_task a
+                        LEFT JOIN
+                    t_f_flow_approve g ON g.flow_id = a.flow_id
+                        LEFT JOIN
+                    sys_user d ON a.create_id = d.id
+                <where>
+                    and bc.id = a.course_id
+                    and a.status = 'SUBMIT' and (a.flow_id is null or (a.flow_id is not null and g.status = 'FINISH'))
+                    <if test="examId != null">
+                        and a.exam_id = #{examId}
                     </if>
-                    <if test="dpr.orgIdSet != null and dpr.orgIdSet != '' and dpr.orgIdSet.size > 0">
-                        AND d.org_id IN
-                        <foreach collection="dpr.orgIdSet" item="item" index="index" open="(" separator="," close=")">
-                            #{item}
-                        </foreach>
+                    <if test="dpr != null">
+                        <if test="dpr.requestUserId != null">
+                            AND a.create_id = #{dpr.requestUserId}
+                        </if>
+                        <if test="dpr.courseUserId != null">
+                            AND EXISTS( SELECT 1 FROM (select course_id from teach_course where exam_id = #{examId} and user_id = #{dpr.courseUserId}) tc WHERE tc.course_id = a.course_id)
+                        </if>
+                        <if test="dpr.orgIdSet != null and dpr.orgIdSet != '' and dpr.orgIdSet.size > 0">
+                            AND d.org_id IN
+                            <foreach collection="dpr.orgIdSet" item="item" index="index" open="(" separator="," close=")">
+                                #{item}
+                            </foreach>
+                        </if>
                     </if>
-                </if>
-            </where>
-            )
+                </where>
+                )
+        </where>
     </select>
     <select id="listPaperNumberForQuery" resultType="java.lang.String">
         SELECT
@@ -633,6 +675,9 @@
             <if test="courseId != null">
                 and a.course_id = #{courseId}
             </if>
+            <if test="openCollegeId != null">
+                AND EXISTS (SELECT 1 FROM basic_course bc WHERE bc.id = a.course_id AND bc.teaching_room_id = #{openCollegeId})
+            </if>
             <if test="dpr != null">
                 <if test="dpr.requestUserId != null">
                     AND a.create_id = #{dpr.requestUserId}
@@ -671,7 +716,7 @@
                 LEFT JOIN
                 sys_user su ON et.user_id = su.id
                 <where>
-                    bc.id = et.course_id
+                    AND bc.id = et.course_id
                     <if test="semesterId != null and semesterId != ''">
                         and bs.id = #{semesterId}
                     </if>
@@ -860,6 +905,9 @@
             AND mp.status = 'FINISH'
             AND mp.course_id = bc.id
         <if test="dpr != null">
+            <if test="openCollegeId != null">
+                AND bc.teaching_room_id = #{openCollegeId}
+            </if>
             <if test="dpr.requestUserId != null">
                 AND mp.user_id = #{dpr.requestUserId}
             </if>
@@ -904,6 +952,9 @@
         <if test="courseId != null">
             and bes.course_id = #{courseId}
         </if>
+        <if test="openCollegeId != null">
+            AND bc.teaching_room_id = #{openCollegeId}
+        </if>
         <if test="dpr != null">
             <if test="dpr.requestUserId != null">
                 AND bes.create_id = #{dpr.requestUserId}

distributed-print-business/src/main/resources/mapper/ExamTaskMapper.xml

@@ -138,6 +138,9 @@
                     </otherwise>
                 </choose>
             </if>
+            <if test="openCollegeId != null">
+                and bc.teaching_room_id = #{openCollegeId}
+            </if>
             <if test="courseId != null">
                 and a.course_id = #{courseId}
             </if>
@@ -236,7 +239,7 @@
         LEFT JOIN
             sys_org so ON bc.teaching_room_id = so.id
         <where>
-            a.enable = true
+            and a.enable = true
             <if test="schoolId != null">
                 and a.school_id = #{schoolId}
             </if>
@@ -252,6 +255,9 @@
             <if test="auditStatus != null">
                 and e.status = #{auditStatus}
             </if>
+            <if test="openCollegeId != null">
+                and bc.teaching_room_id = #{openCollegeId}
+            </if>
             <if test="courseId != null">
                 and a.course_id = #{courseId}
             </if>
@@ -333,6 +339,9 @@
             <if test="examId != null and examId != ''">
                 and be.id = #{examId}
             </if>
+            <if test="openCollegeId != null">
+                and bc.teaching_room_id = #{openCollegeId}
+            </if>
             <if test="courseId != null">
                 and a.course_id = #{courseId}
             </if>
@@ -400,7 +409,7 @@
         LEFT JOIN basic_exam be on a.school_id = be.school_id and a.exam_id = be.id
         LEFT JOIN basic_semester bs on be.school_id = bs.school_id and be.semester_id = bs.id
         <where>
-            a.enable = true and a.review = true and be.enable = true
+            and a.enable = true and a.review = true and be.enable = true
             and f.status = 'FINISH'
             and EXISTS (
             select * from(select
@@ -446,6 +455,9 @@
             <if test="examId != null and examId != ''">
                 and a.exam_id = #{examId}
             </if>
+            <if test="openCollegeId != null">
+                and bc.teaching_room_id = #{openCollegeId}
+            </if>
             <if test="courseId != null">
                 and a.course_id = #{courseId}
             </if>
@@ -499,8 +511,8 @@
         g.setup
         FROM
         exam_task a
-            LEFT JOIN
-            basic_course bc ON a.course_id = bc.id
+        LEFT JOIN
+        basic_course bc ON a.course_id = bc.id
         LEFT JOIN
         exam_task_detail b ON a.id = b.exam_task_id
         LEFT JOIN
@@ -525,6 +537,9 @@
             <if test="examId != null and examId != ''">
                 and a.exam_id = #{examId}
             </if>
+            <if test="openCollegeId != null">
+                and bc.teaching_room_id = #{openCollegeId}
+            </if>
             <if test="courseId != null">
                 and a.course_id = #{courseId}
             </if>

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

@@ -33,6 +33,7 @@ public class ConditionController {
 
     @Resource
     private ConditionService conditionService;
+
     @Resource
     private ObeConditionService obeConditionService;
 
@@ -41,111 +42,111 @@ public class ConditionController {
 
     @ApiOperation(value = "学期")
     @RequestMapping(value = "/list_semester", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = BasicSemester.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = BasicSemester.class) })
     public Result listSemester(@ApiParam(value = "启用/禁用") @RequestParam(required = false, defaultValue = "true") Boolean enable) {
         return ResultUtil.ok(conditionService.listSemester(enable));
     }
 
     @ApiOperation(value = "考试")
     @RequestMapping(value = "/list_exam", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = BasicExam.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = BasicExam.class) })
     public Result listExam(@ApiParam(value = "学期ID") @RequestParam(required = false) Long semesterId, @ApiParam(value = "考试类型") @RequestParam(required = false) ExamCategoryEnum category,
-                           @ApiParam(value = "启用/禁用") @RequestParam(required = false, defaultValue = "true") Boolean enable) {
+            @ApiParam(value = "启用/禁用") @RequestParam(required = false, defaultValue = "true") Boolean enable) {
         return ResultUtil.ok(conditionService.listExam(semesterId, category, enable));
     }
 
     @ApiOperation(value = "课程")
     @RequestMapping(value = "/list_course", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = BasicCourse.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = BasicCourse.class) })
     public Result listCourse(@ApiParam(value = "学期ID") @RequestParam(required = false) Long semesterId, @ApiParam(value = "考试ID") @RequestParam(required = false) Long examId,
-                             @ApiParam(value = "启用/禁用") @RequestParam(required = false) Boolean enable, @RequestParam(value = "printPlanId", required = false) List<String> printPlanId,
-                             @ApiParam(value = "开课学院ID") @RequestParam(required = false) Long openCollegeId) {
+            @ApiParam(value = "启用/禁用") @RequestParam(required = false) Boolean enable, @RequestParam(value = "printPlanId", required = false) List<String> printPlanId,
+            @ApiParam(value = "开课学院ID") @RequestParam(required = false) Long openCollegeId) {
         return ResultUtil.ok(conditionService.listCourse(semesterId, examId, enable, printPlanId, openCollegeId));
     }
 
     @ApiOperation(value = "试卷编号")
     @RequestMapping(value = "/list_paper_number", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = String.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = String.class) })
     public Result listPaperNumber(@ApiParam(value = "学期ID") @RequestParam(required = false) Long semesterId, @ApiParam(value = "考试ID") @RequestParam(required = false) Long examId,
-                                  @ApiParam(value = "课程代码") @RequestParam(required = false) Long courseId, @RequestParam(value = "printPlanId", required = false) List<String> printPlanId) {
-        return ResultUtil.ok(conditionService.listPaperNumber(semesterId, examId, courseId, printPlanId));
+            @ApiParam(value = "开课学院id") @RequestParam(required = false) Long openCollegeId,
+            @ApiParam(value = "课程代码") @RequestParam(required = false) Long courseId, @RequestParam(value = "printPlanId", required = false) List<String> printPlanId) {
+        return ResultUtil.ok(conditionService.listPaperNumber(semesterId, examId, openCollegeId, courseId, printPlanId));
     }
 
     @ApiOperation(value = "印刷计划")
     @RequestMapping(value = "/list_print_plan", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = PrintPlanBrief.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = PrintPlanBrief.class) })
     public Result listPrintPlan(@ApiParam(value = "学期ID") @RequestParam(required = false) Long semesterId, @ApiParam(value = "考试ID") @RequestParam(required = false) Long examId,
-                                @ApiParam(value = "source") @RequestParam(required = false) String source) {
+            @ApiParam(value = "source") @RequestParam(required = false) String source) {
         return ResultUtil.ok(conditionService.listPrintPlan(semesterId, examId, source));
     }
 
     @ApiOperation(value = "学院")
     @RequestMapping(value = "/list_college", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = SysOrg.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = SysOrg.class) })
     public Result listCollege() {
         return ResultUtil.ok(conditionService.listCollege());
     }
 
     @ApiOperation(value = "扫描-获取学期、考试列表")
     @RequestMapping(value = "/scan/semester/list", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Map.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = Map.class) })
     public Result scanSemesterList(@ApiParam(value = "启用/禁用") @RequestParam(required = false, defaultValue = "true") Boolean enable) {
         return ResultUtil.ok(scanConditionService.scanSemesterList(enable));
     }
 
     @ApiOperation(value = "扫描-获取课程、试卷编号列表")
     @RequestMapping(value = "/scan/course/list", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Map.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = Map.class) })
     public Result scanCourseList(@ApiParam(value = "考试ID", required = true) @RequestParam(value = "examId") Long examId) {
         return ResultUtil.ok(scanConditionService.scanCourseList(examId));
     }
 
     @ApiOperation(value = "扫描-获取校区、考场")
     @RequestMapping(value = "/scan/campus/list", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Map.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = Map.class) })
     public Result scanCampusList(@ApiParam(value = "考试ID", required = true) @RequestParam(value = "examId") Long examId,
-                                 @ApiParam(value = "课程代码") @RequestParam(value = "courseId", required = false) Long courseId, @ApiParam(value = "试卷编号") @RequestParam(value = "coursePaperId", required = false) String coursePaperId) {
+            @ApiParam(value = "课程代码") @RequestParam(value = "courseId", required = false) Long courseId, @ApiParam(value = "试卷编号") @RequestParam(value = "coursePaperId", required = false) String coursePaperId) {
         return ResultUtil.ok(scanConditionService.scanCampusList(examId, courseId, coursePaperId));
     }
 
     @ApiOperation(value = "教学班字典")
     @RequestMapping(value = "/list_basic_teach_clazz", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Map.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = Map.class) })
     public Result listBasicTeachClazz(@ApiParam(value = "考试ID", required = true) @RequestParam(value = "examId") String examId,
-                                      @ApiParam(value = "课程编号") @RequestParam(value = "courseCode", required = false) String courseCode,
-                                      @ApiParam(value = "名称") @RequestParam(value = "clazzName", required = false) String clazzName) {
+            @ApiParam(value = "课程编号") @RequestParam(value = "courseCode", required = false) String courseCode, @ApiParam(value = "名称") @RequestParam(value = "clazzName", required = false) String clazzName) {
         return ResultUtil.ok(
                 conditionService.listBasicTeachClazz(SystemConstant.convertIdToLong(examId), courseCode, clazzName));
     }
 
     @ApiOperation(value = "OBE-专业")
     @RequestMapping(value = "/list_professional", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "查询", response = Result.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "查询", response = Result.class) })
     public Result listProfessional() {
         return ResultUtil.ok(obeConditionService.listProfessional());
     }
 
     @ApiOperation(value = "OBE-培养方案")
     @RequestMapping(value = "/list_culture_program", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "查询", response = Result.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "查询", response = Result.class) })
     public Result listCultureProgram(@ApiParam(value = "专业ID") @RequestParam(value = "professionalId", required = false) Long professionalId) {
         return ResultUtil.ok(obeConditionService.listCultureProgram(professionalId));
     }
 
     @ApiOperation(value = "OBE-学期")
     @RequestMapping(value = "/list_outline_semester", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "查询", response = Result.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "查询", response = Result.class) })
     public Result listOutlineSemester(@ApiParam(value = "专业ID") @RequestParam(value = "professionalId", required = false) Long professionalId,
-                                      @ApiParam(value = "培养方案ID") @RequestParam(value = "cultureProgramId", required = false) Long cultureProgramId) {
+            @ApiParam(value = "培养方案ID") @RequestParam(value = "cultureProgramId", required = false) Long cultureProgramId) {
         return ResultUtil.ok(obeConditionService.listOutlineSemester(professionalId, cultureProgramId));
     }
 
     @ApiOperation(value = "OBE-课程")
     @RequestMapping(value = "/list_culture_program_course", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "查询", response = Result.class)})
+    @ApiResponses({ @ApiResponse(code = 200, message = "查询", response = Result.class) })
     public Result listCultureProgramCourse(@ApiParam(value = "专业ID") @RequestParam(value = "professionalId", required = false) Long professionalId,
-                                           @ApiParam(value = "培养方案ID") @RequestParam(value = "cultureProgramId", required = false) Long cultureProgramId,
-                                           @ApiParam(value = "学期id") @RequestParam(value = "semesterId", required = false) Long semesterId) {
+            @ApiParam(value = "培养方案ID") @RequestParam(value = "cultureProgramId", required = false) Long cultureProgramId,
+            @ApiParam(value = "学期id") @RequestParam(value = "semesterId", required = false) Long semesterId) {
         return ResultUtil.ok(obeConditionService.listCultureProgramCourse(professionalId, cultureProgramId, semesterId));
     }
 }

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

@@ -68,6 +68,7 @@ public class ExamTaskApplyController {
     @RequestMapping(value = "/apply_list", method = RequestMethod.POST)
     public Result taskApplyList(@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 = "courseId", required = false) Long courseId,
                                 @ApiParam(value = "试卷编号") @RequestParam(value = "paperNumber", required = false) String paperNumber,
                                 @ApiParam(value = "审核状态") @RequestParam(value = "auditStatus", required = false) String auditStatus,
@@ -82,7 +83,9 @@ public class ExamTaskApplyController {
         if (examId == null) {
             throw ExceptionResultEnum.EXAM_ID_IS_NULL.exception();
         }
-        return ResultUtil.ok(examTaskService.listTaskApply(semesterId, examId, auditStatus, courseId, paperNumber, startTime, endTime, userName, pageNumber, pageSize));
+        return ResultUtil.ok(
+                examTaskService.listTaskApply(semesterId, examId, auditStatus, openCollegeId, courseId, paperNumber,
+                        startTime, endTime, userName, pageNumber, pageSize));
     }
 
     /**

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

@@ -61,6 +61,7 @@ public class ExamTaskAuditController {
     @RequestMapping(value = "/review_list_unaudited", method = RequestMethod.POST)
     public Result taskReviewListUnaudited(@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 = "courseId", required = false) Long courseId,
                                           @ApiParam(value = "试卷编号") @RequestParam(value = "paperNumber", required = false) String paperNumber,
                                           @ApiParam(value = "命题老师ID") @RequestParam(value = "userId", required = false) Long userId,
@@ -76,13 +77,14 @@ public class ExamTaskAuditController {
         if (examId == null) {
             throw ExceptionResultEnum.EXAM_ID_IS_NULL.exception();
         }
-        return ResultUtil.ok(examTaskService.listTaskReviewUnaudited(semesterId, examId, courseId, paperNumber, userId, startTime, endTime, startCreateTime, endCreateTime, pageNumber, pageSize));
+        return ResultUtil.ok(examTaskService.listTaskReviewUnaudited(semesterId, examId, openCollegeId, courseId, paperNumber, userId, startTime, endTime, startCreateTime, endCreateTime, pageNumber, pageSize));
     }
 
     @ApiOperation(value = "入库审核-查询-已审核")
     @RequestMapping(value = "/review_list_audited", method = RequestMethod.POST)
     public Result taskReviewListAudited(@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 = "courseId", required = false) Long courseId,
                                         @ApiParam(value = "试卷编号") @RequestParam(value = "paperNumber", required = false) String paperNumber,
                                         @ApiParam(value = "命题老师ID") @RequestParam(value = "userId", required = false) Long userId,
@@ -95,7 +97,9 @@ public class ExamTaskAuditController {
         if (examId == null) {
             throw ExceptionResultEnum.EXAM_ID_IS_NULL.exception();
         }
-        return ResultUtil.ok(examTaskService.listTaskReviewAudited(semesterId, examId, courseId, paperNumber, userId, startTime, endTime, startCreateTime, endCreateTime, pageNumber, pageSize));
+        return ResultUtil.ok(
+                examTaskService.listTaskReviewAudited(semesterId, examId, openCollegeId, courseId, paperNumber, userId,
+                        startTime, endTime, startCreateTime, endCreateTime, pageNumber, pageSize));
     }
 
     /**
@@ -106,7 +110,7 @@ public class ExamTaskAuditController {
     @ApiOperation(value = "入库审核-查询-已审核数量")
     @RequestMapping(value = "/review_list_audited_count", method = RequestMethod.POST)
     public Result taskReviewListAuditedCount() {
-        int taskReviewAuditedCount = examTaskService.listTaskReviewAudited(null, null, null, null, null, null, null, null, null, SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE).getRecords().size();
+        int taskReviewAuditedCount = examTaskService.listTaskReviewAudited(null, null, null,null, null, null, null, null, null, null, SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE).getRecords().size();
         long paperCount = markPaperService.countByPropositionTeacherId(true);
         long gradeCount = gradeInitializeService.countByPropositionTeacherId(GradeAnalyzePaperStatusEnum.SETTING_GRADE_PAPER_PARAM, true);
         return ResultUtil.ok(taskReviewAuditedCount + paperCount + gradeCount);

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

@@ -58,8 +58,9 @@ public class ExamTaskController {
 
     @ApiOperation(value = "命题任务管理-分页查询")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
-    public Result list(@ApiParam(value = "学期ID") @RequestParam(required = false) String semesterId,
-                       @ApiParam(value = "考试ID") @RequestParam(required = false) String examId,
+    public Result list(@ApiParam(value = "学期ID") @RequestParam(required = false) Long semesterId,
+                       @ApiParam(value = "考试ID") @RequestParam(required = false) Long examId,
+                       @ApiParam(value = "开课学院id") @RequestParam(required = false) Long openCollegeId,
                        @ApiParam(value = "课程ID") @RequestParam(required = false) Long courseId,
                        @ApiParam(value = "试卷编号") @RequestParam(required = false) String paperNumber,
                        @ApiParam(value = "命题状态") @RequestParam(required = false) String status,
@@ -75,7 +76,8 @@ public class ExamTaskController {
         if (examId == null) {
             throw ExceptionResultEnum.EXAM_ID_IS_NULL.exception();
         }
-        return ResultUtil.ok(examTaskService.list(SystemConstant.convertIdToLong(semesterId), SystemConstant.convertIdToLong(examId), enable, status, courseId, paperNumber, startTime, endTime, userName, pageNumber, pageSize));
+        return ResultUtil.ok(
+                examTaskService.list(semesterId, examId, enable, status, openCollegeId, courseId, paperNumber, startTime, endTime, userName, pageNumber, pageSize));
     }
 
     /**

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

@@ -57,6 +57,7 @@ public class ExamTaskQueryController {
     @RequestMapping(value = "/paper_list", method = RequestMethod.POST)
     public Result taskPaperList(@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 = "courseId", required = false) Long courseId,
                                 @ApiParam(value = "试卷编号") @RequestParam(value = "paperNumber", required = false) String paperNumber,
                                 @ApiParam(value = "入库时间（开始）") @RequestParam(value = "startTime", required = false) Long startTime,
@@ -69,7 +70,9 @@ public class ExamTaskQueryController {
         if (examId == null) {
             throw ExceptionResultEnum.EXAM_ID_IS_NULL.exception();
         }
-        return ResultUtil.ok(examTaskService.listTaskPaper(semesterId, examId, courseId, paperNumber, startTime, endTime, pageNumber, pageSize));
+        return ResultUtil.ok(
+                examTaskService.listTaskPaper(semesterId, examId, openCollegeId, courseId, paperNumber, startTime,
+                        endTime, pageNumber, pageSize));
     }
 
     /**

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

@@ -90,7 +90,7 @@ public class WorkController {
     @RequestMapping(value = "/structure/task/ready", method = RequestMethod.POST)
     public Result list(@RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                        @RequestParam @Min(2) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        IPage<MarkSettingDto> markSettingDtoIPage = markPaperService.listPaperSetting(null, null, null, false, pageNumber, pageSize);
+        IPage<MarkSettingDto> markSettingDtoIPage = markPaperService.listPaperSetting(null, null,null, null, false, pageNumber, pageSize);
         for (MarkSettingDto record : markSettingDtoIPage.getRecords()) {
             ExamTaskDetail examTaskDetail = examTaskDetailService.findByExamIdAndCourseIdAndPaperNumber(record.getExamId(), record.getCourseId(), record.getPaperNumber());
             if (examTaskDetail != null) {

distributed-print/src/main/java/com/qmth/distributed/print/api/mark/MarkArchiveController.java

@@ -1,17 +1,5 @@
 package com.qmth.distributed.print.api.mark;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-
-import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.alibaba.fastjson.JSONObject;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.service.BasicExamService;
 import com.qmth.teachcloud.common.contant.SystemConstant;
@@ -25,11 +13,17 @@ import com.qmth.teachcloud.mark.bean.archivescore.ArchiveStudentQuery;
 import com.qmth.teachcloud.mark.bean.archivescore.ScoreReportVo;
 import com.qmth.teachcloud.mark.service.MarkPaperService;
 import com.qmth.teachcloud.mark.service.MarkStudentService;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * <p>
  * 成绩管理 前端控制器
@@ -43,9 +37,9 @@ import org.springframework.web.multipart.MultipartFile;
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_MARK + "/archive")
 public class MarkArchiveController {
 
-    @Autowired
+    @Resource
     private MarkPaperService markPaperService;
-    @Autowired
+    @Resource
     private MarkStudentService markStudentService;
     @Resource
     private BasicExamService basicExamService;

distributed-print/src/main/java/com/qmth/distributed/print/api/mark/MarkDocumentController.java

@@ -1,21 +1,10 @@
 package com.qmth.distributed.print.api.mark;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-
-import com.qmth.teachcloud.common.annotation.OperationLogDetail;
-import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-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 org.springframework.web.multipart.MultipartFile;
-
 import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.mark.bean.archivescore.ArchiveStudentQuery;
@@ -28,10 +17,18 @@ import com.qmth.teachcloud.mark.service.MarkDocumentService;
 import com.qmth.teachcloud.mark.service.MarkPaperService;
 import com.qmth.teachcloud.mark.service.MarkStudentService;
 import com.qmth.teachcloud.mark.service.ScanPackageService;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.springframework.validation.annotation.Validated;
+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 org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * <p>
@@ -43,7 +40,7 @@ import io.swagger.annotations.ApiParam;
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_MARK + "/archive/document")
 public class MarkDocumentController {
 
-    @Autowired
+    @Resource
     private MarkPaperService markPaperService;
     @Resource
     private MarkDocumentService markDocumentService;

distributed-print/src/main/java/com/qmth/distributed/print/api/mark/MarkEntranceController.java

@@ -44,6 +44,7 @@ public class MarkEntranceController {
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     public Result list(@ApiParam(value = "学期ID") @RequestParam(required = false) Long semesterId,
                        @ApiParam(value = "考试ID") @RequestParam(required = false) Long examId,
+                       @ApiParam(value = "开课学院id") @RequestParam(required = false) Long openCollegeId,
                        @ApiParam(value = "课程ID") @RequestParam(required = false) Long courseId,
                        @ApiParam(value = "试卷编号") @RequestParam(required = false) String paperNumber,
                        @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
@@ -54,8 +55,8 @@ public class MarkEntranceController {
         if (examId == null) {
             throw ExceptionResultEnum.EXAM_ID_IS_NULL.exception();
         }
-        IPage<MarkEntranceDto> markEntranceDtoIPage = markUserGroupService.listEntranceGroup(examId, courseId, paperNumber, pageNumber, pageSize);
+        IPage<MarkEntranceDto> markEntranceDtoIPage = markUserGroupService.listEntranceGroup(examId, openCollegeId,
+                courseId, paperNumber, pageNumber, pageSize);
         return ResultUtil.ok(markEntranceDtoIPage);
     }
-
 }

distributed-print/src/main/java/com/qmth/distributed/print/api/mark/MarkSettingController.java

@@ -70,6 +70,7 @@ public class MarkSettingController {
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     public Result list(@ApiParam(value = "学期ID") @RequestParam(required = false) Long semesterId,
                        @ApiParam(value = "考试ID") @RequestParam(required = false) Long examId,
+                       @ApiParam(value = "开课学院id") @RequestParam(required = false) Long openCollegeId,
                        @ApiParam(value = "课程Id") @RequestParam(required = false) Long courseId,
                        @ApiParam(value = "试卷编号") @RequestParam(required = false) String paperNumber,
                        @ApiParam(value = "提交状态") @RequestParam(required = false) Boolean groupStatus,
@@ -80,7 +81,7 @@ public class MarkSettingController {
         if (examId == null) {
             throw ExceptionResultEnum.EXAM_ID_IS_NULL.exception();
         }
-        IPage<MarkSettingDto> markSettingDtoIPage = markPaperService.listPaperSetting(examId, courseId, paperNumber,
+        IPage<MarkSettingDto> markSettingDtoIPage = markPaperService.listPaperSetting(examId, openCollegeId, courseId, paperNumber,
                 groupStatus, pageNumber, pageSize);
         for (MarkSettingDto record : markSettingDtoIPage.getRecords()) {
             ExamTaskDetail examTaskDetail = examTaskDetailService.findByExamIdAndCourseIdAndPaperNumber(record.getExamId(), record.getCourseId(), record.getPaperNumber());
@@ -132,6 +133,7 @@ public class MarkSettingController {
     @RequestMapping(value = "/summary", method = RequestMethod.POST)
     public Result summary(@ApiParam(value = "学期ID") @RequestParam(required = false) Long semesterId,
                           @ApiParam(value = "考试ID") @RequestParam(required = false) Long examId,
+                          @ApiParam(value = "开课学院id") @RequestParam(required = false) Long openCollegeId,
                           @ApiParam(value = "课程ID") @RequestParam(required = false) Long courseId,
                           @ApiParam(value = "试卷编号") @RequestParam(required = false) String paperNumber,
                           @ApiParam(value = "完成进度") @RequestParam(required = false) Boolean progressStatus,
@@ -143,8 +145,8 @@ public class MarkSettingController {
         if (examId == null) {
             throw ExceptionResultEnum.EXAM_ID_IS_NULL.exception();
         }
-        IPage<MarkManageDto> markManageDtoIPage = markTaskService.listPaperManage(examId, courseId, paperNumber,
-                progressStatus, pageNumber, pageSize);
+        IPage<MarkManageDto> markManageDtoIPage = markTaskService.listPaperManage(examId, openCollegeId, courseId,
+                paperNumber, progressStatus, pageNumber, pageSize);
         return ResultUtil.ok(markManageDtoIPage);
     }
 
@@ -171,6 +173,7 @@ public class MarkSettingController {
     @RequestMapping(value = "/scoreList", method = RequestMethod.POST)
     public Result scoreList(@ApiParam(value = "学期ID") @RequestParam(required = false) Long semesterId,
                             @ApiParam(value = "考试ID") @RequestParam(required = false) Long examId,
+                            @ApiParam(value = "开课学院id") @RequestParam(required = false) Long openCollegeId,
                             @ApiParam(value = "课程ID") @RequestParam(required = false) Long courseId,
                             @ApiParam(value = "试卷编号") @RequestParam(required = false) String paperNumber,
                             @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
@@ -182,8 +185,8 @@ public class MarkSettingController {
         if (examId == null) {
             throw ExceptionResultEnum.EXAM_ID_IS_NULL.exception();
         }
-        IPage<CheckScoreListDto> scoreListDtoIPage = markPaperService.listStudentScoreList(examId, courseId,
-                paperNumber, pageNumber, pageSize);
+        IPage<CheckScoreListDto> scoreListDtoIPage = markPaperService.listStudentScoreList(examId, openCollegeId,
+                courseId, paperNumber, pageNumber, pageSize);
         return ResultUtil.ok(scoreListDtoIPage);
     }
 

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/bean/archivescore/ArchiveScoreQuery.java

@@ -2,14 +2,29 @@ package com.qmth.teachcloud.mark.bean.archivescore;
 
 import javax.validation.constraints.NotNull;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.teachcloud.mark.utils.PagerQuery;
+import io.swagger.annotations.ApiModelProperty;
 
 public class ArchiveScoreQuery extends PagerQuery {
+
 	@NotNull(message = "请选择学期")
+	@ApiModelProperty("学期id")
+	@JsonSerialize(using = ToStringSerializer.class)
 	private Long semesterId;
+
 	@NotNull(message = "请选择考试")
+	@ApiModelProperty("考试id")
+	@JsonSerialize(using = ToStringSerializer.class)
 	private Long examId;
-	
+
+	@ApiModelProperty("开课学院id")
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Long openCollegeId;
+
+	@ApiModelProperty("课程id")
+	@JsonSerialize(using = ToStringSerializer.class)
 	private Long courseId;
 
 	public Long getSemesterId() {
@@ -28,6 +43,14 @@ public class ArchiveScoreQuery extends PagerQuery {
 		this.examId = examId;
 	}
 
+	public Long getOpenCollegeId() {
+		return openCollegeId;
+	}
+
+	public void setOpenCollegeId(Long openCollegeId) {
+		this.openCollegeId = openCollegeId;
+	}
+
 	public Long getCourseId() {
 		return courseId;
 	}
@@ -35,4 +58,4 @@ public class ArchiveScoreQuery extends PagerQuery {
 	public void setCourseId(Long courseId) {
 		this.courseId = courseId;
 	}
-}
+}

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/bean/document/ArchivePaperQuery.java

@@ -2,14 +2,29 @@ package com.qmth.teachcloud.mark.bean.document;
 
 import javax.validation.constraints.NotNull;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.teachcloud.mark.utils.PagerQuery;
+import io.swagger.annotations.ApiModelProperty;
 
 public class ArchivePaperQuery extends PagerQuery {
+
 	@NotNull(message = "请选择学期")
+	@ApiModelProperty("学期id")
+	@JsonSerialize(using = ToStringSerializer.class)
 	private Long semesterId;
+
 	@NotNull(message = "请选择考试")
+	@ApiModelProperty("考试id")
+	@JsonSerialize(using = ToStringSerializer.class)
 	private Long examId;
-	
+
+	@ApiModelProperty("开课学院id")
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Long openCollegeId;
+
+	@ApiModelProperty("课程id")
+	@JsonSerialize(using = ToStringSerializer.class)
 	private Long courseId;
 
 	public Long getSemesterId() {
@@ -28,6 +43,14 @@ public class ArchivePaperQuery extends PagerQuery {
 		this.examId = examId;
 	}
 
+	public Long getOpenCollegeId() {
+		return openCollegeId;
+	}
+
+	public void setOpenCollegeId(Long openCollegeId) {
+		this.openCollegeId = openCollegeId;
+	}
+
 	public Long getCourseId() {
 		return courseId;
 	}

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/mapper/MarkPaperMapper.java

@@ -27,11 +27,11 @@ import com.qmth.teachcloud.mark.entity.MarkPaper;
  */
 public interface MarkPaperMapper extends BaseMapper<MarkPaper> {
 
-    IPage<MarkSettingDto> listPaperSetting(@Param("page") Page<MarkSettingDto> page, @Param("schoolId") Long schoolId, @Param("examId") Long examId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("groupStatus") Boolean groupStatus, @Param("dpr") DataPermissionRule dpr);
+    IPage<MarkSettingDto> listPaperSetting(@Param("page") Page<MarkSettingDto> page, @Param("schoolId") Long schoolId, @Param("examId") Long examId, @Param("openCollegeId") Long openCollegeId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("groupStatus") Boolean groupStatus, @Param("dpr") DataPermissionRule dpr);
 
     List<MarkPaper> listQualityMarkPaperByStatus(@Param("status") String status, @Param("uploadCount") int uploadCount);
 
-    IPage<CheckScoreListDto> listStudentScoreList(@Param("page") Page<CheckScoreListDto> page, @Param("examId") Long examId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("dpr") DataPermissionRule dpr);
+    IPage<CheckScoreListDto> listStudentScoreList(@Param("page") Page<CheckScoreListDto> page, @Param("examId") Long examId, @Param("openCollegeId") Long openCollegeId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("dpr") DataPermissionRule dpr);
 
     IPage<MarkPaperPackageDto> listPackage(@Param("page") Page<MarkPaperPackageDto> page, @Param("examId") Long examId, @Param("coursePaperId") String coursePaperId, @Param("packageCode") String packageCode);
 

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/mapper/MarkTaskMapper.java

@@ -23,7 +23,7 @@ import com.qmth.teachcloud.mark.entity.MarkTask;
  */
 public interface MarkTaskMapper extends BaseMapper<MarkTask> {
 
-    IPage<MarkManageDto> listPaperManage(@Param("page") Page<MarkManageDto> page, @Param("examId") Long examId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("progressStatus") Boolean progressStatus, @Param("dpr") DataPermissionRule dpr);
+    IPage<MarkManageDto> listPaperManage(@Param("page") Page<MarkManageDto> page, @Param("examId") Long examId, @Param("openCollegeId") Long openCollegeId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("progressStatus") Boolean progressStatus, @Param("dpr") DataPermissionRule dpr);
 
     List<MarkerInfoDto> listUserMarkedCount(@Param("examId") Long examId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber);
 

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/mapper/MarkUserGroupMapper.java

@@ -22,7 +22,7 @@ import java.util.List;
  */
 public interface MarkUserGroupMapper extends BaseMapper<MarkUserGroup> {
 
-    IPage<MarkEntranceDto> listEntranceGroup(@Param("page") Page<MarkUserGroup> page, @Param("examId") Long examId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("userId") Long userId, @Param("status") String status);
+    IPage<MarkEntranceDto> listEntranceGroup(@Param("page") Page<MarkUserGroup> page, @Param("examId") Long examId, @Param("openCollegeId") Long openCollegeId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("userId") Long userId, @Param("status") String status);
 
     List<MarkUser> listGroupUserByExamIdAndPaperNumberAndGroupNumber(@Param("examId") Long examId, @Param("paperNumber") String paperNumber, @Param("groupNumber") Integer groupNumber, @Param("className") String className);
 

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/MarkPaperService.java

@@ -28,7 +28,7 @@ import java.util.List;
  */
 public interface MarkPaperService extends IService<MarkPaper> {
 
-    IPage<MarkSettingDto> listPaperSetting(Long examId, Long courseId, String paperNumber, Boolean groupStatus, Integer pageNumber, Integer pageSize);
+    IPage<MarkSettingDto> listPaperSetting(Long examId, Long openCollegeId, Long courseId, String paperNumber, Boolean groupStatus, Integer pageNumber, Integer pageSize);
 
     MarkPaper getByExamIdAndPaperNumber(Long examId, String paperNumber);
 
@@ -56,7 +56,7 @@ public interface MarkPaperService extends IService<MarkPaper> {
 
     int getPaperNumberCount(Long id, Long courseId, String coursePaperId, MarkPaperStatus status, DataPermissionRule dpr);
 
-    IPage<CheckScoreListDto> listStudentScoreList(Long examId, Long courseId, String paperNumber, Integer pageNumber,
+    IPage<CheckScoreListDto> listStudentScoreList(Long examId, Long openCollegeId, Long courseId, String paperNumber, Integer pageNumber,
                                                   Integer pageSize);
 
     void updateStatus(Long examId, String paperNumber, MarkPaperStatus newStatus, MarkPaperStatus currentStatus);

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/MarkTaskService.java

@@ -21,7 +21,7 @@ import com.qmth.teachcloud.mark.enums.MarkTaskStatus;
  */
 public interface MarkTaskService extends IService<MarkTask> {
 
-    IPage<MarkManageDto> listPaperManage(Long examId, Long courseId, String paperNumber, Boolean progressStatus, Integer pageNumber, Integer pageSize);
+    IPage<MarkManageDto> listPaperManage(Long examId, Long openCollegeId, Long courseId, String paperNumber, Boolean progressStatus, Integer pageNumber, Integer pageSize);
 
     void exportMarker(Long examId, Long courseId, String paperNumber, HttpServletResponse response);
 

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/MarkUserGroupService.java

@@ -22,7 +22,7 @@ import java.util.List;
  */
 public interface MarkUserGroupService extends IService<MarkUserGroup> {
 
-    IPage<MarkEntranceDto> listEntranceGroup(Long examId, Long courseCode, String paperNumber, Integer pageNumber, Integer pageSize);
+    IPage<MarkEntranceDto> listEntranceGroup(Long examId,Long openCollegeId, Long courseCode, String paperNumber, Integer pageNumber, Integer pageSize);
 
     List<MarkUser> listGroupUserByExamIdAndPaperNumberAndGroupNumberAndClassName(Long examId, String paperNumber, Integer number, String className);
 

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkPaperServiceImpl.java

@@ -81,11 +81,11 @@ public class MarkPaperServiceImpl extends ServiceImpl<MarkPaperMapper, MarkPaper
 
 
     @Override
-    public IPage<MarkSettingDto> listPaperSetting(Long examId, Long courseId, String paperNumber, Boolean groupStatus, Integer pageNumber, Integer pageSize) {
+    public IPage<MarkSettingDto> listPaperSetting(Long examId, Long openCollegeId, Long courseId, String paperNumber, Boolean groupStatus, Integer pageNumber, Integer pageSize) {
         Page<MarkSettingDto> page = new Page<>(pageNumber, pageSize);
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(sysUser.getSchoolId(), sysUser.getId(), "/api/admin/mark/setting/list");
-        IPage<MarkSettingDto> markSettingDtoIPage = this.baseMapper.listPaperSetting(page, sysUser.getSchoolId(), examId, courseId, paperNumber, groupStatus, dpr);
+        IPage<MarkSettingDto> markSettingDtoIPage = this.baseMapper.listPaperSetting(page, sysUser.getSchoolId(), examId, openCollegeId, courseId, paperNumber, groupStatus, dpr);
         for (MarkSettingDto record : markSettingDtoIPage.getRecords()) {
             if (Objects.nonNull(record.getMarkMode())) {
                 record.setMarkModeDisplay(record.getMarkMode().getName());
@@ -327,11 +327,11 @@ public class MarkPaperServiceImpl extends ServiceImpl<MarkPaperMapper, MarkPaper
     }
 
     @Override
-    public IPage<CheckScoreListDto> listStudentScoreList(Long examId, Long courseId, String paperNumber, Integer pageNumber, Integer pageSize) {
+    public IPage<CheckScoreListDto> listStudentScoreList(Long examId, Long openCollegeId, Long courseId, String paperNumber, Integer pageNumber, Integer pageSize) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Page<CheckScoreListDto> page = new Page<>(pageNumber, pageSize);
         DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(sysUser.getSchoolId(), sysUser.getId(), ServletUtil.getRequest().getServletPath());
-        return this.baseMapper.listStudentScoreList(page, examId, courseId, paperNumber, dpr);
+        return this.baseMapper.listStudentScoreList(page, examId, openCollegeId, courseId, paperNumber, dpr);
     }
 
     @Override
@@ -475,8 +475,7 @@ public class MarkPaperServiceImpl extends ServiceImpl<MarkPaperMapper, MarkPaper
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Page<ArchiveScoreVo> page = new Page<>(query.getPageNumber(), query.getPageSize());
         DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(sysUser.getSchoolId(), sysUser.getId(), ServletUtil.getRequest().getServletPath());
-        IPage<ArchivePaperVo> ret = this.baseMapper.documentList(page, query, dpr);
-        return ret;
+        return this.baseMapper.documentList(page, query, dpr);
     }
 
     @Override

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkTaskServiceImpl.java

@@ -49,11 +49,12 @@ public class MarkTaskServiceImpl extends ServiceImpl<MarkTaskMapper, MarkTask> i
     private BasicRoleDataPermissionService basicRoleDataPermissionService;
 
     @Override
-    public IPage<MarkManageDto> listPaperManage(Long examId, Long courseId, String paperNumber, Boolean progressStatus, Integer pageNumber, Integer pageSize) {
+    public IPage<MarkManageDto> listPaperManage(Long examId, Long openCollegeId, Long courseId, String paperNumber, Boolean progressStatus, Integer pageNumber, Integer pageSize) {
         Page<MarkManageDto> page = new Page<>(pageNumber, pageSize);
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(sysUser.getSchoolId(), sysUser.getId(), ServletUtil.getRequest().getServletPath());
-        IPage<MarkManageDto> markManageDtoIPage = this.baseMapper.listPaperManage(page, examId, courseId, paperNumber, progressStatus, dpr);
+        IPage<MarkManageDto> markManageDtoIPage = this.baseMapper.listPaperManage(page, examId, openCollegeId, courseId,
+                paperNumber, progressStatus, dpr);
         for (MarkManageDto record : markManageDtoIPage.getRecords()) {
             record.setStatusDisplay(record.getStatus() == null ? null : record.getStatus().getName());
             record.setPercent(Calculator.divide2String(Calculator.multiply(record.getMarkedCount(), 100), Double.valueOf(record.getTotalCount()), 2));

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkUserGroupServiceImpl.java

@@ -68,15 +68,15 @@ public class MarkUserGroupServiceImpl extends ServiceImpl<MarkUserGroupMapper, M
     private LockService lockService;
 
     @Override
-    public IPage<MarkEntranceDto> listEntranceGroup(Long examId, Long courseId, String paperNumber, Integer pageNumber, Integer pageSize) {
+    public IPage<MarkEntranceDto> listEntranceGroup(Long examId, Long openCollegeId, Long courseId, String paperNumber, Integer pageNumber, Integer pageSize) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Page<MarkUserGroup> page = new Page<>(pageNumber, pageSize);
-        IPage<MarkEntranceDto> markEntranceDtoIPage = this.baseMapper.listEntranceGroup(page, examId, courseId, paperNumber, sysUser.getId(), MarkPaperStatus.FORMAL.name());
+        IPage<MarkEntranceDto> markEntranceDtoIPage = this.baseMapper.listEntranceGroup(page, examId, openCollegeId, courseId, paperNumber, sysUser.getId(), MarkPaperStatus.FORMAL.name());
         for (MarkEntranceDto record : markEntranceDtoIPage.getRecords()) {
             int taskCount = record.getTaskCount();
             int markedCount = record.getMarkedCount();
             MarkPaper markPaper = markPaperService.getByExamIdAndPaperNumber(examId, record.getPaperNumber());
-            if (markPaper != null && markPaper.getOpenMarkClass() != null && markPaper.getOpenMarkClass().booleanValue()) {
+            if (markPaper != null && markPaper.getOpenMarkClass() != null && markPaper.getOpenMarkClass()) {
                 List<MarkUserClass> markUserClassList = markUserClassService.listByExamIdAndPaperNumberAndUserId(examId, record.getPaperNumber(), sysUser.getId());
                 List<String> classNames = null;
                 if (CollectionUtils.isNotEmpty(markUserClassList)) {

teachcloud-mark/src/main/resources/mapper/MarkPaperMapper.xml

@@ -55,6 +55,9 @@
             <if test="examId != null">
                 and mp.exam_id = #{examId}
             </if>
+            <if test="openCollegeId != null">
+                and bc.teaching_room_id = #{openCollegeId}
+            </if>
             <if test="courseId != null">
                 and mp.course_id = #{courseId}
             </if>
@@ -127,6 +130,9 @@
         </if>) bes on ms.basic_student_id = bes.id
         group by exam_id, paper_number) c ON mp.exam_id = c.exam_id and mp.paper_number = c.paper_number
         where mp.exam_id = #{examId}
+        <if test="openCollegeId != null">
+            and bc.teaching_room_id = #{openCollegeId}
+        </if>
         <if test="courseId != null">
             AND mp.course_id = #{courseId}
         </if>
@@ -178,6 +184,9 @@
         left join sys_org so on bc.teaching_room_id = so.id
         WHERE
         t.exam_id = #{req.examId}
+        <if test="req.openCollegeId != null">
+            AND bc.teaching_room_id = #{req.openCollegeId}
+        </if>
         <if test="req.courseId != null">
             AND t.course_id = #{req.courseId}
         </if>
@@ -273,6 +282,9 @@
             left join sys_org so on bc.teaching_room_id = so.id
         WHERE
         t.exam_id = #{req.examId}
+        <if test="req.openCollegeId != null">
+            AND bc.teaching_room_id = #{req.openCollegeId}
+        </if>
         <if test="req.courseId != null">
             AND t.course_id = #{req.courseId}
         </if>

teachcloud-mark/src/main/resources/mapper/MarkTaskMapper.xml

@@ -56,7 +56,10 @@
             left join basic_course bc on mp.course_id = bc.id
             left join sys_org so on bc.teaching_room_id = so.id
         <where>
-            mp.exam_id = #{examId}
+            and mp.exam_id = #{examId}
+            <if test="openCollegeId != null">
+                and bc.teaching_room_id = #{openCollegeId}
+            </if>
             <if test="courseId != null">
                 and mp.course_id = #{courseId}
             </if>

teachcloud-mark/src/main/resources/mapper/MarkUserGroupMapper.xml

@@ -41,7 +41,10 @@
                 LEFT JOIN
             sys_org so ON bc.teaching_room_id = so.id
         <where>
-            mg.exam_id = #{examId}
+            and mg.exam_id = #{examId}
+            <if test="openCollegeId != null">
+                and bc.teaching_room_id = #{openCollegeId}
+            </if>
             <if test="courseId != null">
                 and mg.course_id = #{courseId}
             </if>