Prechádzať zdrojové kódy

后端bug修改,导出

weiwenhai 6 rokov pred
rodič
commit
cc9011bd1d

+ 13 - 2
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/PaperServiceImpl.java

@@ -1436,6 +1436,9 @@ public class PaperServiceImpl implements PaperService{
         for(PaperDetail paperDetail:paperDetails){
         	PaperDetailExp paperDetailExp = new PaperDetailExp();
         	BeanUtils.copyProperties(paperDetail, paperDetailExp);
+        	if(StringUtils.isBlank(paperDetailExp.getName())){
+        		paperDetailExp.setName("默认大题");
+        	}
         	paperDetailExps.add(paperDetailExp);
         }
         // 封装小题
@@ -1491,7 +1494,11 @@ public class PaperServiceImpl implements PaperService{
                 		question.setQuesBodyWord(setSubQuesNum(question.getQuesBodyWord(), minNum++));
                 		question.setQuesAnswerWord(setAnswerNum(question.getQuesAnswerWord()));
                 		if(paperDetail.getFirstScore() == null){
-                			paperDetail.setFirstScore(question.getScore());
+                			if(question.getScore() == null){
+                				paperDetail.setFirstScore(0d);
+                			}else {
+                				paperDetail.setFirstScore(question.getScore());
+							}
                 		}
                 	}else {
                 		List<Question> subQuesList = question.getSubQuestions();
@@ -1503,7 +1510,11 @@ public class PaperServiceImpl implements PaperService{
                             	subQues.setQuesBodyWord(setSubQuesNum(subQues.getQuesBodyWord(), index++));
                             	subQues.setQuesAnswerWord(setAnswerNum(subQues.getQuesAnswerWord()));
                             	if(paperDetail.getFirstScore() == null){
-                        			paperDetail.setFirstScore(subQues.getScore());
+                            		if(subQues.getScore() == null){
+                            			paperDetail.setFirstScore(0d);
+                            		}else {
+                            			paperDetail.setFirstScore(subQues.getScore());
+									}
                         		}
                             	List<QuesOption> subOptionList = subQues.getQuesOptions();
         						if (subOptionList != null && subOptionList.size() > 0) {