wangliang 2 лет назад
Родитель
Сommit
ffd1af8f2b

+ 5 - 3
distributed-print-business/src/main/resources/db/1、init-table.sql

@@ -425,7 +425,8 @@ CREATE TABLE `client_print_data` (
                                      `exam_detail_id` bigint DEFAULT NULL COMMENT '考场ID',
                                      `machine_code` varchar(45) DEFAULT NULL COMMENT '机器唯一码',
                                      `pages_a4` int DEFAULT NULL COMMENT 'A4页数量',
-                                     `pages_a3` int DEFAULT NULL COMMENT 'A3页数量',
+                                     `paper_pages` int DEFAULT NULL COMMENT '试卷数量',
+                                     `card_pages` int DEFAULT NULL COMMENT '题卡数量',
                                      `create_id` bigint DEFAULT NULL COMMENT '创建人',
                                      `create_time` bigint DEFAULT NULL COMMENT '创建时间',
                                      `update_id` bigint DEFAULT NULL COMMENT '更新人',
@@ -534,13 +535,14 @@ CREATE TABLE `exam_detail` (
                                `print_plan_name` varchar(100) DEFAULT NULL COMMENT '印刷计划名称',
                                `exam_start_time` bigint NOT NULL COMMENT '考试开始日期',
                                `exam_end_time` bigint NOT NULL COMMENT '考试结束日期',
-                               `exam_place` varchar(30) NOT NULL COMMENT '考场',
+                               `exam_place` varchar(30) DEFAULT NULL COMMENT '考场',
                                `total_subjects` int DEFAULT NULL COMMENT '总科次:考场总科次',
                                `exam_room` varchar(30) DEFAULT NULL COMMENT '教室',
                                `print_progress` double DEFAULT NULL COMMENT '打印进度',
                                `print_user` varchar(30) DEFAULT NULL COMMENT '打印员:一个考场只能被一个打印员认领',
                                `package_code` varchar(30) DEFAULT NULL COMMENT '考场代码:卷袋贴、签到表上条码',
-                               `pages_a3` int DEFAULT NULL COMMENT 'A3印量小计(页)',
+                               `paper_pages` int DEFAULT NULL COMMENT '试卷总计(张)',
+                               `card_pages` int DEFAULT NULL COMMENT '题卡总计(张)',
                                `pages_a4` int DEFAULT NULL COMMENT 'A4印量小计(页)',
                                `status` varchar(30) DEFAULT NULL COMMENT '状态:NEW: "新建",READY: "就绪",WAITING: "待印刷",PRINTING: "印刷中",FINISH: "已完成"',
                                `validate` tinyint(1) DEFAULT '0' COMMENT '是否校验:true-是,false-否',

+ 4 - 3
distributed-print-business/src/main/resources/db/2、init-table-data.sql

@@ -154,6 +154,7 @@ INSERT INTO `sys_privilege` VALUES (188, '学生明细', '/api/admin/exam/print/
 INSERT INTO `sys_privilege` VALUES (189, '修改', '/api/admin/exam/task/paper_update', 'URL', 42, 4, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` VALUES (190, '重新生成pdf', '/api/admin/data/task/reset_create_pdf', 'URL', 113, 2, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` VALUES (191, '批量下载试卷PDF、题卡', '/api/admin/exam/task/paper_card_download_pdf', 'URL', 42, 5, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (192, '预览', '/api/admin/basic/template/read_content', 'URL', 11, 6, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` VALUES (195, '获取服务器时间', '/api/admin/common/get_system_time', 'URL', 129, 2, 'NO_AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` VALUES (198, '数据同步', '/api/admin/exam/print/sync_data_cloud', 'URL', 47, 9, 'NO_AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` VALUES (199, '客户端', 'client', 'MENU', NULL, 10, NULL, '200,201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216', 1, 0, 0);
@@ -202,7 +203,7 @@ INSERT INTO `sys_privilege` VALUES (243, '批量导入', 'Export', 'BUTTON', 5,
 INSERT INTO `sys_privilege` VALUES (249, '查询', 'Select', 'BUTTON', 11, 1, 'AUTH', '123', 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (250, '添加模版', 'Add', 'BUTTON', 11, 2, 'AUTH', '124', 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (251, '预览', 'Preview', 'LINK', 11, 1, 'AUTH', '192', 1, 0, 1);
-INSERT INTO `sys_privilege` VALUES (252, '编辑', 'Edit', 'LINK', 11, 2, 'AUTH', '124', 1, 0, 1);
+INSERT INTO `sys_privilege` VALUES (252, '编辑', 'Edit', 'LINK', 11, 2, 'AUTH', '124,763', 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (253, '启用&禁用', 'Enable', 'LINK', 11, 3, 'AUTH', '125', 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (254, '查询条件', 'Condition', 'CONDITION', 11, 1, 'AUTH', '123', 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (255, '列表', 'List', 'LIST', 11, 1, 'AUTH', '123', 1, 0, 1);
@@ -538,7 +539,7 @@ INSERT INTO `sys_privilege` VALUES (610, '查询', 'Select', 'BUTTON', 609, 1, '
 INSERT INTO `sys_privilege` VALUES (611, '新增', 'Add', 'BUTTON', 609, 3, 'AUTH', '617', 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (612, '启用/禁用', 'Enable', 'LINK', 609, 4, 'AUTH', '618', 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (613, '删除', 'Delete', 'LINK', 609, 5, 'AUTH', '619', 1, 0, 1);
-INSERT INTO `sys_privilege` VALUES (614, '设置', 'Set', 'LINK', 609, 6, 'AUTH', '620,621,622,623,645,646', 1, 0, 1);
+INSERT INTO `sys_privilege` VALUES (614, '设置', 'Set', 'LINK', 609, 6, 'AUTH', '620,621,622,623,645,646,49', 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (615, '查询条件', 'Condition', 'CONDITION', 609, 2, 'AUTH', NULL, 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (616, '查询', '/api/admin/basic/exam/page', 'URL', 609, 1, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` VALUES (617, '新增/修改', '/api/admin/basic/exam/save', 'URL', 609, 2, 'AUTH', NULL, 1, 1, 1);
@@ -682,7 +683,7 @@ INSERT INTO `sys_privilege` VALUES (759, '考生对象查询', '/api/admin/exam/
 INSERT INTO `sys_privilege` VALUES (760, '增加考试对象', 'ExamTaskStudentObject', 'BUTTON', 40, 9, 'AUTH', '759', 1, 0, 1);
 INSERT INTO `sys_privilege` VALUES (761, '导入考生对象', '/api/admin/exam/task/exam_task_exam_student_import', 'URL', 40, 10, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` VALUES (762, '批量导入考生', 'ExamTaskStudentObjectImport', 'BUTTON', 40, 10, 'AUTH', '761', 1, 0, 1);
-INSERT INTO `sys_privilege` VALUES (763, '查询详情', '/api/admin/basic/template/get_one', 'URL', 10, 5, 'AUTH', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (763, '查询详情', '/api/admin/basic/template/get_one', 'URL', 11, 5, 'AUTH', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` VALUES (764, '复制', '/api/admin/exam/card/copy', 'URL', 175, 4, 'SYS', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` VALUES (765, '查询开课学院', '/api/admin/grade/batch/paper/find_teach_college', 'URL', 692, 7, 'SYS', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` VALUES (766, '查询条件', 'Condition', 'CONDITION', 470, 1, 'AUTH', '476', 1, 0, 1);