소스 검색

fix:教研分析3.3.0安装包

caozixuan 1 년 전
부모
커밋
af69ed39fe

+ 4 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/GradeBatchPaperServiceImpl.java

@@ -84,6 +84,8 @@ public class GradeBatchPaperServiceImpl extends ServiceImpl<GradeBatchPaperMappe
         }
 
         List<GradeBatchPaperResult> datasource = this.baseMapper.findAbleAnalyzePaper(gradeBatch.getSemesterId(), examId, collegeId, courseCode, SystemConstant.translateSpecificSign(teacherName), dpr, schoolId);
+        List<GradeBatchPaperResult> copy = new ArrayList<>();
+
         for (GradeBatchPaperResult gradeBatchPaperResult : datasource) {
             // 额外处理开课学院
             Long teachingRoomId = gradeBatchPaperResult.getTeachingRoomId();
@@ -94,8 +96,9 @@ public class GradeBatchPaperServiceImpl extends ServiceImpl<GradeBatchPaperMappe
             gradeBatchPaperResult.setPaperName(gradeBatchPaperResult.getCourseName());
             gradeBatchPaperResult.setTeachCollegeId(teachCollege.getId());
             gradeBatchPaperResult.setTeachCollegeName(teachCollege.getName());
+            copy.add(gradeBatchPaperResult);
         }
-        return datasource.stream().sorted(Comparator.comparing(GradeBatchPaperResult::getSemesterName)
+        return copy.stream().sorted(Comparator.comparing(GradeBatchPaperResult::getSemesterName)
                 .thenComparing(GradeBatchPaperResult::getExamName)
                 .thenComparing(GradeBatchPaperResult::getTeachCollegeId)
                 .thenComparing(GradeBatchPaperResult::getCourseCode)

+ 1 - 1
teachcloud-report/install/mysql/init/teachreport_db.sql

@@ -1754,7 +1754,7 @@ INSERT INTO `sys_config` VALUES (19, NULL, NULL, 'code.expired.time', '短信验
 INSERT INTO `sys_config` VALUES (20, NULL, NULL, 'code.send.interval', '短信验证码发送间隔', '60', NULL, 1, 1, 1, NULL, NULL, NULL);
 INSERT INTO `sys_config` VALUES (21, NULL, NULL, 'teachcloud.report.student.url', '学生报告地址', 'http://127.0.0.1:7500/#/student-report/', NULL, 1, 1, 1, NULL, NULL, NULL);
 INSERT INTO `sys_config` VALUES (22, NULL, NULL, 'teachcloud.report.login.url', '单点登录地址', 'http://127.0.0.1:7500/#/login-authen/', NULL, 1, 1, 1, NULL, NULL, NULL);
-INSERT INTO `sys_config` VALUES (23, NULL, NULL, 'teachcloud.print.open.callback.pwd', '分布式印刷回调密码', '123456', NULL, 1, 1, 1, NULL, NULL, NULL);
+INSERT INTO `sys_config` VALUES (23, NULL, NULL, 'teachcloud.print.open.callback.pwd', '分布式印刷回调密码', 'qmth87863577-offline', NULL, 1, 1, 1, NULL, NULL, NULL);
 INSERT INTO `sys_config` VALUES (24, NULL, NULL, 'sms.sign.name', '短信签名', '逸教云', NULL, 1, 1, 1, NULL, NULL, NULL);
 INSERT INTO `sys_config` VALUES (25, NULL, NULL, 'sms.tpl.code', '登录短信验证码', 'SMS_147416565', NULL, 1, 2, 1, NULL, NULL, NULL);
 INSERT INTO `sys_config` VALUES (26, NULL, NULL, 'sys.txt.charset', 'txt文件编码', 'utf8', NULL, 1, 1, 1, NULL, NULL, NULL);