|
|
@@ -346,7 +346,8 @@ public class ExamRecordCloudServiceProvider extends ControllerSupport implements
|
|
|
String mainBody = questionStructure.getBody();//主题干
|
|
|
if (!StringUtils.isNullOrEmpty(mainBody)) {
|
|
|
|
|
|
-
|
|
|
+ //当前order对应的小题在此套题中的索引
|
|
|
+ int currentIndex = 0;
|
|
|
for (int j = 0; j < questionUnits.size(); j++) {
|
|
|
|
|
|
//判断当前套题中的小题是否为主观题，只有主观题才需要添加进来
|
|
|
@@ -354,8 +355,9 @@ public class ExamRecordCloudServiceProvider extends ControllerSupport implements
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
- //拼装第一条套题下的小题，（本条数据是完整的）,相当于全部添国，无需更新
|
|
|
+ //拼装第一条套题下的小题，（本条数据是完整的）,相当于全部添加，无需更新
|
|
|
if (StringUtils.isNullOrEmpty(subjectiveAnswerBean.getBody())) {
|
|
|
+ currentIndex = j;
|
|
|
//第1个子主观题的题干（不一定是套题的第一题）
|
|
|
String subBody0 = questionUnits.get(j).getBody();
|
|
|
|
|
|
@@ -366,7 +368,7 @@ public class ExamRecordCloudServiceProvider extends ControllerSupport implements
|
|
|
else {
|
|
|
ToBeMarkSubjectiveAnswerBean nextSubjectiveAnswerBean = new ToBeMarkSubjectiveAnswerBean();
|
|
|
nextSubjectiveAnswerBean.setQuestionId(questionId);
|
|
|
- nextSubjectiveAnswerBean.setOrder(order + j);
|
|
|
+ nextSubjectiveAnswerBean.setOrder(order + (j - currentIndex));
|
|
|
nextSubjectiveAnswerBean.setBody(mainBody + questionUnits.get(j).getBody());//构建题干
|
|
|
subjectiveAnswerBeanList.add(nextSubjectiveAnswerBean);
|
|
|
}
|
lideyin