Kaynağa Gözat

获取考试相关信息时,orgId全改为从学生对象获取

lideyin 5 yıl önce
ebeveyn
işleme
c5fd6d55a1

+ 1 - 2
examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamAuditServiceImpl.java

@@ -170,8 +170,7 @@ public class ExamAuditServiceImpl implements ExamAuditService {
         	examAuditInfo.setCourseLevel(CourseLevel.getCourseLevel(courseBean.getLevel()).getTitle());
 
             //获取考试名称
-            ExamBean examBean = ExamCacheTransferHelper.getCachedExam(query.getExamId(),
-                    examAuditInfo.getOrgId(),examAuditInfo.getStudentId());
+            ExamBean examBean = ExamCacheTransferHelper.getCachedExam(query.getExamId(),examAuditInfo.getStudentId());
             examAuditInfo.setExamName(examBean.getName());
 
         }

+ 2 - 3
examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamRecordServiceImpl.java

@@ -406,7 +406,7 @@ public class ExamRecordServiceImpl implements ExamRecordService {
             }
 
             //获取考试名称
-            ExamBean examBean = ExamCacheTransferHelper.getCachedExam(examId, e.getOrgId(), e.getStudentId());
+            ExamBean examBean = ExamCacheTransferHelper.getCachedExam(examId, e.getStudentId());
             e.setExamName(examBean.getName());
             Map<String, String> data = this.getPaperScore(e.getDataId());
             //试卷总分
@@ -484,8 +484,7 @@ public class ExamRecordServiceImpl implements ExamRecordService {
 
         list.forEach(examRecordInfo -> {
             //获取考试名称
-            ExamBean examBean = ExamCacheTransferHelper.getCachedExam(examId,
-                    examRecordInfo.getOrgId(), examRecordInfo.getStudentId());
+            ExamBean examBean = ExamCacheTransferHelper.getCachedExam(examId, examRecordInfo.getStudentId());
             examRecordInfo.setExamName(examBean.getName());
 
             ExamStudentInfo examStudent = (ExamStudentInfo) cahcheMap.get("examStudentinfo_" + examRecordInfo.getExamStudentId());

+ 2 - 3
examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamScoreServiceImpl.java

@@ -97,8 +97,7 @@ public class ExamScoreServiceImpl implements ExamScoreService {
         List<ExamScoreInfo> examScoreList = new ArrayList<>();
         examStudentList.forEach(examStudent -> {
             //获取考试信息
-            ExamBean examBean = ExamCacheTransferHelper.getCachedExam(query.getExamId(),
-                    examStudent.getOrgId(), examStudent.getStudentId());
+            ExamBean examBean = ExamCacheTransferHelper.getCachedExam(query.getExamId(), examStudent.getStudentId());
             examScoreList.add(of(examStudent, examBean, markingType));
         });
         return new PageImpl<ExamScoreInfo>(examScoreList, pageable, page.getTotalElements());
@@ -231,7 +230,7 @@ public class ExamScoreServiceImpl implements ExamScoreService {
         }
         //获取考试信息
         ExamBean examBean = ExamCacheTransferHelper.getCachedExam(examStudent.getExamId(),
-                examStudent.getOrgId(), examStudent.getStudentId());
+                 examStudent.getStudentId());
         ExamScoreInfo examScore = new ExamScoreInfo();
         examScore.setExamId(examStudent.getExamId());
         examScore.setExamName(examBean.getName());

+ 3 - 3
examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamStudentServiceImpl.java

@@ -268,9 +268,9 @@ public class ExamStudentServiceImpl implements ExamStudentService {
                 sql.append(" and finished = " + query.getFinished());
             } else if (ExamType.OFFLINE.name().equals(examType)) {
                 //如果忽略是否上传答案时,只要是已抽题则认为已参加考试
-                if (query.getIgnoreUploadOfflineAnswer()!=null && true==query.getIgnoreUploadOfflineAnswer()){
+                if (query.getIgnoreUploadOfflineAnswer() != null && true == query.getIgnoreUploadOfflineAnswer()) {
                     sql.append(" and finished = " + query.getFinished());
-                }else {
+                } else {
                     if (query.getFinished() == 0) {                    //未抽题
                         sql.append(" and finished = 0");
                     } else if (query.getFinished() == 1) {                //已抽题未上传
@@ -306,7 +306,7 @@ public class ExamStudentServiceImpl implements ExamStudentService {
         } else if (ExamType.OFFLINE.name().equals(examType)) {
             //离线考试:当前机构是否允许上传附件
             ExamPropertyCacheBean cachedExamProperty = ExamCacheTransferHelper.getCachedExamProperty(examStudentInfo.getExamId(),
-                    examStudentInfo.getOrgId(), examStudentInfo.getStudentId(), ExamProperties.CAN_UPLOAD_ATTACHMENT.name());
+                    examStudentInfo.getStudentId(), ExamProperties.CAN_UPLOAD_ATTACHMENT.name());
             if (StringUtils.isNotBlank(cachedExamProperty.getValue())) {
                 examStudentInfo.setCanUploadAttachment(Boolean.valueOf(cachedExamProperty.getValue()));
             } else {

+ 1 - 1
examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/pushscore/cup/CupExamScorePushServiceImpl.java

@@ -166,7 +166,7 @@ public class CupExamScorePushServiceImpl implements ExamScorePushService {
         ExamScorePushInfo examScorePushInfo = new ExamScorePushInfo();
         examScorePushInfo.setExamId(examStudentEntity.getExamId());
         ExamBean examBean = ExamCacheTransferHelper.getCachedExam(examStudentEntity.getExamId(),
-                examStudentEntity.getOrgId(),examStudentEntity.getStudentId());
+                examStudentEntity.getStudentId());
 
         examScorePushInfo.setExamName(examBean.getName());
         examScorePushInfo.setStudentName(examStudentEntity.getStudentName());

+ 1 - 2
examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/pushscore/swufe/SwufeExamScorePushServiceImpl.java

@@ -162,8 +162,7 @@ public class SwufeExamScorePushServiceImpl implements ExamScorePushService{
 		ExamScorePushInfo examScorePushInfo = new ExamScorePushInfo();
 		examScorePushInfo.setExamId(examStudentEntity.getExamId());
 
-		ExamBean examBean = ExamCacheTransferHelper.getCachedExam(examStudentEntity.getExamId(),
-				examStudentEntity.getOrgId(),examStudentEntity.getStudentId());
+		ExamBean examBean = ExamCacheTransferHelper.getCachedExam(examStudentEntity.getExamId(),examStudentEntity.getStudentId());
 		examScorePushInfo.setExamName(examBean.getName());
 		
 		examScorePushInfo.setStudentName(examStudentEntity.getStudentName());