|
@@ -36,10 +36,7 @@ import tk.mybatis.mapper.entity.Condition;
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import java.time.LocalDateTime;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
@@ -197,8 +194,8 @@ public class QuestionGroupServiceImpl extends IBaseServiceImpl<QuestionGroupEnti
|
|
|
}
|
|
|
log.info("题组名称:{}", groupTitle );
|
|
|
|
|
|
- // 重第三行读取,直接读取题目跟选项
|
|
|
- HashMap<String, TopicDto> topicMap = new HashMap<>();
|
|
|
+ // 从第三行读取,直接读取题目跟选项, 使用LinkedHashMap区分顺序
|
|
|
+ LinkedHashMap<String, TopicDto> topicMap = new LinkedHashMap<>();
|
|
|
String topic = null;
|
|
|
for (int i = 2; i < read.size(); i++) {
|
|
|
List<Object> list = read.get(i);
|
|
@@ -248,9 +245,9 @@ public class QuestionGroupServiceImpl extends IBaseServiceImpl<QuestionGroupEnti
|
|
|
|
|
|
|
|
|
|
|
|
- Map<String, String> options = topicDto.getOptions();
|
|
|
+ LinkedHashMap<String, String> options = topicDto.getOptions();
|
|
|
if (CollectionUtil.isEmpty(options)){
|
|
|
- options = new HashMap<>();
|
|
|
+ options = new LinkedHashMap<>();
|
|
|
}
|
|
|
options.put(random, option);
|
|
|
|
|
@@ -288,6 +285,8 @@ public class QuestionGroupServiceImpl extends IBaseServiceImpl<QuestionGroupEnti
|
|
|
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 解析选项
|
|
|
* @param options
|