3.4.4 update-20250317，bug修复

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

@@ -47,10 +47,7 @@ public class TBVersionServiceImpl extends ServiceImpl<TBVersionMapper, TBVersion
     @Override
     public void validVersion(String version) {
         TBVersion tbVersion = this.getByClientVersion(version);
-        if (tbVersion == null) {
-            throw ExceptionResultEnum.ERROR.exception("未设置服务器版本号，请联系管理员处理");
-        }
-        if (!StringUtils.equalsAny(SystemConstant.VERSION_VALUE, tbVersion.listSoftVersion().toArray(new String[0]))) {
+        if (tbVersion == null || !StringUtils.equalsAny(SystemConstant.VERSION_VALUE, tbVersion.listSoftVersion().toArray(new String[0]))) {
             throw ExceptionResultEnum.ERROR.exception("客户端版本号[" + version + "]，无法使用当前服务端，请联系管理员处理");
         }
     }

distributed-print-business/src/main/resources/db/delete-data.sql

@@ -12,6 +12,7 @@ delete from mark_arbitrate_history where exam_id in (select id from basic_exam w
 delete from mark_document where exam_id in (select id from basic_exam where school_id = #{schoolId});
 delete from mark_group where exam_id in (select id from basic_exam where school_id = #{schoolId});
 delete from mark_group_student where exam_id in (select id from basic_exam where school_id = #{schoolId});
+delete from mark_header_history where exam_id in (select id from basic_exam where school_id = #{schoolId});
 delete from mark_header_subjective_score where exam_id in (select id from basic_exam where school_id = #{schoolId});
 delete from mark_header_tag where exam_id in (select id from basic_exam where school_id = #{schoolId});
 delete from mark_header_track where exam_id in (select id from basic_exam where school_id = #{schoolId});
@@ -26,7 +27,8 @@ delete from mark_subjective_score where exam_id in (select id from basic_exam wh
 delete from mark_task where exam_id in (select id from basic_exam where school_id = #{schoolId});
 delete from mark_track where exam_id in (select id from basic_exam where school_id = #{schoolId});
 delete from mark_user_class where exam_id in (select id from basic_exam where school_id = #{schoolId});
-delete from mark_user_group where exam_id in (select id from basic_exam where school_id = #{schoolId});
+delete from mark_user_paper where exam_id in (select id from basic_exam where school_id = #{schoolId});
+delete from mark_user_question where exam_id in (select id from basic_exam where school_id = #{schoolId});
 delete from scan_answer_card where exam_id in (select id from basic_exam where school_id = #{schoolId});
 delete from scan_answer_card_subject where exam_id in (select id from basic_exam where school_id = #{schoolId});
 delete from scan_batch_paper where batch_id in (select id from scan_batch where exam_id in (select id from basic_exam where school_id = #{schoolId}));
@@ -74,6 +76,7 @@ DELETE t FROM obe_requirement_target_matrix t where t.culture_program_id in (sel
 DELETE t FROM obe_culture_program t where t.school_id = #{schoolId};
 
 DELETE t FROM exam_card t where t.school_id = #{schoolId};
+DELETE t FROM exam_card_model_four t where t.school_id = #{schoolId};
 DELETE t FROM exam_detail t where t.school_id = #{schoolId};
 DELETE t FROM exam_detail_course t where t.school_id = #{schoolId};
 DELETE t FROM exam_print_plan t where t.school_id = #{schoolId};

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

@@ -309,3 +309,13 @@ WHERE id=946;
 ALTER TABLE t_b_version ADD CONSTRAINT t_b_version_unique UNIQUE KEY (client_version);
 
 ALTER TABLE exam_card_model_four ADD CONSTRAINT exam_card_model_four_unique UNIQUE KEY (exam_id,course_id);
+
+-- 2025-03-17
+ALTER TABLE `mark_task` CHANGE COLUMN `group_number` `group_number` INT NULL COMMENT '大题号' ;
+ALTER TABLE `mark_user_question` CHANGE COLUMN `group_number` `group_number` INT NULL COMMENT '分组编号' ;
+ALTER TABLE `mark_subjective_score`
+    CHANGE COLUMN `group_number` `group_number` INT NULL COMMENT '分组序号' ,
+    CHANGE COLUMN `group_score` `group_score` DOUBLE NULL COMMENT '分组得分' ,
+    CHANGE COLUMN `uncalculate` `uncalculate` TINYINT(1) NULL COMMENT '是否合分' ;
+ALTER TABLE `mark_problem_history`
+    CHANGE COLUMN `group_number` `group_number` INT NULL COMMENT '大题号' ;

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkStudentServiceImpl.java

@@ -326,7 +326,7 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
             List<MarkTask> markTaskList = markTaskService.list(new QueryWrapper<MarkTask>().lambda().eq(MarkTask::getStudentId, scoreDetailDto.getStudentId()));
             if (!CollectionUtils.isEmpty(markTaskList)) {
                 for (MarkTask m : markTaskList) {
-                    if (Objects.nonNull(m.getStatus()) && m.getStatus() != MarkTaskStatus.MARKED) {
+                    if (Objects.nonNull(m.getStatus()) && m.getStatus() != MarkTaskStatus.MARKED && m.getStatus() != MarkTaskStatus.ARBITRATED) {
                         throw ExceptionResultEnum.ERROR.exception("[" + scoreDetailDto.getStudentName() + "]评卷任务未完成，请完成评卷任务并检查成绩后再导出");
                     }
                 }