add:第七次教研分析更新

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

@@ -420,8 +420,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 }
                 //如果修改了机构或手机号，需更新用户缓存
                 if (Objects.nonNull(dbUser.getOrgId())) {
-                    if (containsQuestionTeacher || dbUser.getOrgId().longValue() != sysUser.getOrgId().longValue()
-                            || !Objects.equals(dbUser.getMobileNumber(), sysUser.getMobileNumber())) {
+                    if (containsQuestionTeacher || dbUser.getOrgId().longValue() != sysUser.getOrgId().longValue() || !Objects.equals(dbUser.getMobileNumber(), sysUser.getMobileNumber())) {
                         cacheService.updateUserCache(sysUser.getId());
                         cacheService.updateUserAuthCache(sysUser.getId());
                     }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/enums/SemesterEnum.java

@@ -21,7 +21,9 @@ public enum SemesterEnum {
 
     FIFTH("2022-2023学年度第1学期"),
 
-    SIXTH("2022-2023学年度第2学期");
+    SIXTH("2022-2023学年度第2学期"),
+
+    SEVENTH("2023-2024学年度第1学期");
 
     private final String title;
 

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/utils/AesUtil.java

@@ -117,9 +117,9 @@ public class AesUtil {
 //        System.out.println(decoder);
 
 
-        String encoder = Base64.getEncoder().encodeToString("".getBytes());
+        String encoder = Base64.getEncoder().encodeToString("a1234567".getBytes());
         System.out.println(encoder);
-        String decoder = new String(Base64.getDecoder().decode(encoder));
+        String decoder = new String(Base64.getDecoder().decode("YTEyMzQ1Njc="));
         System.out.println(decoder);
     }
 }

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/BasicDatasourceController.java

@@ -521,7 +521,7 @@ public class BasicDatasourceController {
         List<Map<String, String>> teacherList = finalList.stream()
                 .flatMap(e -> {
                     Map<String, String> map = new HashMap<>();
-                    map.put("subjectName", String.valueOf(e.get(ExamCloudDataEnum.SUBJECT_NAME.getName())));
+                    map.put("subjectCode", String.valueOf(e.get(ExamCloudDataEnum.SUBJECT_CODE.getName())));
                     map.put("teacherInfo", String.valueOf(e.get(ExamCloudDataEnum.TEACHER.getName())));
                     return Stream.of(map);
                 }).distinct().collect(Collectors.toList());
@@ -531,23 +531,23 @@ public class BasicDatasourceController {
         for (Map<String, String> teacherPackage : teacherList) {
 
             String teacherInfo = teacherPackage.get("teacherInfo");
-            String subjectName = teacherPackage.get("subjectName");
+            String subjectCode = teacherPackage.get("subjectCode");
 
             Long teacherCollegeId = null;
             // 如果存在A、B卷
             for (TBExamCourse tbExamCourse : tbExamCourseList) {
-                String courseName = tbExamCourse.getCourseName();
-                if (SystemConstant.strNotNull(linkSign) && courseName.contains(linkSign)) {
-                    String[] cellArr = courseName.split(linkSign);
+                String courseCode = tbExamCourse.getCourseCode();
+                if (SystemConstant.strNotNull(linkSign) && courseCode.contains(linkSign)) {
+                    String[] cellArr = courseCode.split(linkSign);
                     if (cellArr.length != 2) {
-                        throw ExceptionResultEnum.ERROR.exception("无法解析存在分隔符为 【" + linkSign + "】的课程 【" + courseName + "】");
+                        throw ExceptionResultEnum.ERROR.exception("无法解析存在分隔符为 【" + linkSign + "】的课程 【" + courseCode + "】");
                     }
-                    if (cellArr[0].equals(subjectName)) {
+                    if (cellArr[0].equals(subjectCode)) {
                         teacherCollegeId = tbExamCourse.getTeachCollegeId();
                         break;
                     }
                 } else {
-                    if (courseName.equals(subjectName)) {
+                    if (courseCode.equals(subjectCode)) {
                         teacherCollegeId = tbExamCourse.getTeachCollegeId();
                         break;
                     }
@@ -684,9 +684,9 @@ public class BasicDatasourceController {
             List<TBExamCourse> needDisposeList;
             if (linkSign != null && linkSign.length() > 0) { // 云阅卷在同一个考试下 科目名称相同分AB卷 但在教研分析时分科处理的科目
                 String finalPaperType = paperType;
-                needDisposeList = tbExamCourseList.stream().filter(e -> e.getCourseName().equals(subjectName + linkSign + finalPaperType)).collect(Collectors.toList());
+                needDisposeList = tbExamCourseList.stream().filter(e -> e.getCourseCode().equals(subjectCode + linkSign + finalPaperType)).collect(Collectors.toList());
             } else {
-                needDisposeList = tbExamCourseList.stream().filter(e -> e.getCourseName().equals(subjectName)).collect(Collectors.toList());
+                needDisposeList = tbExamCourseList.stream().filter(e -> e.getCourseCode().equals(subjectCode)).collect(Collectors.toList());
             }
             if (needDisposeList.size() == 1) {