|
@@ -496,20 +496,27 @@ public class ExportPaperUtil {
|
|
|
|
|
|
private static void disposeQuestion(Question qes, ExportTempDataDto dto) {
|
|
|
if (qes != null) {
|
|
|
+ //处理题干
|
|
|
List<JSection> slist1 = getSections(qes.getQuesBody(),false);
|
|
|
- if (slist1 != null && slist1.size() > 0) {
|
|
|
- if (qes.getSubQuestions() == null || qes.getSubQuestions().size() == 0) {// 套题题干不加题号
|
|
|
- dto.setSubNum(dto.getSubNum() + 1);
|
|
|
- SectionElement se = new SectionElement();
|
|
|
- se.setType(ELEMENT_TYPE_TEXT);
|
|
|
- se.setValue(dto.getSubNum() + ".");
|
|
|
- slist1.get(0).getElements().add(0, se);
|
|
|
- }
|
|
|
-
|
|
|
- htmlToDoc(slist1, dto);
|
|
|
- qes.setQuesBodyWord(getQuestionDoc(slist1));
|
|
|
+ if (slist1 == null||slist1.size()==0) {
|
|
|
+ slist1=new ArrayList<JSection>();
|
|
|
+ JSection sec=new JSection();
|
|
|
+ List<SectionElement> ses=new ArrayList<SectionElement>();
|
|
|
+ sec.setElements(ses);
|
|
|
+ slist1.add(sec);
|
|
|
}
|
|
|
+ if (qes.getSubQuestions() == null || qes.getSubQuestions().size() == 0) {// 套题题干不加题号
|
|
|
+ dto.setSubNum(dto.getSubNum() + 1);
|
|
|
+ SectionElement se = new SectionElement();
|
|
|
+ se.setType(ELEMENT_TYPE_TEXT);
|
|
|
+ se.setValue(dto.getSubNum() + ".");
|
|
|
+ slist1.get(0).getElements().add(0, se);
|
|
|
+ }
|
|
|
+
|
|
|
+ htmlToDoc(slist1, dto);
|
|
|
+ qes.setQuesBodyWord(getQuestionDoc(slist1));
|
|
|
|
|
|
+ //处理选项
|
|
|
if (qes.getQuesOptions() != null && qes.getQuesOptions().size() > 0) {
|
|
|
int index = 0;
|
|
|
for (QuesOption qo : qes.getQuesOptions()) {
|
|
@@ -526,6 +533,8 @@ public class ExportPaperUtil {
|
|
|
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ //处理答案
|
|
|
List<JSection> slist3 = getSections(qes.getQuesAnswer());
|
|
|
if (slist3 == null||slist3.size()==0) {
|
|
|
slist3=new ArrayList<JSection>();
|