Merge remote-tracking branch 'origin/dev_v3.3.1' into dev_v3.3.1

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

@@ -4062,6 +4062,7 @@ INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `sc
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1773521288888565762, 11, 2031, 1, 1);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1773521288888565763, 11, 2032, 1, 1);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1773521288892760066, 11, 2033, 1, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1773521288892760067, 11, 2034, 1, 1);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1773521594997260290, 4, 1115, 1, 1);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1773521595005648897, 4, 1116, 1, 1);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1773521595005648898, 4, 1117, 1, 1);
@@ -4110,6 +4111,7 @@ INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `sc
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1773521595081146371, 4, 2031, 1, 1);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1773521595085340674, 4, 2032, 1, 1);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1773521595085340675, 4, 2033, 1, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1773521595085340676, 4, 2034, 1, 1);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1773553860838408194, 8, 640, 1, 1);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1773553860846796801, 8, 641, 1, 1);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1773553860846796802, 8, 650, 1, 1);
@@ -4620,6 +4622,7 @@ INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `sc
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1774594629024071681, 9, 969, 1, 1);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1774594629024071682, 9, 1008, 1, 1);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1774594629024071683, 9, 2033, 1, 1);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1774594629024071684, 9, 2034, 1, 1);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1774629833423962113, 3, 680, 1, 137);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1774629833432350721, 3, 708, 1, 137);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1774629833436545025, 3, 709, 1, 137);
@@ -4690,6 +4693,7 @@ INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `sc
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1774636057905315843, 2, 752, 1, 137);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1774636057905315844, 2, 755, 1, 137);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1774636057909510145, 2, 2033, 1, 137);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1774636057909510146, 2, 2034, 1, 137);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1775091897652539394, 3, 541, 1, NULL);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1775091897686093825, 3, 542, 1, NULL);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1775091897686093826, 3, 543, 1, NULL);
@@ -4963,6 +4967,7 @@ INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `sc
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1775091898122301443, 3, 2032, 1, NULL);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1775091898122301444, 3, 1009, 1, NULL);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1775091898126495745, 3, 2033, 1, NULL);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1775091898126495746, 3, 2034, 1, NULL);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1775091898130690050, 3, 498, 1, NULL);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1775091898130690051, 3, 1010, 1, NULL);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1775091898130690052, 3, 499, 1, NULL);
@@ -5547,6 +5552,7 @@ INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `sc
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1775092242864730115, 2, 1008, 1, NULL);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1775092242868924417, 2, 2032, 1, NULL);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1775092242868924418, 2, 2033, 1, NULL);
+INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1775092242868924419, 2, 2034, 1, NULL);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1775092426608799745, 4, 39, 1, NULL);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1775092426629771266, 4, 42, 1, NULL);
 INSERT INTO `sys_role_privilege` (`id`, `role_id`, `privilege_id`, `enable`, `school_id`) VALUES (1775092426629771267, 4, 575, 1, NULL);

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

@@ -1,3 +1,5 @@
+USE teachcloud_db;
+
 -- -------------补考-----------
 update basic_exam t set t.category = 'MAKEUP' where t.category = 'ONLINE';
 update basic_exam t set t.category = 'FORMAL' where t.category = 'OFFLINE';

distributed-print/src/main/java/com/qmth/distributed/print/api/SysAdminSetController.java

@@ -424,7 +424,9 @@ public class SysAdminSetController {
         SysConfigResult sysConfigResult = new SysConfigResult();
         if (sysConfig != null) {
             sysConfigResult = new SysConfigResult(sysConfig);
-            sysConfigResult.setValue(fileUploadService.filePreview(Long.valueOf(sysConfigResult.getValue().toString())));
+            if (sysConfigResult != null && sysConfigResult.getValue() != null) {
+                sysConfigResult.setValue(fileUploadService.filePreview(Long.valueOf(sysConfigResult.getValue().toString())));
+            }
         }
         return ResultUtil.ok(sysConfigResult);
     }
@@ -444,7 +446,9 @@ public class SysAdminSetController {
             commonCacheService.updateSysConfigCache(schoolId, sysConfig.getConfigKey());
         }
         SysConfigResult sysConfigResult = new SysConfigResult(sysConfig);
-        sysConfigResult.setValue(fileUploadService.filePreview(Long.valueOf(sysConfigResult.getValue().toString())));
+        if (sysConfigResult != null && sysConfigResult.getValue() != null) {
+            sysConfigResult.setValue(fileUploadService.filePreview(Long.valueOf(sysConfigResult.getValue().toString())));
+        }
         return ResultUtil.ok(sysConfigResult);
     }
 }

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

@@ -318,7 +318,7 @@ public class FileUploadServiceImpl implements FileUploadService {
             return null;
         }
         BasicAttachment basicAttachment = basicAttachmentService.getById(attachmentId);
-        if (basicAttachment == null && StringUtils.isBlank(basicAttachment.getPath())) {
+        if (basicAttachment == null || StringUtils.isBlank(basicAttachment.getPath())) {
             return null;
         }
         return filePreview(basicAttachment.getPath());

teachcloud-task/src/main/java/com/qmth/teachcloud/task/job/service/impl/JobServiceImpl.java

@@ -146,7 +146,7 @@ public class JobServiceImpl implements JobService {
     public void initMarkData() {
         log.info("开始同步数据：" + DateDisposeUtils.dateTimeNow(DateDisposeUtils.YYYY_MM_DD_HH_MM_SS));
         // 结束阅卷的课程，不同步，3.3.0版本更新前的历史数据，统一不同步
-        long startTime = DateDisposeUtils.parseDate("2023-11-17 00:00:00").getTime();
+        long startTime = DateDisposeUtils.parseDate("2024-04-22 00:00:00").getTime();
         List<ExamDetailCourseInitMarkDto> examDetailCourseInitMarkDtoList = examDetailService.listPrintFinishExamDetailCourse(ExamDetailStatusEnum.FINISH.name(), startTime, MarkPaperStatus.FINISH.name());
         for (ExamDetailCourseInitMarkDto dto : examDetailCourseInitMarkDtoList) {
             for (String paperType : dto.getPaperType().split(",")) {