瀏覽代碼

fix:主客观题非空判断

caozixuan 8 月之前
父節點
當前提交
48fa932197

+ 31 - 27
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/AnalyzeDataGetAndEditServiceImpl.java

@@ -722,34 +722,38 @@ public class AnalyzeDataGetAndEditServiceImpl implements AnalyzeDataGetAndEditSe
             // 构建考生作答明细表(t_b_answer)正常考生才记录
             // 客观题(选择)
             if (status == 1) {
-                for (AnswerInfo objective : objectiveScoreDetailList) {
-                    Long answerId = SystemConstant.getDbUuid();
-                    TBAnswer tbAnswer = new TBAnswer();
-                    tbAnswer.setId(answerId);
-                    tbAnswer.setExamRecordId(examRecordId);
-                    tbAnswer.setNumberType(NumberTypeEnum.OBJECTIVE.getValue());
-                    String cloudMainNumber = String.valueOf(objective.getMainNumber());
-                    String cloudSubNumber = objective.getSubNumber();
-                    tbAnswer.setMainNumber(cloudMainNumber);
-                    tbAnswer.setSubNumber(cloudSubNumber);
-                    tbAnswer.setScore(objective.getScore());
-                    tbAnswer.setAnswer(objective.getAnswer());
-                    tbAnswerList.add(tbAnswer);
+                if (!objectiveScoreDetailList.isEmpty()){
+                    for (AnswerInfo objective : objectiveScoreDetailList) {
+                        Long answerId = SystemConstant.getDbUuid();
+                        TBAnswer tbAnswer = new TBAnswer();
+                        tbAnswer.setId(answerId);
+                        tbAnswer.setExamRecordId(examRecordId);
+                        tbAnswer.setNumberType(NumberTypeEnum.OBJECTIVE.getValue());
+                        String cloudMainNumber = String.valueOf(objective.getMainNumber());
+                        String cloudSubNumber = objective.getSubNumber();
+                        tbAnswer.setMainNumber(cloudMainNumber);
+                        tbAnswer.setSubNumber(cloudSubNumber);
+                        tbAnswer.setScore(objective.getScore());
+                        tbAnswer.setAnswer(objective.getAnswer());
+                        tbAnswerList.add(tbAnswer);
+                    }
                 }
-                // 主观题
-                for (AnswerInfo subjective : subjectiveScoreDetailList) {
-                    Long answerId = SystemConstant.getDbUuid();
-                    TBAnswer tbAnswer = new TBAnswer();
-                    tbAnswer.setId(answerId);
-                    tbAnswer.setExamRecordId(examRecordId);
-                    tbAnswer.setNumberType(NumberTypeEnum.SUBJECTIVE.getValue());
-                    String cloudMainNumber = String.valueOf(subjective.getMainNumber());
-                    String cloudSubNumber = subjective.getSubNumber();
-                    tbAnswer.setMainNumber(cloudMainNumber);
-                    tbAnswer.setSubNumber(cloudSubNumber);
-                    tbAnswer.setScore(subjective.getScore());
-                    tbAnswer.setAnswer(subjective.getAnswer());
-                    tbAnswerList.add(tbAnswer);
+                if (!subjectiveScoreDetailList.isEmpty()){
+                    // 主观题
+                    for (AnswerInfo subjective : subjectiveScoreDetailList) {
+                        Long answerId = SystemConstant.getDbUuid();
+                        TBAnswer tbAnswer = new TBAnswer();
+                        tbAnswer.setId(answerId);
+                        tbAnswer.setExamRecordId(examRecordId);
+                        tbAnswer.setNumberType(NumberTypeEnum.SUBJECTIVE.getValue());
+                        String cloudMainNumber = String.valueOf(subjective.getMainNumber());
+                        String cloudSubNumber = subjective.getSubNumber();
+                        tbAnswer.setMainNumber(cloudMainNumber);
+                        tbAnswer.setSubNumber(cloudSubNumber);
+                        tbAnswer.setScore(subjective.getScore());
+                        tbAnswer.setAnswer(subjective.getAnswer());
+                        tbAnswerList.add(tbAnswer);
+                    }
                 }
             }
         }