replace to (OFFLINE.equals(examType))

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/BjhkExportPaperService.java

@@ -31,13 +31,12 @@ public class BjhkExportPaperService extends ExportPaperAbstractService {
         if (paperExp != null) {
             String paperfileName = paperExp.getName() + "_" + paperExp.getCourseNo() + "_" + ExamFileType.PAPER.getName() + DOCX_SUFFIX;
             File file = new File(TEMP_FILE_EXP + File.separator + zipFileName + File.separator + paperfileName);
-            if (examType.equals("offLine")) {
+            if (OFFLINE.equals(examType)) {
                 WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.createPackage();
                 paperExp.setExamRemarkWord(DocxProcessUtil.html2Docx(wordMLPackage, CommonUtils.formatHtml(paperExp.getExamRemark())));
-                DocxProcessUtil.exportWordNew(paperExp, file, BJHK_TMPLATE_PAPER);
-            } else {
-                DocxProcessUtil.exportWordNew(paperExp, file, BJHK_TMPLATE_PAPER);
             }
+
+            DocxProcessUtil.exportWordNew(paperExp, file, BJHK_TMPLATE_PAPER);
             DocxProcessUtil.processImage(zipFileName + File.separator + paperfileName, getPkgList(paperId));
             //下载音频
             super.downloadAudio(paperExp, zipFileName);

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/BjjtExportPaperService.java

@@ -24,11 +24,9 @@ public class BjjtExportPaperService extends ExportPaperAbstractService {
         if (paperExp != null) {
             String paperfileName = paperExp.getName() + "_" + paperExp.getCourseNo() + "_" + ExamFileType.PAPER.getName() + DOCX_SUFFIX;
             File file = new File(TEMP_FILE_EXP + File.separator + zipFileName + File.separator + paperfileName);
-            if (examType.equals("offLine")) {
-                DocxProcessUtil.exportWordNew(paperExp, file, BJJT_TMPLATE_PAPER);
-            } else {
-                DocxProcessUtil.exportWordNew(paperExp, file, BJJT_TMPLATE_PAPER);
-            }
+
+            DocxProcessUtil.exportWordNew(paperExp, file, BJJT_TMPLATE_PAPER);
+
             DocxProcessUtil.processImage(zipFileName + File.separator + paperfileName, getPkgList(paperId));
         }
     }

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/BjsfExportPaperService.java

@@ -31,13 +31,12 @@ public class BjsfExportPaperService extends ExportPaperAbstractService {
         if (paperExp != null) {
             String paperfileName = paperExp.getName() + "_" + paperExp.getCourseNo() + "_" + ExamFileType.PAPER.getName() + DOCX_SUFFIX;
             File file = new File(TEMP_FILE_EXP + File.separator + zipFileName + File.separator + paperfileName);
-            if (examType.equals("offLine")) {
+            if (OFFLINE.equals(examType)) {
                 WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.createPackage();
                 paperExp.setExamRemarkWord(DocxProcessUtil.html2Docx(wordMLPackage, CommonUtils.formatHtml(paperExp.getExamRemark())));
-                DocxProcessUtil.exportWordNew(paperExp, file, BJSF_TMPLATE_PAPER);
-            } else {
-                DocxProcessUtil.exportWordNew(paperExp, file, BJSF_TMPLATE_PAPER);
             }
+            DocxProcessUtil.exportWordNew(paperExp, file, BJSF_TMPLATE_PAPER);
+
             DocxProcessUtil.processImage(zipFileName + File.separator + paperfileName, getPkgList(paperId));
             //下载音频
             super.downloadAudio(paperExp, zipFileName);

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/CqdxExportPaperService.java

@@ -34,13 +34,12 @@ public class CqdxExportPaperService extends ExportPaperAbstractService {
         if (paperExp != null) {
             String paperfileName = paperExp.getName() + "_" + paperExp.getCourseNo() + "_" + ExamFileType.PAPER.getName() + DOCX_SUFFIX;
             File file = new File(TEMP_FILE_EXP + File.separator + zipFileName + File.separator + paperfileName);
-            if (examType.equals("offLine")) {
+            if (OFFLINE.equals(examType)) {
                 WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.createPackage();
                 paperExp.setExamRemarkWord(DocxProcessUtil.html2Docx(wordMLPackage, CommonUtils.formatHtml(paperExp.getExamRemark())));
-                DocxProcessUtil.exportWordNew(paperExp, file, CQDX_TMPLATE_PAPER);
-            } else {
-                DocxProcessUtil.exportWordNew(paperExp, file, CQDX_TMPLATE_PAPER);
             }
+            DocxProcessUtil.exportWordNew(paperExp, file, CQDX_TMPLATE_PAPER);
+
             DocxProcessUtil.processImage(zipFileName + File.separator + paperfileName, getPkgList(paperId));
             //下载音频
             super.downloadAudio(paperExp, zipFileName);

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/CugbExportPaperService.java

@@ -45,16 +45,12 @@ public class CugbExportPaperService extends ExportPaperAbstractService {
         if (paperExp != null) {
             String paperfileName = paperExp.getName() + "_" + paperExp.getCourseNo() + "_" + ExamFileType.PAPER.getName() + DOCX_SUFFIX;
             File file = new File(TEMP_FILE_EXP + File.separator + zipFileName + File.separator + paperfileName);
-            if (examType.equals("offLine")) {
+            if (OFFLINE.equals(examType)) {
                 WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.createPackage();
                 paperExp.setExamRemarkWord(DocxProcessUtil.html2Docx(wordMLPackage, CommonUtils.formatHtml(paperExp.getExamRemark())));
-                DocxProcessUtil.exportWordNew(paperExp, file, CUGB_TMPLATE_PAPER);
-            } else {
-                long docxTime = System.currentTimeMillis();
-                DocxProcessUtil.exportWordNew(paperExp, file, CUGB_TMPLATE_PAPER);
-                long docxEndTime = System.currentTimeMillis();
-                log.debug("处理word文字耗时:" + (docxEndTime - docxTime) + "ms");
             }
+            DocxProcessUtil.exportWordNew(paperExp, file, CUGB_TMPLATE_PAPER);
+
             long docxImgTime = System.currentTimeMillis();
             DocxProcessUtil.processImage(zipFileName + File.separator + paperfileName, getPkgList(paperId));
             long docxImgEndTime = System.currentTimeMillis();

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/DbsfExportPaperService.java

@@ -31,13 +31,12 @@ public class DbsfExportPaperService extends ExportPaperAbstractService {
         if (paperExp != null) {
             String paperfileName = paperExp.getName() + "_" + paperExp.getCourseNo() + "_" + ExamFileType.PAPER.getName() + DOCX_SUFFIX;
             File file = new File(TEMP_FILE_EXP + File.separator + zipFileName + File.separator + paperfileName);
-            if (examType.equals("offLine")) {
+            if (OFFLINE.equals(examType)) {
                 WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.createPackage();
                 paperExp.setExamRemarkWord(DocxProcessUtil.html2Docx(wordMLPackage, CommonUtils.formatHtml(paperExp.getExamRemark())));
-                DocxProcessUtil.exportWordNew(paperExp, file, DBSF_TMPLATE_PAPER);
-            } else {
-                DocxProcessUtil.exportWordNew(paperExp, file, DBSF_TMPLATE_PAPER);
             }
+
+            DocxProcessUtil.exportWordNew(paperExp, file, DBSF_TMPLATE_PAPER);
             DocxProcessUtil.processImage(zipFileName + File.separator + paperfileName, getPkgList(paperId));
             //下载音频
             super.downloadAudio(paperExp, zipFileName);

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/ExportPaperAbstractService.java

@@ -119,6 +119,8 @@ public abstract class ExportPaperAbstractService {
      */
     private static final String UNDERSCORE = "_";
 
+    protected static final String OFFLINE = "offLine";
+
     //陕西师范模板
     protected static Template SXSF_TEMPLATE_PAPER;
     protected static Template SXSF_TEMPLATE_ANSWER;

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/FdsfExportPaperService.java

@@ -44,16 +44,13 @@ public class FdsfExportPaperService extends ExportPaperAbstractService {
         if (paperExp != null) {
             String paperfileName = paperExp.getName() + "_" + paperExp.getCourseNo() + "_" + ExamFileType.PAPER.getName() + DOCX_SUFFIX;
             File file = new File(TEMP_FILE_EXP + File.separator + zipFileName + File.separator + paperfileName);
-            if (examType.equals("offLine")) {
+            if (OFFLINE.equals(examType)) {
                 WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.createPackage();
                 paperExp.setExamRemarkWord(DocxProcessUtil.html2Docx(wordMLPackage, CommonUtils.formatHtml(paperExp.getExamRemark())));
-                DocxProcessUtil.exportWordNew(paperExp, file, FDSF_TMPLATE_PAPER);
-            } else {
-                long docxTime = System.currentTimeMillis();
-                DocxProcessUtil.exportWordNew(paperExp, file, FDSF_TMPLATE_PAPER);
-                long docxEndTime = System.currentTimeMillis();
-                log.debug("处理word文字耗时:" + (docxEndTime - docxTime) + "ms");
             }
+
+            DocxProcessUtil.exportWordNew(paperExp, file, FDSF_TMPLATE_PAPER);
+
             long docxImgTime = System.currentTimeMillis();
             DocxProcessUtil.processImage(zipFileName + File.separator + paperfileName, getPkgList(paperId));
             long docxImgEndTime = System.currentTimeMillis();

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/FjsfExportPaperService.java

@@ -39,16 +39,13 @@ public class FjsfExportPaperService extends ExportPaperAbstractService {
         if (paperExp != null) {
             String paperfileName = paperExp.getName() + "_" + paperExp.getCourseNo() + "_" + ExamFileType.PAPER.getName() + DOCX_SUFFIX;
             File file = new File(TEMP_FILE_EXP + File.separator + zipFileName + File.separator + paperfileName);
-            if (examType.equals("offLine")) {
+            if (OFFLINE.equals(examType)) {
                 WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.createPackage();
                 paperExp.setExamRemarkWord(DocxProcessUtil.html2Docx(wordMLPackage, CommonUtils.formatHtml(paperExp.getExamRemark())));
-                DocxProcessUtil.exportWordNew(paperExp, file, FJSF_TMPLATE_PAPER);
-            } else {
-                long docxTime = System.currentTimeMillis();
-                DocxProcessUtil.exportWordNew(paperExp, file, FJSF_TMPLATE_PAPER);
-                long docxEndTime = System.currentTimeMillis();
-                log.debug("处理word文字耗时:" + (docxEndTime - docxTime) + "ms");
             }
+
+            DocxProcessUtil.exportWordNew(paperExp, file, FJSF_TMPLATE_PAPER);
+
             long docxImgTime = System.currentTimeMillis();
             DocxProcessUtil.processImage(zipFileName + File.separator + paperfileName, getPkgList(paperId));
             long docxImgEndTime = System.currentTimeMillis();

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/HnsfExportPaperService.java

@@ -24,11 +24,9 @@ public class HnsfExportPaperService extends ExportPaperAbstractService {
         if (paperExp != null) {
             String paperfileName = paperExp.getName() + "_" + paperExp.getCourseNo() + "_" + ExamFileType.PAPER.getName() + DOCX_SUFFIX;
             File file = new File(TEMP_FILE_EXP + File.separator + zipFileName + File.separator + paperfileName);
-            if (examType.equals("offLine")) {
-                DocxProcessUtil.exportWordNew(paperExp, file, HNSF_TMPLATE_PAPER);
-            } else {
-                DocxProcessUtil.exportWordNew(paperExp, file, HNSF_TMPLATE_PAPER);
-            }
+
+            DocxProcessUtil.exportWordNew(paperExp, file, HNSF_TMPLATE_PAPER);
+
             DocxProcessUtil.processImage(zipFileName + File.separator + paperfileName, getPkgList(paperId));
         }
     }

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/NkdxExportPaperService.java

@@ -39,16 +39,14 @@ public class NkdxExportPaperService extends ExportPaperAbstractService {
         if (paperExp != null) {
             String paperfileName = paperExp.getName() + "_" + paperExp.getCourseNo() + "_" + ExamFileType.PAPER.getName() + DOCX_SUFFIX;
             File file = new File(TEMP_FILE_EXP + File.separator + zipFileName + File.separator + paperfileName);
-            if (examType.equals("offLine")) {
+
+            if (OFFLINE.equals(examType)) {
                 WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.createPackage();
                 paperExp.setExamRemarkWord(DocxProcessUtil.html2Docx(wordMLPackage, CommonUtils.formatHtml(paperExp.getExamRemark())));
-                DocxProcessUtil.exportWordNew(paperExp, file, NKDX_TMPLATE_PAPER);
-            } else {
-                long docxTime = System.currentTimeMillis();
-                DocxProcessUtil.exportWordNew(paperExp, file, NKDX_TMPLATE_PAPER);
-                long docxEndTime = System.currentTimeMillis();
-                log.debug("处理word文字耗时:" + (docxEndTime - docxTime) + "ms");
             }
+
+            DocxProcessUtil.exportWordNew(paperExp, file, NKDX_TMPLATE_PAPER);
+
             long docxImgTime = System.currentTimeMillis();
             DocxProcessUtil.processImage(zipFileName + File.separator + paperfileName, getPkgList(paperId));
             long docxImgEndTime = System.currentTimeMillis();

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/SxsfExportPaperService.java

@@ -34,11 +34,12 @@ public class SxsfExportPaperService extends ExportPaperAbstractService {
             String paperfileName = paperExp.getName() + "_" + paperExp.getCourseNo() + "_" + ExamFileType.PAPER.getName() + DOCX_SUFFIX;
             File file = new File(TEMP_FILE_EXP + File.separator + zipFileName + File.separator + paperfileName);
             List<WordprocessingMLPackage> wordPackages = getPkgList(paperId);
-            if (examType.equals("offLine")) {
+            if (OFFLINE.equals(examType)) {
                 WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.createPackage();
                 if (StringUtils.isBlank(paperExp.getExamRemark())) {
                     paperExp.setExamRemark("<p></p>");
                 }
+
                 String examRemark = ImageUtils.reSizeImg(paperExp.getExamRemark());
                 paperExp.setExamRemarkWord(DocxProcessUtil.html2Docx(wordMLPackage, CommonUtils.formatHtml(examRemark)));
                 DocxProcessUtil.exportWordNew(paperExp, file, SXSF_OUTLINE_TEMPLATE_PAPER);
@@ -48,6 +49,7 @@ public class SxsfExportPaperService extends ExportPaperAbstractService {
             } else {
                 DocxProcessUtil.exportWordNew(paperExp, file, SXSF_TEMPLATE_PAPER);
             }
+
             DocxProcessUtil.processImage(zipFileName + File.separator + paperfileName, wordPackages);
             //下载音频
             super.downloadAudio(paperExp, zipFileName);

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/TjdxExportPaperService.java

@@ -33,15 +33,18 @@ public class TjdxExportPaperService extends ExportPaperAbstractService {
         if (paperExp != null) {
             String paperfileName = paperExp.getName() + "_" + paperExp.getCourseNo() + "_" + ExamFileType.PAPER.getName() + DOCX_SUFFIX;
             File file = new File(TEMP_FILE_EXP + File.separator + zipFileName + File.separator + paperfileName);
+
             List<WordprocessingMLPackage> wordPackages = getPkgList(paperId);
-            if (examType.equals("offLine")) {
+            if (OFFLINE.equals(examType)) {
                 //生成考试说明的word片段
                 WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.createPackage();
                 if (StringUtils.isBlank(paperExp.getExamRemark())) {
                     paperExp.setExamRemark("<p></p>");
                 }
+
                 String examRemark = ImageUtils.reSizeImg(paperExp.getExamRemark());
                 paperExp.setExamRemarkWord(DocxProcessUtil.html2Docx(wordMLPackage, CommonUtils.formatHtml(examRemark)));
+
                 DocxProcessUtil.exportWordNew(paperExp, file, TJDX_OUTLINE_TEMPLATE_PAPER);
                 if (DocxProcessUtil.hasImage(examRemark)) {
                     wordPackages.add(wordMLPackage);
@@ -49,6 +52,7 @@ public class TjdxExportPaperService extends ExportPaperAbstractService {
             } else {
                 DocxProcessUtil.exportWordNew(paperExp, file, TJDX_TEMPLATE_PAPER);
             }
+
             DocxProcessUtil.processImage(zipFileName + File.separator + paperfileName, wordPackages);
             //下载音频
             super.downloadAudio(paperExp, zipFileName);

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/WheqxExportPaperService.java

@@ -45,16 +45,13 @@ public class WheqxExportPaperService extends ExportPaperAbstractService {
         if (paperExp != null) {
             String paperfileName = paperExp.getName() + "_" + paperExp.getCourseNo() + "_" + ExamFileType.PAPER.getName() + DOCX_SUFFIX;
             File file = new File(TEMP_FILE_EXP + File.separator + zipFileName + File.separator + paperfileName);
-            if (examType.equals("offLine")) {
+            if (OFFLINE.equals(examType)) {
                 WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.createPackage();
                 paperExp.setExamRemarkWord(DocxProcessUtil.html2Docx(wordMLPackage, CommonUtils.formatHtml(paperExp.getExamRemark())));
-                DocxProcessUtil.exportWordNew(paperExp, file, WHEQX_TMPLATE_PAPER);
-            } else {
-                long docxTime = System.currentTimeMillis();
-                DocxProcessUtil.exportWordNew(paperExp, file, WHEQX_TMPLATE_PAPER);
-                long docxEndTime = System.currentTimeMillis();
-                log.debug("处理word文字耗时:" + (docxEndTime - docxTime) + "ms");
             }
+
+            DocxProcessUtil.exportWordNew(paperExp, file, WHEQX_TMPLATE_PAPER);
+
             long docxImgTime = System.currentTimeMillis();
             DocxProcessUtil.processImage(zipFileName + File.separator + paperfileName, getPkgList(paperId));
             long docxImgEndTime = System.currentTimeMillis();

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/XnjdExportPaperService.java

@@ -34,11 +34,12 @@ public class XnjdExportPaperService extends ExportPaperAbstractService {
             String paperfileName = paperExp.getName() + "_" + paperExp.getCourseNo() + "_" + ExamFileType.PAPER.getName() + DOCX_SUFFIX;
             File file = new File(TEMP_FILE_EXP + File.separator + zipFileName + File.separator + paperfileName);
             List<WordprocessingMLPackage> wordPackages = getPkgList(paperId);
-            if (examType.equals("offLine")) {
+            if (OFFLINE.equals(examType)) {
                 WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.createPackage();
                 if (StringUtils.isBlank(paperExp.getExamRemark())) {
                     paperExp.setExamRemark("<p></p>");
                 }
+
                 String examRemark = ImageUtils.reSizeImg(paperExp.getExamRemark());
                 paperExp.setExamRemarkWord(DocxProcessUtil.html2Docx(wordMLPackage, CommonUtils.formatHtml(examRemark)));
                 DocxProcessUtil.exportWordNew(paperExp, file, XNJD_OUTLINE_TEMPLATE_PAPER);
@@ -48,6 +49,7 @@ public class XnjdExportPaperService extends ExportPaperAbstractService {
             } else {
                 DocxProcessUtil.exportWordNew(paperExp, file, XNJD_TEMPLATE_PAPER);
             }
+
             DocxProcessUtil.processImage(zipFileName + File.separator + paperfileName, wordPackages);
             //下载音频
             super.downloadAudio(paperExp, zipFileName);

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/YkdxExportPaperService.java

@@ -24,11 +24,8 @@ public class YkdxExportPaperService extends ExportPaperAbstractService {
         if (paperExp != null) {
             String paperfileName = paperExp.getName() + "_" + paperExp.getCourseNo() + "_" + ExamFileType.PAPER.getName() + DOCX_SUFFIX;
             File file = new File(TEMP_FILE_EXP + File.separator + zipFileName + File.separator + paperfileName);
-            if (examType.equals("offLine")) {
-                DocxProcessUtil.exportWordNew(paperExp, file, YKDX_TMPLATE_PAPER);
-            } else {
-                DocxProcessUtil.exportWordNew(paperExp, file, YKDX_TMPLATE_PAPER);
-            }
+
+            DocxProcessUtil.exportWordNew(paperExp, file, YKDX_TMPLATE_PAPER);
             DocxProcessUtil.processImage(zipFileName + File.separator + paperfileName, getPkgList(paperId));
         }
     }

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/ZgddbExportPaperService.java

@@ -31,13 +31,12 @@ public class ZgddbExportPaperService extends ExportPaperAbstractService {
         if (paperExp != null) {
             String paperfileName = paperExp.getName() + "_" + paperExp.getCourseNo() + "_" + ExamFileType.PAPER.getName() + DOCX_SUFFIX;
             File file = new File(TEMP_FILE_EXP + File.separator + zipFileName + File.separator + paperfileName);
-            if (examType.equals("offLine")) {
+            if (OFFLINE.equals(examType)) {
                 WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.createPackage();
                 paperExp.setExamRemarkWord(DocxProcessUtil.html2Docx(wordMLPackage, CommonUtils.formatHtml(paperExp.getExamRemark())));
-                DocxProcessUtil.exportWordNew(paperExp, file, ZGDDB_TMPLATE_PAPER);
-            } else {
-                DocxProcessUtil.exportWordNew(paperExp, file, ZGDDB_TMPLATE_PAPER);
             }
+
+            DocxProcessUtil.exportWordNew(paperExp, file, ZGDDB_TMPLATE_PAPER);
             DocxProcessUtil.processImage(zipFileName + File.separator + paperfileName, getPkgList(paperId));
             //下载音频
             super.downloadAudio(paperExp, zipFileName);

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/ZgddwExportPaperService.java

@@ -32,13 +32,12 @@ public class ZgddwExportPaperService extends ExportPaperAbstractService {
         if (paperExp != null) {
             String paperfileName = paperExp.getName() + "_" + paperExp.getCourseNo() + "_" + ExamFileType.PAPER.getName() + DOCX_SUFFIX;
             File file = new File(TEMP_FILE_EXP + File.separator + zipFileName + File.separator + paperfileName);
-            if (examType.equals("offLine")) {
+            if (OFFLINE.equals(examType)) {
                 WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.createPackage();
                 paperExp.setExamRemarkWord(DocxProcessUtil.html2Docx(wordMLPackage, CommonUtils.formatHtml(paperExp.getExamRemark())));
-                DocxProcessUtil.exportWordNew(paperExp, file, ZGDDW_TMPLATE_PAPER);
-            } else {
-                DocxProcessUtil.exportWordNew(paperExp, file, ZGDDW_TMPLATE_PAPER);
             }
+            DocxProcessUtil.exportWordNew(paperExp, file, ZGDDW_TMPLATE_PAPER);
+
             DocxProcessUtil.processImage(zipFileName + File.separator + paperfileName, getPkgList(paperId));
             //下载音频
             super.downloadAudio(paperExp, zipFileName);