3.2.7 bug修改

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

@@ -1303,12 +1303,9 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
 
             String sequence = printCommonService.createCourseSequence(schoolId, examTask.getCourseCode());
             examTask.setSequence(sequence);
-
             examTask.setId(SystemConstant.getDbUuid());
             examTask.setSchoolId(schoolId);
             examTask.setOrgId(basicCourseService.getOrgIdBySchoolIdAndCourseCode(schoolId, examTask.getCourseCode()));
-
-
             examTask.setReview(basicPrintConfig.getReview());
             examTask.setUserId(sysUser.getId());
             examTask.setStatus(ExamStatusEnum.SUBMIT);
@@ -1343,7 +1340,6 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             examTaskDetail.setExamTaskId(examTask.getId());
             examTaskDetail.setCreateId(sysUser.getId());
             examTaskDetail.setCreateTime(System.currentTimeMillis());
-
             examTaskDetailService.save(examTaskDetail);
 
             // 将题卡更新为已绑定
@@ -1356,14 +1352,12 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                 examCardService.update(updateWrapper);
             }
 
-
             BasicExam basicExam = basicExamService.getById(examTask.getExamId());
             if (ExamModelEnum.MODEL1.equals(basicExam.getExamModel()) || ExamModelEnum.MODEL2.equals(basicExam.getExamModel())) {
                 // 创建印刷计划
                 ExamDetailParams examDetailParams = JSONObject.parseObject(String.valueOf(jsonObject.get("examDetail")), ExamDetailParams.class);
                 ConvertUtil.analyzeAndCompareDateAndTime(examDetailParams.getExamStartTime(), examDetailParams.getExamEndTime());
                 ExamPrintPlan examPrintPlan = new ExamPrintPlan();
-
                 examPrintPlan.insertInfo(sysUser.getId());
                 examPrintPlan.setSchoolId(schoolId);
                 examPrintPlan.setExamId(examTask.getExamId());

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/PdfFillUtils.java

@@ -184,7 +184,7 @@ public class PdfFillUtils {
 
         // 考生信息
         List<Map<String, String>> studentPlate = new ArrayList<>();
-        int studentCount = basicTemplate.getDiallel() ? 80 : 40;
+        int studentCount = basicTemplate.getDiallel() == null || basicTemplate.getDiallel() ? 80 : 40;
         for (int i = 0; i < studentCount; i++) {
             Map<String, String> studentMap = new HashMap<>();
             for (JSONObject object : studentObjectList) {

distributed-print-business/src/main/resources/db/upgrade/3.2.4.sql

@@ -39,6 +39,11 @@ ALTER TABLE `t_sync_exam_log`
 ALTER TABLE `t_sync_exam_student_score`
     ADD COLUMN `third_relate_id` INT(6) NULL COMMENT ''云阅卷考试ID'' AFTER `exam_id`;
 
+ALTER TABLE `exam_task_sync`
+    ADD COLUMN `paper_type` VARCHAR(10) NULL COMMENT '试卷类型' AFTER `paper_number`;
+
+CREATE INDEX exam_detail_school_id_IDX USING BTREE ON exam_detail (school_id);
+
 update exam_detail ed set ed.exam_id = (select epp.exam_id from exam_print_plan epp where ed.school_id = epp.school_id and ed.print_plan_id = epp.id);
 
 update exam_task_sync ets set ets.exam_id = (select et.exam_id from exam_task et where ets.school_id = et.school_id and ets.paper_number = et.paper_number);

distributed-print-business/src/main/resources/db/upgrade/3.2.5.sql

@@ -35,9 +35,7 @@ where
                             count(x.ticket_number) > 1) temp
             where t.ticket_number = temp.ticket_number);
 
-CREATE INDEX exam_detail_school_id_IDX USING BTREE ON exam_detail (school_id);
-
-alter table exam_student add UNIQUE index `unique_ticket_number_idx`(`school_id`,`ticket_number`);
+alter table exam_student add UNIQUE index `unique_ticket_number_idx`(`school_id`, `exam_id`, `ticket_number`);
 
 ALTER TABLE `exam_detail`
     ADD COLUMN `backup_count` DOUBLE NULL COMMENT '试卷、题卡备份数量（0-1为按比例，大于等于1为按数量）' AFTER `print_count`;
@@ -75,11 +73,8 @@ ALTER TABLE sys_user MODIFY COLUMN code varchar(100) NULL COMMENT '工号';
 ALTER TABLE basic_course MODIFY COLUMN code varchar(100) NOT NULL COMMENT '课程编码';
 ALTER TABLE sys_user MODIFY COLUMN mobile_number varchar(30) NULL COMMENT '手机号';
 
-ALTER TABLE `exam_task_sync`
-    ADD COLUMN `paper_type` VARCHAR(10) NULL COMMENT '试卷类型' AFTER `paper_number`;
-
 ALTER TABLE `basic_template`
-    ADD COLUMN `diallel` TINYINT(1) NULL COMMENT '考生信息是否双列显示' AFTER `enable`,
+    ADD COLUMN `diallel` TINYINT(1) NULL DEFAULT '1' COMMENT '考生信息是否双列显示' AFTER `enable`,
     ADD COLUMN `text_desc` VARCHAR(500) NULL COMMENT '文字说明' AFTER `diallel`;
 
 ALTER TABLE `exam_paper_structure`
@@ -91,14 +86,6 @@ ALTER TABLE `exam_paper_structure`
 ALTER TABLE `exam_task_sync`
     ADD COLUMN `total_paper_type` VARCHAR(50) NULL COMMENT '所有卷型' AFTER `paper_type`;
 
-ALTER TABLE basic_student MODIFY COLUMN student_code varchar(100) NOT NULL COMMENT '学生编号';
-ALTER TABLE basic_student MODIFY COLUMN student_name varchar(100) NOT NULL COMMENT '学生姓名';
-ALTER TABLE exam_student MODIFY COLUMN student_code varchar(100) NOT NULL COMMENT '考生代码';
-ALTER TABLE exam_student MODIFY COLUMN student_name varchar(100) NOT NULL COMMENT '考生姓名';
-ALTER TABLE sys_user MODIFY COLUMN code varchar(100) NULL COMMENT '工号';
-ALTER TABLE basic_course MODIFY COLUMN code varchar(100) NOT NULL COMMENT '课程编码';
-ALTER TABLE sys_user MODIFY COLUMN mobile_number varchar(30) NULL COMMENT '手机号';
-
 ALTER TABLE `exam_task_sync` CHANGE COLUMN `paper_type` `paper_type` VARCHAR(50) CHARACTER SET 'utf8mb4' NULL DEFAULT NULL COMMENT '试卷类型' ;
 ALTER TABLE `basic_school`
     ADD COLUMN `init_password` VARCHAR(100) NULL COMMENT '该学校用户的初始密码，默认为12345678' AFTER `logo`;
@@ -152,7 +139,7 @@ INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence
 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
+update exam_card t set t.card_rule_id = (select distinct 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;

distributed-print-business/src/main/resources/db/upgrade/3.2.6.sql

@@ -1,33 +1,7 @@
 USE teachcloud_db;
 
-ALTER TABLE `exam_task_sync`
-    ADD COLUMN `paper_type` VARCHAR(10) NULL COMMENT '试卷类型' AFTER `paper_number`;
-
-ALTER TABLE `basic_template`
-    ADD COLUMN `diallel` TINYINT(1) NULL COMMENT '考生信息是否双列显示' AFTER `enable`,
-    ADD COLUMN `text_desc` VARCHAR(500) NULL COMMENT '文字说明' AFTER `diallel`;
-
-ALTER TABLE `exam_paper_structure`
-    CHANGE COLUMN `paper_type` `paper_type` VARCHAR(20) CHARACTER SET 'utf8mb4' COLLATE 'utf8mb4_general_ci' NULL DEFAULT NULL COMMENT '试卷类型' ;
-
-ALTER TABLE `exam_paper_structure`
-    CHANGE COLUMN `paper_number` `paper_number` VARCHAR(50) CHARACTER SET 'utf8mb4' COLLATE 'utf8mb4_general_ci' NOT NULL COMMENT '试卷编号' ;
-
-
-ALTER TABLE `exam_task_sync`
-    CHANGE COLUMN `paper_type` `paper_type` VARCHAR(50) CHARACTER SET 'utf8mb4' NULL DEFAULT NULL COMMENT '试卷类型' ;
-
-ALTER TABLE `exam_task_sync`
-    ADD COLUMN `total_paper_type` VARCHAR(50) NULL COMMENT '所有卷型' AFTER `paper_type`;
-
-ALTER TABLE `basic_school`
-    ADD COLUMN `init_password` VARCHAR(100) NULL COMMENT '该学校用户的初始密码，默认为12345678' AFTER `logo`;
-
 ALTER TABLE t_f_flow_log ADD task_id BIGINT NULL COMMENT '流程节点id';
 
-update `exam_task_sync` set total_paper_type = paper_type where total_paper_type is null;
-update `basic_school` set init_password = 'MTIzNDU2Nzg=';
-
 UPDATE sys_config SET config_value='500' WHERE config_key='thread.pool.core.size';
 UPDATE sys_config SET config_value='true' WHERE config_key='custom.thread.pool.core.size';
 

distributed-print-business/src/main/resources/db/upgrade/3.2.7.sql

@@ -1,3 +1,5 @@
+USE teachcloud_db;
+
 ALTER TABLE `basic_card_rule` CHANGE COLUMN `name` `name` VARCHAR(100) NOT NULL COMMENT '题卡规则名称' ;
 ALTER TABLE `basic_exam` DROP COLUMN `in_used`;
 ALTER TABLE `basic_semester` DROP COLUMN `in_used`;
@@ -176,7 +178,7 @@ ALTER TABLE `exam_paper_structure`
     ADD COLUMN `open_class_reading` TINYINT(1) NULL DEFAULT 0 COMMENT '是否开启分班阅' AFTER `object_answer_change`;
 
 ALTER TABLE `exam_paper_structure`
-    CHANGE COLUMN `status` `status` VARCHAR(2000) NULL DEFAULT NULL COMMENT '{\n    \"structure\":\n    {\n        \"save\": false,\n        \"sync\": false\n    },\n    \"group\":\n    {\n        \"save\": false,\n        \"sync\": false\n    },\n    \"class\":\n    {\n        \"save\": false,\n        \"sync\": false\n    },\n    \"objective\":\n    {\n        \"save\": false,\n        \"sync\": false\n    },\n    \"markerLeader\":\n    {\n        \"save\": false,\n        \"sync\": false\n    },\n    \"marker\":\n    {\n        \"save\": false,\n        \"sync\": false\n    },\n    \"answerFile\":\n    {\n        \"save\": false,\n        \"sync\": false\n    }\n}' ;
+    CHANGE COLUMN `status` `status` VARCHAR(700) NULL DEFAULT NULL COMMENT '{\n    \"structure\":\n    {\n        \"save\": false,\n        \"sync\": false\n    },\n    \"group\":\n    {\n        \"save\": false,\n        \"sync\": false\n    },\n    \"class\":\n    {\n        \"save\": false,\n        \"sync\": false\n    },\n    \"objective\":\n    {\n        \"save\": false,\n        \"sync\": false\n    },\n    \"markerLeader\":\n    {\n        \"save\": false,\n        \"sync\": false\n    },\n    \"marker\":\n    {\n        \"save\": false,\n        \"sync\": false\n    },\n    \"answerFile\":\n    {\n        \"save\": false,\n        \"sync\": false\n    }\n}' ;
 
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('882', '查询分班阅班级', '/api/admin/exam/structure/list_user_class', 'URL', '488', '13', 'AUTH', '1', '1', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('883', '查询评卷参数状态', '/api/admin/exam/structure/get_structure_status', 'URL', '488', '14', 'AUTH', '1', '1', '1');