|
|
@@ -2,6 +2,7 @@ package com.qmth.teachcloud.mark.utils;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
+import com.qmth.teachcloud.common.contant.SystemConstant;
|
|
|
import com.qmth.teachcloud.common.enums.QuestionType;
|
|
|
import com.qmth.teachcloud.mark.bean.vo.parseCard.*;
|
|
|
import org.apache.commons.collections4.CollectionUtils;
|
|
|
@@ -75,7 +76,7 @@ public class CardParseUtils {
|
|
|
}
|
|
|
|
|
|
Map<String, String> answerMap = new HashMap<>();
|
|
|
- if(jsonObject.containsKey("answers")){
|
|
|
+ if (jsonObject.containsKey("answers")) {
|
|
|
answerMap = JSON.parseObject(jsonObject.getString("answers"), Map.class);
|
|
|
}
|
|
|
List<Struct> structList = new ArrayList<>();
|
|
|
@@ -86,11 +87,11 @@ public class CardParseUtils {
|
|
|
struct.setqType(structData.getqType());
|
|
|
struct.setMainNumber(structData.getMainNumber());
|
|
|
struct.setSubNumber(startNumber + i1);
|
|
|
- if(!answerMap.isEmpty()) {
|
|
|
+ if (!answerMap.isEmpty()) {
|
|
|
String key = struct.getMainNumber() + "-" + struct.getSubNumber();
|
|
|
- if(answerMap.containsKey(key)){
|
|
|
+ if (answerMap.containsKey(key)) {
|
|
|
Answer answer = JSON.parseObject(JSON.toJSONString(answerMap.get(key)), Answer.class);
|
|
|
- struct.setAnswer(answer.getAnswer());
|
|
|
+ struct.setAnswer(answer.getAnswer().replaceAll(",", ""));
|
|
|
struct.setScore(answer.getScore());
|
|
|
}
|
|
|
}
|
xiaofei