bug fix

themis-business/src/main/java/com/qmth/themis/business/bean/admin/OpenRecordAnswerBean.java

@@ -1,7 +1,5 @@
 package com.qmth.themis.business.bean.admin;
 
-import com.alibaba.fastjson.JSONArray;
-import com.qmth.themis.business.util.JacksonUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -10,47 +8,64 @@ import java.util.List;
 @ApiModel("开放接口-待评卷考试记录答案")
 public class OpenRecordAnswerBean {
 
-	@ApiModelProperty("大题号")
-	private Integer mainNumber;
+    @ApiModelProperty("大题号")
+    private Integer mainNumber;
 
-	@ApiModelProperty("小题号")
-	private Integer subNumber;
+    @ApiModelProperty("小题号")
+    private Integer subNumber;
 
-	@ApiModelProperty("套题子题序号")
-	private Integer subIndex;
+    @ApiModelProperty("套题子题序号")
+    private Integer subIndex;
 
-	@ApiModelProperty("作答")
-	private List<String> answer;
+    @ApiModelProperty("作答")
+    private List<String> answer;
 
-	public Integer getMainNumber() {
-		return mainNumber;
-	}
+    public OpenRecordAnswerBean() {
 
-	public void setMainNumber(Integer mainNumber) {
-		this.mainNumber = mainNumber;
-	}
+    }
 
-	public Integer getSubNumber() {
-		return subNumber;
-	}
+    public OpenRecordAnswerBean(Integer mainNumber, Integer subNumber, Integer subIndex, List<String> answer) {
+        this.mainNumber = mainNumber;
+        this.subNumber = subNumber;
+        this.subIndex = subIndex;
+        this.answer = answer;
+    }
 
-	public void setSubNumber(Integer subNumber) {
-		this.subNumber = subNumber;
-	}
+    public OpenRecordAnswerBean(Integer mainNumber, Integer subNumber, Integer subIndex) {
+        this.mainNumber = mainNumber;
+        this.subNumber = subNumber;
+        this.subIndex = subIndex;
+    }
 
-	public Integer getSubIndex() {
-		return subIndex;
-	}
+    public Integer getMainNumber() {
+        return mainNumber;
+    }
 
-	public void setSubIndex(Integer subIndex) {
-		this.subIndex = subIndex;
-	}
+    public void setMainNumber(Integer mainNumber) {
+        this.mainNumber = mainNumber;
+    }
 
-	public List<String> getAnswer() {
-		return answer;
-	}
+    public Integer getSubNumber() {
+        return subNumber;
+    }
 
-	public void setAnswer(List<String> answer) {
-		this.answer = answer;
-	}
+    public void setSubNumber(Integer subNumber) {
+        this.subNumber = subNumber;
+    }
+
+    public Integer getSubIndex() {
+        return subIndex;
+    }
+
+    public void setSubIndex(Integer subIndex) {
+        this.subIndex = subIndex;
+    }
+
+    public List<String> getAnswer() {
+        return answer;
+    }
+
+    public void setAnswer(List<String> answer) {
+        this.answer = answer;
+    }
 }

themis-business/src/main/java/com/qmth/themis/business/service/impl/TEOpenServiceImpl.java

@@ -225,15 +225,12 @@ public class TEOpenServiceImpl implements TEOpenService {
                     List<OpenRecordAnswerTempBean> answersTemp = examAnswerService.findByExamRecordId(record.getId());
                     List<OpenRecordAnswerBean> answers = new ArrayList<>(answersTemp.size());
                     answersTemp.forEach(s -> {
-                        OpenRecordAnswerBean openRecordAnswerBean = new OpenRecordAnswerBean();
-                        openRecordAnswerBean.setMainNumber(s.getMainNumber());
-                        openRecordAnswerBean.setSubIndex(s.getSubIndex());
-                        openRecordAnswerBean.setSubNumber(s.getSubNumber());
+                        OpenRecordAnswerBean openRecordAnswerBean = new OpenRecordAnswerBean(s.getMainNumber(), s.getSubNumber(), s.getSubIndex());
                         try {
                             openRecordAnswerBean.setAnswer(JSONArray.parseArray(s.getAnswer()).toJavaList(String.class));
                         } catch (Exception e) {
                             log.error("错误答案:{}", s.getAnswer(), e);
-                            openRecordAnswerBean.setAnswer(Arrays.asList(s.getAnswer()));
+                            openRecordAnswerBean.setAnswer(Objects.nonNull(s.getAnswer()) ? Arrays.asList(s.getAnswer()) : null);
                             e.printStackTrace();
                         }
                         answers.add(openRecordAnswerBean);