Browse Source

bug修改

xiaof 4 years ago
parent
commit
d2944bf37a

+ 8 - 1
distributed-print-business/src/main/resources/db/init-table.sql

@@ -196,7 +196,7 @@ CREATE TABLE `client_status`  (
   `id` bigint(20) NOT NULL AUTO_INCREMENT,
   `school_id` bigint(20) NULL DEFAULT NULL,
   `machine_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '机器唯一码',
-  `exam_task_id` bigint(20) NOT NULL COMMENT '命题任务ID',
+  `exam_task_id` bigint(20) NULL COMMENT '命题任务ID',
   `course_code` varchar(100) NOT NULL COMMENT '课程代码',
   `course_name` varchar(200) NOT NULL COMMENT '课程名称',
   `paper_number` varchar(50) NOT NULL COMMENT '试卷编号',
@@ -854,6 +854,9 @@ INSERT INTO `sys_privilege` VALUES (181, '超管中心', 'admin', 'MENU', 129, 7
 INSERT INTO `sys_privilege` VALUES (182, '查询客服', '/api/admin/sys/user/list_customer', 'URL', 181, 1, 'SYS', NULL, 1618387265194, 1);
 INSERT INTO `sys_privilege` VALUES (183, '新增客服', '/api/admin/sys/user/save_customer', 'URL', 181, 2, 'SYS', NULL, 1618387304029, 1);
 INSERT INTO `sys_privilege` VALUES (184, '用户管理-查询用户可绑定角色', '/api/admin/sys/role/list_to_user', 'URL', 5, 7, 'AUTH', NULL, 1618387370044, 1);
+INSERT INTO `sys_privilege` VALUES (185,'客服制卡-批量下载文件','/api/admin/exam/card/download_files','URL',172,2,'AUTH',NULL,1618282968373,1);
+INSERT INTO `sys_privilege` VALUES (186,'印刷任务管理-查看印品','/api/admin/exam/print/template_view','URL',47,8,'AUTH',NULL,1618986009123,1);
+INSERT INTO `sys_privilege` VALUES (187,'客户端登录','/api/admin/client/user/login','URL',NULL,1,'NO_AUTH',NULL,NULL,1);
 -- ----------------------------
 -- Table structure for sys_role
 -- ----------------------------
@@ -1148,6 +1151,10 @@ INSERT INTO `sys_role_privilege` VALUES (1382665570345353218, 3, 15, 1);
 INSERT INTO `sys_role_privilege` VALUES (1382665570357936130, 3, 16, 1);
 INSERT INTO `sys_role_privilege` VALUES (1382665570374713345, 3, 37, 1);
 INSERT INTO `sys_role_privilege` VALUES (1382665570383101953, 3, 175, 1);
+INSERT INTO `sys_role_privilege` VALUES (1384755205368246277,5,185,1);
+INSERT INTO `sys_role_privilege` VALUES (1384755205368246278,4,42,1);
+INSERT INTO `sys_role_privilege` VALUES (1384755205368246279,4,76,1);
+INSERT INTO `sys_role_privilege` VALUES (1384755205368246280,4,164,1);
 
 -- ----------------------------
 -- Table structure for sys_user

+ 3 - 3
distributed-print/src/main/java/com/qmth/distributed/print/api/EnumsController.java

@@ -81,10 +81,10 @@ public class EnumsController {
             //附件存储方式
             list = StorageTypeEnum.listTypes();
         } else if (type.equals(EnumType.TEMPLATE_TYPE.name())) {
-            list = TemplateTypeEnum.listTypes();
             //模板类型
+            list = TemplateTypeEnum.listTypes();
         } else if (type.equals(EnumType.CARD_REQUIRED_FIELDS.name())) {
-            //考务必选字段
+            //题卡必选字段
             list = CardRequiredFieldsEnum.listTypes();
         } else if (type.equals(EnumType.ORG_CENTER_TYPE_ENUM.name())){
             //机构用户中心类型
@@ -102,7 +102,7 @@ public class EnumsController {
             // 考场状态
             list = ExamDetailStatusEnum.listTypes();
         } else if (type.equals(EnumType.EXAMINATION_DB_FIELDS_ENUM.name())){
-            // 考场状态
+            // 考务数据导入-数据库所必须字段枚举
             list = ExaminationDBFieldsEnum.listTypes();
         }
         return ResultUtil.ok(list);