3.4.2 update

distributed-print/install/mysql/init/teachcloud_db.sql

@@ -187,7 +187,7 @@ CREATE TABLE IF NOT EXISTS `basic_exam_student` (
   `course_id` bigint DEFAULT NULL COMMENT '课程ID（basic_course表ID）',
   `course_code` varchar(20) DEFAULT NULL COMMENT '课程编号',
   `clazz_id` bigint DEFAULT NULL COMMENT '教学班id（basic_teach_clazz）',
-  `paper_number` varchar(30) DEFAULT NULL COMMENT '试卷编号',
+  `paper_number` varchar(100) DEFAULT NULL COMMENT '试卷编号',
   `paper_type` varchar(10) DEFAULT NULL COMMENT '卷型',
   `student_name` varchar(50) NOT NULL COMMENT '姓名',
   `student_code` varchar(50) NOT NULL COMMENT '学号',
@@ -243,7 +243,7 @@ CREATE TABLE IF NOT EXISTS `basic_message` (
   `user_id` bigint NOT NULL COMMENT '消息接收人用户',
   `user_name` varchar(100) DEFAULT NULL COMMENT '用户名称',
   `mobile_number` varchar(11) DEFAULT NULL COMMENT '电话号码',
-  `paper_number` varchar(50) DEFAULT NULL COMMENT '试卷编号',
+  `paper_number` varchar(100) DEFAULT NULL COMMENT '试卷编号',
   `course_code` varchar(50) DEFAULT NULL COMMENT '课程代码',
   `message_type` varchar(45) DEFAULT NULL COMMENT '消息类型',
   `business_operate` varchar(45) NOT NULL COMMENT '业务操作',
@@ -628,7 +628,7 @@ CREATE TABLE IF NOT EXISTS `client_status` (
   `course_id` bigint DEFAULT NULL COMMENT '课程ID（basic_course表ID）',
   `course_code` varchar(100) DEFAULT NULL COMMENT '课程代码',
   `course_name` varchar(200) DEFAULT NULL COMMENT '课程名称',
-  `paper_number` varchar(50) NOT NULL COMMENT '试卷编号',
+  `paper_number` varchar(100) NOT NULL COMMENT '试卷编号',
   `is_try` tinyint DEFAULT NULL COMMENT '是否打样：true-是，false-否',
   `try_time` bigint DEFAULT NULL COMMENT '打样时间',
   `is_pass` tinyint DEFAULT NULL COMMENT '是否合格：true-合格，false-不合格',
@@ -783,7 +783,7 @@ CREATE TABLE IF NOT EXISTS `exam_detail_course` (
   `course_id` bigint DEFAULT NULL COMMENT '课程ID（basic_course表ID）',
   `course_code` varchar(20) DEFAULT NULL COMMENT '课程编码',
   `course_name` varchar(50) DEFAULT NULL COMMENT '课程名称',
-  `paper_number` varchar(30) NOT NULL COMMENT '页数',
+  `paper_number` varchar(100) NOT NULL COMMENT '页数',
   `course_paper_id` varchar(45) DEFAULT NULL COMMENT '试卷编号（交互）',
   `total_subjects` int DEFAULT NULL COMMENT '总科次：考场总科次',
   `paper_pages_a3` int DEFAULT NULL COMMENT '试卷单科次准印量A3（页）',
@@ -878,7 +878,7 @@ CREATE TABLE IF NOT EXISTS `exam_paper_structure` (
   `exam_id` bigint NOT NULL COMMENT '考试id',
   `third_relate_id` bigint DEFAULT NULL COMMENT '云阅卷考试ID',
   `third_relate_name` varchar(255) DEFAULT NULL COMMENT '云阅卷考试名称',
-  `paper_number` varchar(50) NOT NULL COMMENT '试卷编号',
+  `paper_number` varchar(100) NOT NULL COMMENT '试卷编号',
   `course_code` varchar(50) DEFAULT NULL COMMENT '课程代码',
   `course_name` varchar(255) DEFAULT NULL COMMENT '课程名称',
   `sequence` varchar(5) DEFAULT NULL COMMENT '课程创建的任务序号（和exam_task保持一致）',
@@ -943,7 +943,7 @@ CREATE TABLE IF NOT EXISTS `exam_student` (
   `student_name` varchar(100) DEFAULT NULL COMMENT '考生姓名',
   `student_code` varchar(100) DEFAULT NULL COMMENT '考生代码',
   `exam_id` bigint DEFAULT NULL COMMENT '考试ID',
-  `paper_number` varchar(30) NOT NULL COMMENT '试卷编号',
+  `paper_number` varchar(100) NOT NULL COMMENT '试卷编号',
   `course_paper_id` varchar(45) DEFAULT NULL COMMENT '试卷编号（交互）',
   `ticket_number` varchar(30) DEFAULT NULL COMMENT '准考证号',
   `site_number` varchar(30) DEFAULT NULL COMMENT '座位号',
@@ -984,7 +984,7 @@ CREATE TABLE IF NOT EXISTS `exam_task` (
   `course_code` varchar(20) DEFAULT NULL COMMENT '课程代码',
   `course_name` varchar(50) DEFAULT NULL COMMENT '课程名称',
   `specialty` varchar(100) DEFAULT NULL COMMENT '适用专业',
-  `paper_number` varchar(30) NOT NULL COMMENT '试卷编号',
+  `paper_number` varchar(100) NOT NULL COMMENT '试卷编号',
   `open_ab` TINYINT(1) NULL DEFAULT 0 COMMENT '是否开启AB卷',
   `sequence` varchar(5) DEFAULT NULL COMMENT '课程创建的任务序号',
   `start_time` bigint DEFAULT NULL COMMENT '命题开始时间',
@@ -1117,7 +1117,7 @@ CREATE TABLE IF NOT EXISTS `exam_task_print` (
   `print_plan_id` bigint DEFAULT NULL COMMENT '印刷计划ID',
   `course_code` varchar(45) DEFAULT NULL COMMENT '课程代码',
   `course_name` varchar(50) DEFAULT NULL COMMENT '课程名称',
-  `paper_number` varchar(45) DEFAULT NULL COMMENT '试卷编号',
+  `paper_number` varchar(100) DEFAULT NULL COMMENT '试卷编号',
   `exam_start_time` bigint DEFAULT NULL COMMENT '考试开始时间',
   `exam_end_time` bigint DEFAULT NULL COMMENT '考试结束时间',
   `package_seq` varchar(30) DEFAULT NULL COMMENT '卷袋序号',
@@ -1164,7 +1164,7 @@ CREATE TABLE IF NOT EXISTS `exam_task_sync` (
   `school_id` bigint NOT NULL,
   `exam_id` bigint NOT NULL COMMENT '考试ID',
   `course_code` varchar(50) NOT NULL COMMENT '课程代码',
-  `paper_number` varchar(50) NOT NULL COMMENT '试着编号',
+  `paper_number` varchar(100) NOT NULL COMMENT '试着编号',
   `paper_type` varchar(50) DEFAULT NULL COMMENT '试卷类型',
   `total_paper_type` varchar(50) DEFAULT NULL COMMENT '所有卷型',
   `org_code` varchar(45) DEFAULT NULL COMMENT '机构代码',
@@ -1189,7 +1189,7 @@ CREATE TABLE IF NOT EXISTS `exam_task_temp` (
   `course_code` varchar(20) NOT NULL COMMENT '课程代码',
   `course_name` varchar(50) NOT NULL COMMENT '课程名称',
   `teaching_room_name` varchar(100) DEFAULT NULL COMMENT '开课学院',
-  `paper_number` varchar(30) DEFAULT NULL COMMENT '试卷编号',
+  `paper_number` varchar(100) DEFAULT NULL COMMENT '试卷编号',
   `specialty` varchar(100) DEFAULT NULL COMMENT '适用专业',
   `user_account` varchar(45) DEFAULT NULL COMMENT '命题老师账号',
   `user_name` varchar(45) DEFAULT NULL COMMENT '命题老师姓名',
@@ -1276,7 +1276,7 @@ CREATE TABLE IF NOT EXISTS `grade_batch_student` (
   `batch_id` bigint DEFAULT NULL COMMENT '分析-批次表ID',
   `course_code` varchar(50) DEFAULT NULL COMMENT '课程编码',
   `course_name` varchar(100) DEFAULT NULL COMMENT '课程名称',
-  `paper_number` varchar(50) DEFAULT NULL COMMENT '试卷编号',
+  `paper_number` varchar(100) DEFAULT NULL COMMENT '试卷编号',
   `paper_type` varchar(16) DEFAULT NULL COMMENT '试卷类型',
   `student_code` varchar(45) DEFAULT NULL COMMENT '学号',
   `student_name` varchar(100) DEFAULT NULL COMMENT '学生姓名',
@@ -1298,7 +1298,7 @@ CREATE TABLE IF NOT EXISTS `grade_batch_student_clazz` (
   `batch_id` bigint DEFAULT NULL COMMENT '分析-批次表ID',
   `course_code` varchar(50) DEFAULT NULL COMMENT '课程编码',
   `course_name` varchar(100) DEFAULT NULL COMMENT '课程名称',
-  `paper_number` varchar(50) DEFAULT NULL COMMENT '试卷编号',
+  `paper_number` varchar(100) DEFAULT NULL COMMENT '试卷编号',
   `paper_type` varchar(16) DEFAULT NULL COMMENT '试卷类型',
   `clazz_id` varchar(45) DEFAULT NULL COMMENT '班级ID',
   `clazz_name` varchar(100) DEFAULT NULL COMMENT '班级名称',
@@ -1466,7 +1466,7 @@ CREATE TABLE IF NOT EXISTS `mark_document` (
   `course_id` bigint DEFAULT NULL COMMENT '课程ID（basic_course表ID）',
   `course_code` varchar(32) DEFAULT NULL COMMENT '课程代码',
   `course_name` varchar(100) DEFAULT NULL COMMENT '科目名称',
-  `paper_number` varchar(64) DEFAULT NULL COMMENT '试卷编号',
+  `paper_number` varchar(100) DEFAULT NULL COMMENT '试卷编号',
   `type` varchar(64) NOT NULL COMMENT '类型',
   `name` varchar(64) DEFAULT NULL COMMENT '名称',
   `file_count` int DEFAULT NULL COMMENT '文件数量',
@@ -1503,7 +1503,7 @@ CREATE TABLE IF NOT EXISTS `mark_group_student` (
   `student_id` bigint NOT NULL COMMENT '考生ID',
   `group_number` int NOT NULL COMMENT '分组ID',
   `exam_id` bigint NOT NULL COMMENT '考试ID',
-  `paper_number` varchar(32) NOT NULL COMMENT '科目代码',
+  `paper_number` varchar(100) NOT NULL COMMENT '科目代码',
   `status` varchar(16) NOT NULL COMMENT '状态',
   PRIMARY KEY (`student_id`,`group_number`) USING BTREE,
   KEY `index1` (`exam_id`,`paper_number`,`group_number`,`status`) USING BTREE
@@ -1535,7 +1535,7 @@ CREATE TABLE IF NOT EXISTS `mark_header_subjective_score` (
 CREATE TABLE IF NOT EXISTS `mark_header_tag` (
   `id` bigint NOT NULL COMMENT '主键',
   `exam_id` bigint NOT NULL COMMENT '考试ID',
-  `paper_number` varchar(45) NOT NULL COMMENT '试卷编号',
+  `paper_number` varchar(100) NOT NULL COMMENT '试卷编号',
   `student_id` bigint NOT NULL COMMENT '考生ID',
   `group_number` int NOT NULL COMMENT '大题题号',
   `user_id` bigint NOT NULL COMMENT '用户ID',
@@ -1583,7 +1583,7 @@ CREATE TABLE IF NOT EXISTS `mark_paper` (
   `course_id` bigint DEFAULT NULL COMMENT '课程ID（basic_course表ID）',
   `course_code` varchar(32) DEFAULT NULL COMMENT '课程代码',
   `course_name` varchar(100) DEFAULT NULL COMMENT '科目名称',
-  `paper_number` varchar(64) DEFAULT NULL COMMENT '试卷编号',
+  `paper_number` varchar(100) DEFAULT NULL COMMENT '试卷编号',
   `course_paper_id` varchar(32) DEFAULT NULL COMMENT '试卷编号（交互）',
   `objective_score` double NOT NULL COMMENT '客观题满分',
   `subjective_score` double NOT NULL COMMENT '主观题满分',
@@ -1627,7 +1627,7 @@ CREATE TABLE IF NOT EXISTS `mark_paper_package` (
   `course_id` bigint DEFAULT NULL COMMENT '课程ID（basic_course表ID）',
   `course_code` varchar(32) DEFAULT NULL COMMENT '课程代码',
   `course_name` varchar(100) DEFAULT NULL COMMENT '科目名称',
-  `paper_number` varchar(50) DEFAULT NULL COMMENT '试卷编号',
+  `paper_number` varchar(100) DEFAULT NULL COMMENT '试卷编号',
   `course_paper_id` varchar(50) NOT NULL COMMENT '课程试卷号',
   `serial_number` INT(1) NULL COMMENT '备用卷序号',
   `paper_type` varchar(10) NOT NULL COMMENT '试卷类型',
@@ -1643,7 +1643,7 @@ CREATE TABLE IF NOT EXISTS `mark_paper_package` (
 CREATE TABLE IF NOT EXISTS `mark_problem_history` (
   `id` bigint NOT NULL COMMENT '自增主键',
   `exam_id` bigint NOT NULL COMMENT '考试ID',
-  `paper_number` varchar(32) NOT NULL COMMENT '试卷编号',
+  `paper_number` varchar(100) NOT NULL COMMENT '试卷编号',
   `group_number` int NOT NULL COMMENT '大题号',
   `student_code` varchar(64) NOT NULL COMMENT '学号',
   `secret_number` varchar(64) NOT NULL COMMENT '考生密号',
@@ -1698,7 +1698,7 @@ CREATE TABLE IF NOT EXISTS `mark_question` (
 CREATE TABLE IF NOT EXISTS `mark_question_answer` (
     `id` BIGINT(20) NOT NULL,
     `exam_id` BIGINT(20) NULL COMMENT '考试ID',
-    `paper_number` VARCHAR(50) NULL COMMENT '试卷编号',
+    `paper_number` VARCHAR(100) NULL COMMENT '试卷编号',
     `paper_type` VARCHAR(10) NULL COMMENT '卷型',
     `main_number` INT NULL COMMENT '大题号',
     `sub_number` INT NULL COMMENT '小题号',
@@ -1718,7 +1718,7 @@ CREATE TABLE IF NOT EXISTS `mark_question_answer` (
 CREATE TABLE IF NOT EXISTS `mark_reject_history`(
           `id` bigint NOT NULL,
           `exam_id` bigint NULL DEFAULT NULL COMMENT '考试ID',
-          `paper_number` varchar(45) NULL DEFAULT NULL COMMENT '试卷编号',
+          `paper_number` varchar(100) NULL DEFAULT NULL COMMENT '试卷编号',
           `group_number` int NULL DEFAULT NULL COMMENT '分组号',
           `task_id` bigint NULL DEFAULT NULL COMMENT '任务ID',
           `student_id` bigint NULL DEFAULT NULL COMMENT '考生ID',
@@ -2921,7 +2921,7 @@ INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (271, '列表', 'List', 'LIST', 13, 1, 'AUTH', '96', 1, 0, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (272, '查询', 'Select', 'BUTTON', 39, 1, 'AUTH', '63', 1, 0, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (273, '批量新增', 'BatchAdd', 'BUTTON', 39, 2, 'AUTH', '67', 1, 0, 1);
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (274, '新增', 'Add', 'BUTTON', 39, 3, 'AUTH', '66,169,441,442,445,482', 1, 0, 1);
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (274, '新增', 'Add', 'BUTTON', 39, 3, 'AUTH', '66,169,441,442,445,482,839', 1, 0, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (275, '预览', 'Preview', 'LINK', 39, 1, 'AUTH', '68', 0, 0, 0);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (277, '启用/禁用', 'Cancel', 'LINK', 39, 3, 'AUTH', '65', 1, 0, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (278, '查询条件', 'Condition', 'CONDITION', 39, 1, 'AUTH', '63', 1, 0, 1);
@@ -5444,7 +5444,7 @@ CREATE TABLE IF NOT EXISTS `t_b_sync_task` (
   `course_id` bigint DEFAULT NULL COMMENT '课程ID（basic_course表ID）',
   `course_code` varchar(50) DEFAULT NULL COMMENT '课程代码',
   `course_name` varchar(100) DEFAULT NULL COMMENT '课程名称',
-  `paper_number` varchar(45) DEFAULT NULL COMMENT '试卷编号',
+  `paper_number` varchar(100) DEFAULT NULL COMMENT '试卷编号',
   `paper_type` varchar(10) DEFAULT NULL COMMENT '试卷类型',
   `org_id` bigint DEFAULT NULL COMMENT '机构id',
   `type` varchar(50) NOT NULL COMMENT '推送类型，USER_PUSH：用户推送',
@@ -5474,7 +5474,7 @@ CREATE TABLE IF NOT EXISTS `t_b_task` (
   `course_id` bigint DEFAULT NULL COMMENT '课程ID',
   `course_code` varchar(50) DEFAULT NULL COMMENT '课程代码',
   `course_name` varchar(100) DEFAULT NULL COMMENT '课程名称',
-  `paper_number` varchar(45) DEFAULT NULL COMMENT '试卷编号',
+  `paper_number` varchar(100) DEFAULT NULL COMMENT '试卷编号',
   `type` varchar(50) NOT NULL COMMENT '任务类型，USER_IMPORT：用户导入，\nQUESTION_MISSION_BATCH_CREATE：批量新建命题任务，\nSAMPLE_EXPORT：导出审核样本，\nPAPER_DOWNLOAD：卷库下载，\nEXAMINATION_IMPORT：考务数据导入，\nEXAMINATION_EXPORT：考务数据导出，\nPRINT_PDF_DOWNLOAD：批量下载pdf，\nCREATE_PDF：生成pdf，\nCOURSE_IMPORT：课程导入',
   `entity_id` bigint DEFAULT NULL COMMENT '关联业务对象id',
   `status` varchar(30) NOT NULL COMMENT '任务状态，INIT：未开始，RUNNING：进行中，FINISH：已完成',
@@ -5962,7 +5962,7 @@ CREATE TABLE IF NOT EXISTS `t_sync_exam_student_score` (
   `exam_number` varchar(100) DEFAULT NULL COMMENT '准考证号',
   `student_code` varchar(100) DEFAULT NULL COMMENT '学号',
   `name` varchar(100) NOT NULL COMMENT '姓名',
-  `paper_number` varchar(45) DEFAULT NULL COMMENT '试卷编号',
+  `paper_number` varchar(100) DEFAULT NULL COMMENT '试卷编号',
   `subject_code` varchar(100) DEFAULT NULL COMMENT '科目代码',
   `subject_name` varchar(100) DEFAULT NULL COMMENT '科目名称',
   `paper_type` varchar(50) DEFAULT NULL COMMENT '试卷类型',

distributed-print/install/mysql/upgrade/3.4.1.sql

@@ -92,4 +92,6 @@ CREATE TABLE `t_s_job_log` (
                                `create_id` bigint NOT NULL COMMENT '创建人id',
                                `create_time` bigint NOT NULL COMMENT '创建时间',
                                PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='任务日志表';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='任务日志表';
+
+UPDATE `sys_privilege` SET `related` = '66,169,441,442,445,482,839' WHERE (`id` = '274');

distributed-print/install/mysql/upgrade/3.4.2.sql

@@ -118,3 +118,25 @@ WHERE id=2006;
 
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('882', '是否开启AB卷', 'OpenAb', 'BUTTON', '40', '13', 'AUTH', '1', '0', '1');
 
+ALTER TABLE `basic_exam_student` CHANGE COLUMN `paper_number` `paper_number` VARCHAR(100) NULL DEFAULT NULL COMMENT '试卷编号' ;
+ALTER TABLE `basic_message` CHANGE COLUMN `paper_number` `paper_number` VARCHAR(100) NULL DEFAULT NULL COMMENT '试卷编号' ;
+ALTER TABLE `client_status` CHANGE COLUMN `paper_number` `paper_number` VARCHAR(100) NOT NULL COMMENT '试卷编号' ;
+ALTER TABLE `exam_detail_course` CHANGE COLUMN `paper_number` `paper_number` VARCHAR(100) NOT NULL COMMENT '页数' ;
+ALTER TABLE `exam_student` CHANGE COLUMN `paper_number` `paper_number` VARCHAR(100) NOT NULL COMMENT '试卷编号' ;
+ALTER TABLE `exam_task` CHANGE COLUMN `paper_number` `paper_number` VARCHAR(100) NOT NULL COMMENT '试卷编号' ;
+ALTER TABLE `exam_task_print` CHANGE COLUMN `paper_number` `paper_number` VARCHAR(100) NULL DEFAULT NULL COMMENT '试卷编号' ;
+ALTER TABLE `exam_task_sync` CHANGE COLUMN `paper_number` `paper_number` VARCHAR(100) NOT NULL COMMENT '试着编号' ;
+ALTER TABLE `exam_task_temp` CHANGE COLUMN `paper_number` `paper_number` VARCHAR(100) NULL DEFAULT NULL COMMENT '试卷编号' ;
+ALTER TABLE `grade_batch_student` CHANGE COLUMN `paper_number` `paper_number` VARCHAR(100) NULL DEFAULT NULL COMMENT '试卷编号' ;
+ALTER TABLE `grade_batch_student_clazz` CHANGE COLUMN `paper_number` `paper_number` VARCHAR(100) NULL DEFAULT NULL COMMENT '试卷编号' ;
+ALTER TABLE `mark_document` CHANGE COLUMN `paper_number` `paper_number` VARCHAR(100) NULL DEFAULT NULL COMMENT '试卷编号' ;
+ALTER TABLE `mark_group_student` CHANGE COLUMN `paper_number` `paper_number` VARCHAR(100) NOT NULL COMMENT '科目代码' ;
+ALTER TABLE `mark_header_tag` CHANGE COLUMN `paper_number` `paper_number` VARCHAR(100) NOT NULL COMMENT '试卷编号' ;
+ALTER TABLE `mark_paper` CHANGE COLUMN `paper_number` `paper_number` VARCHAR(100) NULL DEFAULT NULL COMMENT '试卷编号' ;
+ALTER TABLE `mark_paper_package` CHANGE COLUMN `paper_number` `paper_number` VARCHAR(100) NULL DEFAULT NULL COMMENT '试卷编号' ;
+ALTER TABLE `mark_problem_history` CHANGE COLUMN `paper_number` `paper_number` VARCHAR(100) NOT NULL COMMENT '试卷编号' ;
+ALTER TABLE `mark_question_answer` CHANGE COLUMN `paper_number` `paper_number` VARCHAR(100) NULL DEFAULT NULL COMMENT '试卷编号' ;
+ALTER TABLE `mark_reject_history` CHANGE COLUMN `paper_number` `paper_number` VARCHAR(100) NULL DEFAULT NULL COMMENT '试卷编号' ;
+ALTER TABLE `t_b_sync_task` CHANGE COLUMN `paper_number` `paper_number` VARCHAR(100) NULL DEFAULT NULL COMMENT '试卷编号' ;
+ALTER TABLE `t_b_task` CHANGE COLUMN `paper_number` `paper_number` VARCHAR(100) NULL DEFAULT NULL COMMENT '试卷编号' ;
+ALTER TABLE `t_sync_exam_student_score` CHANGE COLUMN `paper_number` `paper_number` VARCHAR(100) NULL DEFAULT NULL COMMENT '试卷编号' ;

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

@@ -138,9 +138,10 @@ public class BasicCourseController {
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
     public Result findBasicCourseListByOrg(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
                                            @ApiParam(value = "所属机构id", required = true) @RequestParam String belongOrgId,
-                                           @ApiParam(value = "课程名称") @RequestParam(required = false) String courseName) {
+                                           @ApiParam(value = "课程名称") @RequestParam(required = false) String courseName,
+                                           @ApiParam(value = "是否过滤课程管理已加课程") @RequestParam(required = false, defaultValue = "false") Boolean filter) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        return ResultUtil.ok(basicCourseService.listByOrgId(SystemConstant.convertIdToLong(belongOrgId), SystemConstant.convertIdToLong(examId),courseName, sysUser));
+        return ResultUtil.ok(basicCourseService.listByOrgId(SystemConstant.convertIdToLong(belongOrgId), SystemConstant.convertIdToLong(examId),courseName, filter, sysUser));
     }
 }
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/BasicCourseService.java

@@ -87,7 +87,7 @@ public interface BasicCourseService extends IService<BasicCourse> {
      * @param requestUser 请求用户
      * @return 可选基础课程结果
      */
-    List<TeachCourseSelectResult> listByOrgId(Long orgId, Long examId, String courseName, SysUser requestUser);
+    List<TeachCourseSelectResult> listByOrgId(Long orgId, Long examId, String courseName, Boolean filter, SysUser requestUser);
 
     List<BasicCourse> listBySchoolIdAndCode(Long schoolId, String courseCode);
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicCourseServiceImpl.java

@@ -221,7 +221,7 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
     }
 
     @Override
-    public List<TeachCourseSelectResult> listByOrgId(Long orgId, Long examId, String courseName, SysUser requestUser) {
+    public List<TeachCourseSelectResult> listByOrgId(Long orgId, Long examId, String courseName, Boolean filter, SysUser requestUser) {
         List<Long> temp = new ArrayList<>();
         temp.add(orgId);
 
@@ -245,14 +245,26 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
             if (StringUtils.isNotBlank(courseName)) {
                 lambda.like(BasicCourse::getName, courseName);
             }
-            result = this.list(lambda).stream().filter(e -> !occupiedCourseCodeList.contains(e.getCode())).flatMap(e -> {
-                TeachCourseSelectResult teachCourseSelectResult = new TeachCourseSelectResult();
-                teachCourseSelectResult.setBasicCourseId(e.getId());
-                teachCourseSelectResult.setCourseName(e.getName());
-                teachCourseSelectResult.setCourseCode(e.getCode());
-                teachCourseSelectResult.setTeachCollegeName(collegeMap.get(e.getTeachingRoomId()));
-                return Stream.of(teachCourseSelectResult);
-            }).collect(Collectors.toList());
+            List<BasicCourse> basicCourses = this.list(lambda);
+            if (filter != null && filter) {
+                result = basicCourses.stream().filter(e -> !occupiedCourseCodeList.contains(e.getCode())).flatMap(e -> {
+                    TeachCourseSelectResult teachCourseSelectResult = new TeachCourseSelectResult();
+                    teachCourseSelectResult.setBasicCourseId(e.getId());
+                    teachCourseSelectResult.setCourseName(e.getName());
+                    teachCourseSelectResult.setCourseCode(e.getCode());
+                    teachCourseSelectResult.setTeachCollegeName(collegeMap.get(e.getTeachingRoomId()));
+                    return Stream.of(teachCourseSelectResult);
+                }).collect(Collectors.toList());
+            } else {
+                result = basicCourses.stream().flatMap(e -> {
+                    TeachCourseSelectResult teachCourseSelectResult = new TeachCourseSelectResult();
+                    teachCourseSelectResult.setBasicCourseId(e.getId());
+                    teachCourseSelectResult.setCourseName(e.getName());
+                    teachCourseSelectResult.setCourseCode(e.getCode());
+                    teachCourseSelectResult.setTeachCollegeName(collegeMap.get(e.getTeachingRoomId()));
+                    return Stream.of(teachCourseSelectResult);
+                }).collect(Collectors.toList());
+            }
         }
         return result;
     }