lideyin %!s(int64=5) %!d(string=hai) anos
pai
achega
4161983998

+ 3 - 3
examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/provider/SyncExamDataCloudServiceProvider.java

@@ -151,7 +151,7 @@ public class SyncExamDataCloudServiceProvider extends ControllerSupport implemen
         }
 
         //同步后续处理
-        processAfterSyncExamData(realExamRecordDataId, examScoreId);
+        processAfterSyncExamData(realExamRecordDataId, examScoreId,transitionExamRecordData.getObjectiveScore());
 
         return new SyncExamDataResp();
     }
@@ -568,9 +568,9 @@ public class SyncExamDataCloudServiceProvider extends ControllerSupport implemen
      * @param realExamRecordDataId
      * @param examScoreId
      */
-    private void processAfterSyncExamData(Long realExamRecordDataId, Long examScoreId) {
+    private void processAfterSyncExamData(Long realExamRecordDataId, Long examScoreId, Double objectiveScore) {
         // 保存阅卷相关数据
-        examRecordForMarkingService.saveExamRecordForMarking(realExamRecordDataId);
+        examRecordForMarkingService.saveExamRecordForMarking(realExamRecordDataId,objectiveScore);
 
         // 保存考试分数数据到推分队列
         examScorePushQueueService.saveScoreDataInfoToQueue(realExamRecordDataId, examScoreId);

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

@@ -45,5 +45,5 @@ public interface ExamRecordForMarkingService {
 	 * 在线考试-保存阅卷相关数据-对内
 	 * @param examRecordDataId
 	 */
-	void saveExamRecordForMarking(Long examRecordDataId);
+	void saveExamRecordForMarking(Long examRecordDataId,Double objectiveScore);
 }

+ 17 - 23
examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamRecordForMarkingServiceImpl.java

@@ -1,39 +1,33 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.stream.Collectors;
-
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
-import cn.com.qmth.examcloud.core.oe.admin.service.ExamRecordQuestionsService;
-import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Service;
-
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordForMarkingRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordForMarkingEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamType;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.MarkingType;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamRecordForMarkingService;
+import cn.com.qmth.examcloud.core.oe.admin.service.ExamRecordQuestionsService;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examrecord.ExamRecordDataBean;
 import cn.com.qmth.examcloud.examwork.api.ExamCloudService;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamPropertyReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamReq;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamPropertyResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamResp;
+import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
 import main.java.com.UpYun;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Service;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.stream.Collectors;
 
 /**
  * @author chenken
@@ -296,7 +290,7 @@ public class ExamRecordForMarkingServiceImpl implements ExamRecordForMarkingServ
      * @param examRecordDataId
      */
     @Override
-    public void saveExamRecordForMarking(Long examRecordDataId) {
+    public void saveExamRecordForMarking(Long examRecordDataId,Double objectiveScore) {
         ExamRecordDataEntity examRecordData =
                 GlobalHelper.getEntity(examRecordDataRepo, examRecordDataId, ExamRecordDataEntity.class);
         //全客观题卷
@@ -325,7 +319,7 @@ public class ExamRecordForMarkingServiceImpl implements ExamRecordForMarkingServ
         examRecordForMarking.setBasePaperId(examRecordData.getBasePaperId());
         examRecordForMarking.setPaperType(examRecordData.getPaperType());
         examRecordForMarking.setCourseId(examRecordData.getCourseId());
-        examRecordForMarking.setObjectiveScore(examRecordData.getObjectiveScore());
+        examRecordForMarking.setObjectiveScore(objectiveScore);
 
         int subjectiveAnswerLength = examRecordQuestionsService.calculationSubjectiveAnswerLength(examRecordData.getId());
         examRecordForMarking.setSubjectiveAnswerLength(subjectiveAnswerLength);