wangliang 1 жил өмнө
parent
commit
2e2b824640

+ 1 - 1
distributed-print/src/main/java/com/qmth/distributed/print/api/TCPaperStructController.java

@@ -145,7 +145,7 @@ public class TCPaperStructController {
         TCPaperStruct tcPaperStruct = tcPaperStructService.queryByExamIdAndCourseCodeAndPaperNumber(examId, courseCode, paperNumber);
         if (Objects.isNull(tcPaperStruct) || Objects.isNull(tcPaperStruct.getPaperStruct())) {
             List<MarkQuestion> markQuestionList = markQuestionService.listQuestionByExamIdAndPaperNumberAndPaperType(examId, paperNumber, null);
-            if (!CollectionUtils.isEmpty(markQuestionList)) {
+            if (CollectionUtils.isEmpty(markQuestionList)) {
                 throw ExceptionResultEnum.ERROR.exception("未找到试卷结构");
             }
             paperStructDimensionResultList = new ArrayList<>(markQuestionList.size());

+ 24 - 24
teachcloud-common/src/main/java/com/qmth/teachcloud/common/contant/SystemConstant.java

@@ -91,26 +91,26 @@ public class SystemConstant {
     /**
      * 云阅卷api
      */
-    public static final String CLOUD_MARK_SCHOOL_SAVE_API = "/api/school/sub/save";
-    public static final String CLOUD_MARK_EXAM_SAVE_API = "/api/exam/save";
-    public static final String CLOUD_MARK_SUBJECT_SAVE_API = "/api/exam/subject/save";
-    public static final String CLOUD_MARK_EXAM_LIST_API = "/api/exams";
-    public static final String CLOUD_MARK_EXAM_STUDENT_SAVE_API = "/api/exam/student/save";
-    public static final String CLOUD_MARK_FILE_UPLOAD_API = "/api/file/{type}/upload";
-    public static final String CLOUD_MARK_EXAM_PAPER_QUERY_API = "/api/exam/paper/query";
-    public static final String CLOUD_MARK_OPEN_MARK_LOGIN_API = "/open/mark/login";
-    public static final String CLOUD_MARK_OPEN_SUBJECT_HEADER_LOGIN_API = "/open/subject_header/login";
-    public static final String CLOUD_MARK_EXAM_STUDENT_COUNT_API = "/api/exam/student/count";
+//    public static final String CLOUD_MARK_SCHOOL_SAVE_API = "/api/school/sub/save";
+//    public static final String CLOUD_MARK_EXAM_SAVE_API = "/api/exam/save";
+//    public static final String CLOUD_MARK_SUBJECT_SAVE_API = "/api/exam/subject/save";
+//    public static final String CLOUD_MARK_EXAM_LIST_API = "/api/exams";
+//    public static final String CLOUD_MARK_EXAM_STUDENT_SAVE_API = "/api/exam/student/save";
+//    public static final String CLOUD_MARK_FILE_UPLOAD_API = "/api/file/{type}/upload";
+//    public static final String CLOUD_MARK_EXAM_PAPER_QUERY_API = "/api/exam/paper/query";
+//    public static final String CLOUD_MARK_OPEN_MARK_LOGIN_API = "/open/mark/login";
+//    public static final String CLOUD_MARK_OPEN_SUBJECT_HEADER_LOGIN_API = "/open/subject_header/login";
+//    public static final String CLOUD_MARK_EXAM_STUDENT_COUNT_API = "/api/exam/student/count";
     public static final String CLOUD_MARK_EXAM_STUDENT_SCORE_API = "/api/exam/student/score";
-    public static final String CLOUD_MARK_EXAM_PAPER_SAVE_API = "/api/exam/paper/save";
-    public static final String CLOUD_MARK_USER_EXTERNAL_SAVE_API = "/api/user/external/save";
-    public static final String CLOUD_MARK_EXAM_MARK_GROUP_SAVE_API = "/api/exam/mark_group/save";
-    public static final String CLOUD_MARK_EXAM_MARK_GROUP_COUNT_API = "/api/exam/mark_group/count";
-    public static final String CLOUD_MARK_EXAM_MARK_GROUP_DELETE_API = "/api/exam/mark_group/delete";
-    public static final String CLOUD_MARK_EXAM_MARKER_SAVE_API = "/api/exam/marker/save";
-    public static final String CLOUD_MARK_EXAM_SUBJECT_HEADER_SAVE_API = "/api/exam/subject_header/save";
-    public static final String CLOUD_MARK_USER_CLASS_SAVE_API = "/api/user/class/save";
-    public static final String CLOUD_MARK_EXAM_SUBJECT_CALCULATE_API = "/api/exam/subject/calculate";
+//    public static final String CLOUD_MARK_EXAM_PAPER_SAVE_API = "/api/exam/paper/save";
+//    public static final String CLOUD_MARK_USER_EXTERNAL_SAVE_API = "/api/user/external/save";
+//    public static final String CLOUD_MARK_EXAM_MARK_GROUP_SAVE_API = "/api/exam/mark_group/save";
+//    public static final String CLOUD_MARK_EXAM_MARK_GROUP_COUNT_API = "/api/exam/mark_group/count";
+//    public static final String CLOUD_MARK_EXAM_MARK_GROUP_DELETE_API = "/api/exam/mark_group/delete";
+//    public static final String CLOUD_MARK_EXAM_MARKER_SAVE_API = "/api/exam/marker/save";
+//    public static final String CLOUD_MARK_EXAM_SUBJECT_HEADER_SAVE_API = "/api/exam/subject_header/save";
+//    public static final String CLOUD_MARK_USER_CLASS_SAVE_API = "/api/user/class/save";
+//    public static final String CLOUD_MARK_EXAM_SUBJECT_CALCULATE_API = "/api/exam/subject/calculate";
 
     /**
      * 教研分析api
@@ -232,8 +232,8 @@ public class SystemConstant {
     public static final String TASK = "task";
     public static final String ORG_PREFIX = "code";
     public static final String TB_TASK_ID = "tbTaskId";
-    public static final String TB_SYNC_TASK = "tbSyncTask";
-    public static final String TB_SYNC_TASK_ID = "tbSyncTaskId";
+//    public static final String TB_SYNC_TASK = "tbSyncTask";
+//    public static final String TB_SYNC_TASK_ID = "tbSyncTaskId";
     public static final String USER = "account";
     public static final String USER_ID = "userId";
     public static final String SCHOOL_ID = "schoolId";
@@ -326,9 +326,9 @@ public class SystemConstant {
     public static final String ZIP_ENCRYPT_PWD = "qmthzip";
     public static final String GET = "get";
     public static final String POST = "post";
-    public static final String PARAMS = "params";
+//    public static final String PARAMS = "params";
     public static final String RETURN_URL = "returnUrl";
-    public static final String SIGNATURE = "signature";
+//    public static final String SIGNATURE = "signature";
     public static final String GET_UNKNOWN = "?";
     public static final String GET_SYMBOL = "&";
     public static final String GET_EQUAL = "=";
@@ -365,7 +365,7 @@ public class SystemConstant {
     public static final String SCHOOL_ROLE_CACHE = "school:role:cache";
     public static final String CUSTOM_PRIVILEGE_CACHE = "custom:privilege:cache";
     public static final String CUSTOM_ROLE_CACHE = "custom:role:cache";
-    public static final String NUMBER_CACHE = "school:number:cache:";
+//    public static final String NUMBER_CACHE = "school:number:cache:";
     public static final String ORG_COLLEGE_LEVEL_CACHE = "org:college:level:cache";
     public static final String ORG_CODE_CACHE = "org:code:cache";