3.4.6 20250611 bug修复

distributed-print/install/mysql/init/teachcloud_db.sql

@@ -1097,6 +1097,7 @@ CREATE TABLE IF NOT EXISTS `exam_task`
     `teacher_name`                 varchar(100) DEFAULT NULL COMMENT '拟卷教师',
     `lecturer_name`                varchar(100) DEFAULT NULL COMMENT '主讲教师',
     `paper_name`                   varchar(100) DEFAULT NULL COMMENT '试卷名称',
+    `class_desc` VARCHAR(2000) NULL COMMENT '班级组成',
     `cancel_remark`                mediumtext COMMENT '作废原因',
     `create_id`                    bigint       DEFAULT NULL COMMENT '创建人',
     `create_time`                  bigint       DEFAULT NULL COMMENT '创建时间',
@@ -1932,6 +1933,7 @@ CREATE TABLE IF NOT EXISTS `mark_question`
     `update_id`              bigint       DEFAULT NULL,
     `update_time`            bigint       DEFAULT NULL,
     `pic_list`               mediumtext COMMENT '评卷区坐标',
+    `question_pic_list` VARCHAR(500) NULL COMMENT '填空题单题区域坐标',
     `double_rate`            double       DEFAULT NULL COMMENT '双评比例',
     `arbitrate_threshold`    double       DEFAULT NULL COMMENT '仲裁阈值',
     `score_policy`           varchar(10)  DEFAULT NULL COMMENT '合分策略',

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/OrgDto.java

@@ -44,6 +44,8 @@ public class OrgDto {
     @ApiModelProperty(value = "课程下系统用户")
     private List<SysUserResult> courseUserList;
 
+    private Long createTime;
+
     public List<SysUserResult> getCourseUserList() {
         return courseUserList;
     }
@@ -147,4 +149,12 @@ public class OrgDto {
     public void setSysUserList(List<SysUserResult> sysUserList) {
         this.sysUserList = sysUserList;
     }
+
+    public Long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Long createTime) {
+        this.createTime = createTime;
+    }
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysOrgServiceImpl.java

@@ -116,6 +116,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
                 if (Objects.nonNull(map.get(map.get(parentId).getParentId()))) {
                     map.get(map.get(parentId).getParentId()).getChildren().add(map.get(parentId));
                     deleteKeys.add(parentId);
+                    map.get(map.get(parentId).getParentId()).getChildren().sort(Comparator.comparing(OrgDto::getCreateTime));
                 }
             }
         }

teachcloud-common/src/main/resources/mapper/SysOrgMapper.xml

@@ -43,7 +43,8 @@
             so.enable,
             bc.id as campusId,
             bc.campus_name as campusName,
-            bc.campus_code as campusCode
+            bc.campus_code as campusCode,
+            so.create_time
         from
             sys_org so
         left join basic_campus bc on