导题报错BUG修改

cqb-paper/src/main/java/com/qmth/cqb/paper/dto/PaperDetailUnitExp.java

@@ -1,9 +1,14 @@
 package com.qmth.cqb.paper.dto;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+
 import com.qmth.cqb.question.model.Question;
 
-import java.io.Serializable;
+import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
 
 /**
  * 试卷小题导出dto Created by songyue on 17/3/15.
@@ -24,6 +29,10 @@ public class PaperDetailUnitExp implements Serializable {
 
     private String quesId;// 关联试题Id
 
+    private String subScores;// 对应套题的情况下，各子题的分数分布
+
+    private List<Double> subScoreList;
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
@@ -76,4 +85,34 @@ public class PaperDetailUnitExp implements Serializable {
         this.quesId = quesId;
     }
 
+    public String getSubScores() {
+        return subScores;
+    }
+
+    public void setSubScores(String subScores) {
+        this.subScores = subScores;
+    }
+
+    public void setSubScoreList(List<Double> subScoreList) {
+        if (getSubScoreList() != null && getSubScoreList().size() > 0) {
+            this.subScoreList = getSubScoreList();
+        } else {
+            this.subScoreList = null;
+        }
+
+    }
+
+    public List<Double> getSubScoreList() {
+        List<Double> list = new ArrayList<>();
+        String[] values = StringUtils.split(StringUtils.trimToEmpty(this.subScores), ",");
+        for (String value : values) {
+            try {
+                list.add(Double.valueOf(value));
+            } catch (Exception e) {
+
+            }
+        }
+        return list;
+    }
+
 }

cqb-question-resource/src/main/java/com/qmth/cqb/question/service/QuesService.java

@@ -1,12 +1,11 @@
 package com.qmth.cqb.question.service;
 
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
-import com.qmth.cqb.question.dao.QuesRepo;
-import com.qmth.cqb.question.model.QuesOption;
-import com.qmth.cqb.question.model.Question;
-import com.qmth.cqb.question.model.QuestionSearchCondition;
-import com.qmth.cqb.utils.BeanCopierUtil;
-import com.qmth.cqb.utils.CommonUtils;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.Page;
@@ -14,10 +13,14 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
+import com.qmth.cqb.question.dao.QuesRepo;
+import com.qmth.cqb.question.model.QuesOption;
+import com.qmth.cqb.question.model.Question;
+import com.qmth.cqb.question.model.QuestionSearchCondition;
+import com.qmth.cqb.utils.BeanCopierUtil;
+import com.qmth.cqb.utils.CommonUtils;
+
+import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
 
 /**
  * Created by songyue on 16/12/28.
@@ -104,7 +107,10 @@ public class QuesService {
      */
     public Question saveQues(Question question) {
         String now = CommonUtils.getCurDateTime();
-        Question saveQues = quesRepo.findOne(question.getId());
+        Question saveQues = null;
+        if (StringUtils.isNotEmpty(question.getId())) {
+            saveQues = quesRepo.findOne(question.getId());
+        }
         if (saveQues == null) {
             question.setCreateTime(now);
             question.setUpdateTime(now);
@@ -157,9 +163,9 @@ public class QuesService {
     public Page<Question> findByIdExclude(Set<String> idSet, String courseNo, QuesStructType quesType, int curPage,
             int pageSize) {
         Pageable page = new PageRequest(curPage - 1, pageSize);
-        Page<Question> list = quesType != null ?
-                quesRepo.findByIdNotInAndCourseNoAndQuestionType(idSet, courseNo, quesType, page) :
-                quesRepo.findByIdNotInAndCourseNo(idSet, courseNo, page);
+        Page<Question> list = quesType != null
+                ? quesRepo.findByIdNotInAndCourseNoAndQuestionType(idSet, courseNo, quesType, page)
+                : quesRepo.findByIdNotInAndCourseNo(idSet, courseNo, page);
         for (Question question : list) {
             formatQues(question);
         }