|
@@ -3,6 +3,7 @@ package com.qmth.cqb.paper.service.export;
|
|
|
import java.io.File;
|
|
|
import java.util.List;
|
|
|
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
@@ -35,6 +36,9 @@ public class TjdxExportPaperService extends ExportPaperAbstractService {
|
|
|
if(examType.equals("offLine")){
|
|
|
//生成考试说明的word片段
|
|
|
WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.createPackage();
|
|
|
+ if(StringUtils.isBlank(paperExp.getExamRemark())){
|
|
|
+ paperExp.setExamRemark("<p></p>");
|
|
|
+ }
|
|
|
paperExp.setExamRemarkWord(DocxProcessUtil.html2Docx(wordMLPackage, CommonUtils.formatHtml(paperExp.getExamRemark())));
|
|
|
DocxProcessUtil.exportWordNew(paperExp, file,TJDX_OUTLINE_TEMPLATE_PAPER);
|
|
|
}else {
|