wangliang 2 жил өмнө
parent
commit
aeb67db619

+ 15 - 1
distributed-print-business/src/main/resources/db/upgrade/3.2.5/1、升级3.2.5数据库修改脚本.sql

@@ -26,4 +26,18 @@ ALTER TABLE `exam_print_plan`
     CHANGE COLUMN `backup_count` `backup_count` DOUBLE NOT NULL COMMENT '试卷、题卡备份数量(0-1为按比例,大于等于1为按数量)' ;
 
 ALTER TABLE `basic_print_config`
-    CHANGE COLUMN `backup_count` `backup_count` DOUBLE NULL DEFAULT NULL COMMENT '试卷、题卡备份数量(0-1为按比例,大于等于1为按数量)' ;
+    CHANGE COLUMN `backup_count` `backup_count` DOUBLE NULL DEFAULT NULL COMMENT '试卷、题卡备份数量(0-1为按比例,大于等于1为按数量)' ;\
+
+ALTER TABLE `basic_card_rule`
+    CHANGE COLUMN `objective_attention` `objective_attention` TEXT NULL COMMENT '客观题注意事项' ,
+    CHANGE COLUMN `subjective_attention` `subjective_attention` TEXT NULL COMMENT '主观题注意事项' ;
+
+ALTER TABLE `exam_detail` DROP COLUMN `print_count`;
+
+CREATE TABLE `exam_detail_course_paper_type` (
+                                                 `id` BIGINT(20) NOT NULL,
+                                                 `exam_detail_course_id` BIGINT(20) NOT NULL,
+                                                 `paper_type` VARCHAR(5) NOT NULL COMMENT '卷型',
+                                                 PRIMARY KEY (`id`));
+ALTER TABLE `exam_detail_course_paper_type`
+    ADD INDEX `idx_exam_detail_course_id` (`exam_detail_course_id` ASC);

+ 16 - 1
distributed-print-business/src/main/resources/db/upgrade/3.2.5/2、升级3.2.5数据修改脚本.sql

@@ -30,6 +30,7 @@ INSERT INTO `sys_role_privilege` VALUES (532, 10, 831, 1);
 INSERT INTO `sys_role_privilege` VALUES (533, 10, 575, 1);
 INSERT INTO `sys_role_privilege` VALUES (534, 9, 867, 1);
 INSERT INTO `sys_role_privilege` VALUES (535, 10, 832, 1);
+INSERT INTO `sys_role_privilege` VALUES (536, 9, 868, 1);
 
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('867', '下载', 'Download', 'LINK', '624', '9', 'AUTH', '868', '1', '0', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('868', '下载', '/api/admin/exam/card/download_card', 'URL', '624', '6', 'AUTH', '1', '1', '1');
@@ -39,4 +40,18 @@ INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence
 
 UPDATE `sys_privilege` SET `enable` = '0', `front_display` = '0' WHERE (`id` = '306');
 
-update exam_detail ed set ed.backup_count = (select backup_count from exam_print_plan epp where ed.print_plan_id = epp.id) where ed.id > 0;
+update exam_detail ed set ed.backup_count = (select backup_count from exam_print_plan epp where ed.print_plan_id = epp.id) where ed.id > 0;
+
+UPDATE `sys_privilege` SET `name` = '撤回提交' WHERE (`id` = '335');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('872', '批量撤回', 'BatchEnd', 'BUTTON', '47', '3', 'AUTH', '873', '1', '0', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('873', '批量撤回', '/api/admin/exam/print/task_batch_cancel', 'URL', '47', '4', 'AUTH', '1', '1', '1');
+
+UPDATE `sys_privilege` SET `related` = '395,435,557,665,792,793' WHERE (`id` = '394');
+UPDATE `sys_privilege` SET `related` = '395,435,557,665,792,793' WHERE (`id` = '397');
+
+update exam_card t set t.card_rule_id = (select bpc.card_rule_id from basic_print_config bpc join exam_task et on bpc.school_id = et.school_id and bpc.exam_id = et.exam_id
+                                                                                             join exam_task_detail etd on et.id = etd.exam_task_id
+                                         where FIND_IN_SET(t.id, REPLACE(REPLACE(substring_index(substring_index(CONVERT((etd.paper_attachment_ids ->>'$[*].cardId') USING utf8), ']', 1), '[',-1),' "','"'),'"','')) )
+where t.type = 'CUSTOM' and t.card_rule_id is null and t.id > 0;
+
+insert into exam_detail_course_paper_type select id + cast(FLOOR(RAND()*10000000000000) as signed), id, paper_type from exam_detail_course where paper_type is not null and id>0;