调卷规则修改

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

@@ -1,95 +1,91 @@
-package cn.com.qmth.examcloud.core.questions.service.export;
-
-import java.io.File;
-
-import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
-import org.springframework.stereotype.Service;
-
-import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
-import cn.com.qmth.examcloud.core.questions.base.enums.ExamFileType;
-import cn.com.qmth.examcloud.core.questions.base.word.DocxProcessUtil;
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
-import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
-
-/**
- * @author  	weiwenhai
- * @date    	2018年6月2日 上午11:29:49
- * @company 	QMTH
- * @description 北京师范大学导出、上传文件service
- */
-@Service("bjsfExportPaperService")
-public class BjsfExportPaperService extends ExportPaperAbstractService {
-
-	@Override
-    public void downloadPaper(String paperId,String zipFileName,String examType) throws Exception {
-		PaperExp paperExp = super.initPaperExp(paperId);
-		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")){
-				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.processImage(zipFileName+File.separator+paperfileName,getPkgList(paperId));
-			//下载音频
-			super.downloadAudio(paperExp, zipFileName);
-		}
-    }
-	
-	@Override
-	public void downloadPaperAnswer(String paperId, String zipFileName)throws Exception {
-		PaperExp paperExp = initPaperExp(paperId);
-		if(paperExp!=null){
-			String answerFileName = paperExp.getName()+"_"+paperExp.getCourseNo()+"_"+ExamFileType.ANSWER.getName()+DOCX_SUFFIX;
-			File file = new File(TEMP_FILE_EXP+File.separator+zipFileName+File.separator+answerFileName);
-			DocxProcessUtil.exportWordNew(paperExp,file,BJSF_TMPLATE_ANSWER);
-			DocxProcessUtil.processImage(zipFileName+File.separator+answerFileName,getPkgList(paperId));
-		}
-	}
-
-	@Override
-    public void uploadFile(ExtractConfig extractConfig,String paperId,User accessUser) throws Exception{
-		PaperExp paperExp = initPaperExp(paperId);
-        if (paperExp!=null) {
-        	String currNum = CommonUtils.getCurNum();
-        	//删除原有试卷文件
-        	/*ExamFile examFile = new ExamFile();
-        	examFile.setExamId(extractConfig.getExamId()+"");
-        	examFile.setCourseId(extractConfig.getCourseCode());
-        	examFile.setOrgId(extractConfig.getOrgId());
-        	examFileService.deleteExamFile(examFile);*/
-        	//没有试卷结构导出设置
-        	/*if(exportStructure==null){
-        		//上传试卷
-        		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,SXSF_TEMPLATE_PAPER,ExamFileType.PAPER);
-	        	//上传答案
-        		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,SXSF_TEMPLATE_ANSWER,ExamFileType.ANSWER);
-        	}else if(exportStructure!=null&&exportStructure.getExportType()==ExportType.NORMAL){
-        		List<QuestionTypeNum> questionTypeNums = exportStructure.getQuestionTypeNums();
-        		//检查试卷中客观题的数量是否大于试卷导出设置中的设置的数量
-        		checkObjectiveDetailsNum(paperExp,questionTypeNums);
-	    		//上传试卷
-        		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,SXSF_TEMPLATE_PAPER,ExamFileType.PAPER);
-	        	//上传答案
-        		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,SXSF_TEMPLATE_ANSWER,ExamFileType.ANSWER);
-				//上传试卷结构   不能在上传试卷和答案之前
-        		uploadPaperStructure(paperExp,extractConfig,accessUser,currNum,questionTypeNums);
-        	}else if(exportStructure!=null&&exportStructure.getExportType()==ExportType.ONLINE){
-        		//上传机考JSON文件
-        		uploadComputerTestFile(extractConfig,accessUser);
-        	}*/
-        	//checkObjectiveDetailsNum(paperExp,questionTypeNums);
-        	//上传试卷
-    		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,BJSF_TMPLATE_PAPER,ExamFileType.PAPER);
-        	//上传答案
-    		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,BJSF_TMPLATE_ANSWER,ExamFileType.ANSWER);
-    		//上传机考JSON文件
-    		uploadComputerTestFile(extractConfig,accessUser);
-    		//uploadPaperStructure(paperExp,extractConfig,accessUser,currNum,questionTypeNums);
-        }
-    }
-}
+package cn.com.qmth.examcloud.core.questions.service.export;
+
+import java.io.File;
+import java.util.List;
+
+import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
+import org.springframework.stereotype.Service;
+
+import cn.com.qmth.examcloud.commons.web.security.bean.User;
+import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
+import cn.com.qmth.examcloud.core.questions.base.enums.ExamFileType;
+import cn.com.qmth.examcloud.core.questions.base.enums.ExportType;
+import cn.com.qmth.examcloud.core.questions.base.word.DocxProcessUtil;
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
+import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionTypeNum;
+import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
+
+/**
+ * @author  	weiwenhai
+ * @date    	2018年6月2日 上午11:29:49
+ * @company 	QMTH
+ * @description 北京师范大学导出、上传文件service
+ */
+@Service("bjsfExportPaperService")
+public class BjsfExportPaperService extends ExportPaperAbstractService {
+
+	@Override
+    public void downloadPaper(String paperId,String zipFileName,String examType) throws Exception {
+		PaperExp paperExp = super.initPaperExp(paperId);
+		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")){
+				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.processImage(zipFileName+File.separator+paperfileName,getPkgList(paperId));
+			//下载音频
+			super.downloadAudio(paperExp, zipFileName);
+		}
+    }
+	
+	@Override
+	public void downloadPaperAnswer(String paperId, String zipFileName)throws Exception {
+		PaperExp paperExp = initPaperExp(paperId);
+		if(paperExp!=null){
+			String answerFileName = paperExp.getName()+"_"+paperExp.getCourseNo()+"_"+ExamFileType.ANSWER.getName()+DOCX_SUFFIX;
+			File file = new File(TEMP_FILE_EXP+File.separator+zipFileName+File.separator+answerFileName);
+			DocxProcessUtil.exportWordNew(paperExp,file,BJSF_TMPLATE_ANSWER);
+			DocxProcessUtil.processImage(zipFileName+File.separator+answerFileName,getPkgList(paperId));
+		}
+	}
+
+	@Override
+    public void uploadFile(ExtractConfig extractConfig,String paperId,ExportStructure exportStructure,User accessUser) throws Exception{
+		PaperExp paperExp = initPaperExp(paperId);
+        if (paperExp!=null) {
+        	String currNum = CommonUtils.getCurNum();
+        	//删除原有试卷文件
+        	/*ExamFile examFile = new ExamFile();
+        	examFile.setExamId(extractConfig.getExamId()+"");
+        	examFile.setCourseId(extractConfig.getCourseCode());
+        	examFile.setOrgId(extractConfig.getOrgId());
+        	examFileService.deleteExamFile(examFile);*/
+        	//没有试卷结构导出设置
+        	if(exportStructure==null){
+        		//上传试卷
+        		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,BJSF_TMPLATE_PAPER,ExamFileType.PAPER);
+	        	//上传答案
+        		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,BJSF_TMPLATE_ANSWER,ExamFileType.ANSWER);
+        	}else if(exportStructure!=null&&exportStructure.getExportType()==ExportType.NORMAL){
+        		List<QuestionTypeNum> questionTypeNums = exportStructure.getQuestionTypeNums();
+        		//检查试卷中客观题的数量是否大于试卷导出设置中的设置的数量
+        		checkObjectiveDetailsNum(paperExp,questionTypeNums);
+	    		//上传试卷
+        		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,BJSF_TMPLATE_PAPER,ExamFileType.PAPER);
+	        	//上传答案
+        		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,BJSF_TMPLATE_ANSWER,ExamFileType.ANSWER);
+				//上传试卷结构   不能在上传试卷和答案之前
+        		uploadPaperStructure(paperExp,extractConfig,accessUser,currNum,questionTypeNums);
+        	}else if(exportStructure!=null&&exportStructure.getExportType()==ExportType.ONLINE){
+        		//上传机考JSON文件
+        		uploadComputerTestFile(extractConfig,accessUser);
+        	}
+        }
+    }
+}

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

@@ -1,94 +1,91 @@
-package cn.com.qmth.examcloud.core.questions.service.export;
-
-import java.io.File;
-
-import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
-import org.springframework.stereotype.Service;
-
-import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
-import cn.com.qmth.examcloud.core.questions.base.enums.ExamFileType;
-import cn.com.qmth.examcloud.core.questions.base.word.DocxProcessUtil;
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
-import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
-/**
- * @author  	weiwenhai
- * @date    	2018年6月2日 上午11:29:49
- * @company 	QMTH
- * @description 重庆大学导出、上传文件service
- */
-@Service("cqdxExportPaperService")
-public class CqdxExportPaperService extends ExportPaperAbstractService {
-	
-	@Override
-    public void downloadPaper(String paperId,String zipFileName,String examType) throws Exception {
-		PaperExp paperExp = super.initPaperExp(paperId);
-		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")){
-				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.processImage(zipFileName+File.separator+paperfileName,getPkgList(paperId));
-			//下载音频
-			super.downloadAudio(paperExp, zipFileName);
-		}
-    }
-	
-	@Override
-	public void downloadPaperAnswer(String paperId, String zipFileName)throws Exception {
-		PaperExp paperExp = initPaperExp(paperId);
-		if(paperExp!=null){
-			String answerFileName = paperExp.getName()+"_"+paperExp.getCourseNo()+"_"+ExamFileType.ANSWER.getName()+DOCX_SUFFIX;
-			File file = new File(TEMP_FILE_EXP+File.separator+zipFileName+File.separator+answerFileName);
-			DocxProcessUtil.exportWordNew(paperExp,file,CQDX_TMPLATE_ANSWER);
-			DocxProcessUtil.processImage(zipFileName+File.separator+answerFileName,getPkgList(paperId));
-		}
-	}
-
-	@Override
-    public void uploadFile(ExtractConfig extractConfig,String paperId,User accessUser) throws Exception{
-		PaperExp paperExp = initPaperExp(paperId);
-        if (paperExp!=null) {
-        	String currNum = CommonUtils.getCurNum();
-        	//删除原有试卷文件
-        	/*ExamFile examFile = new ExamFile();
-        	examFile.setExamId(extractConfig.getExamId()+"");
-        	examFile.setCourseId(extractConfig.getCourseCode());
-        	examFile.setOrgId(extractConfig.getOrgId());
-        	examFileService.deleteExamFile(examFile);*/
-        	//没有试卷结构导出设置
-        	/*if(exportStructure==null){
-        		//上传试卷
-        		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,SXSF_TEMPLATE_PAPER,ExamFileType.PAPER);
-	        	//上传答案
-        		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,SXSF_TEMPLATE_ANSWER,ExamFileType.ANSWER);
-        	}else if(exportStructure!=null&&exportStructure.getExportType()==ExportType.NORMAL){
-        		List<QuestionTypeNum> questionTypeNums = exportStructure.getQuestionTypeNums();
-        		//检查试卷中客观题的数量是否大于试卷导出设置中的设置的数量
-        		checkObjectiveDetailsNum(paperExp,questionTypeNums);
-	    		//上传试卷
-        		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,SXSF_TEMPLATE_PAPER,ExamFileType.PAPER);
-	        	//上传答案
-        		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,SXSF_TEMPLATE_ANSWER,ExamFileType.ANSWER);
-				//上传试卷结构   不能在上传试卷和答案之前
-        		uploadPaperStructure(paperExp,extractConfig,accessUser,currNum,questionTypeNums);
-        	}else if(exportStructure!=null&&exportStructure.getExportType()==ExportType.ONLINE){
-        		//上传机考JSON文件
-        		uploadComputerTestFile(extractConfig,accessUser);
-        	}*/
-        	//checkObjectiveDetailsNum(paperExp,questionTypeNums);
-        	//上传试卷
-    		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,CQDX_TMPLATE_PAPER,ExamFileType.PAPER);
-        	//上传答案
-    		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,CQDX_TMPLATE_ANSWER,ExamFileType.ANSWER);
-    		//上传机考JSON文件
-    		uploadComputerTestFile(extractConfig,accessUser);
-    		//uploadPaperStructure(paperExp,extractConfig,accessUser,currNum,questionTypeNums);
-        }
-    }
-}
+package cn.com.qmth.examcloud.core.questions.service.export;
+
+import java.io.File;
+import java.util.List;
+
+import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
+import org.springframework.stereotype.Service;
+
+import cn.com.qmth.examcloud.commons.web.security.bean.User;
+import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
+import cn.com.qmth.examcloud.core.questions.base.enums.ExamFileType;
+import cn.com.qmth.examcloud.core.questions.base.enums.ExportType;
+import cn.com.qmth.examcloud.core.questions.base.word.DocxProcessUtil;
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
+import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionTypeNum;
+import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
+
+/**
+ * @author  	weiwenhai
+ * @date    	2018年6月2日 上午11:29:49
+ * @company 	QMTH
+ * @description 重庆大学导出、上传文件service
+ */
+@Service("cqdxExportPaperService")
+public class CqdxExportPaperService extends ExportPaperAbstractService {
+	
+	@Override
+    public void downloadPaper(String paperId,String zipFileName,String examType) throws Exception {
+		PaperExp paperExp = super.initPaperExp(paperId);
+		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")){
+				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.processImage(zipFileName+File.separator+paperfileName,getPkgList(paperId));
+			//下载音频
+			super.downloadAudio(paperExp, zipFileName);
+		}
+    }
+	
+	@Override
+	public void downloadPaperAnswer(String paperId, String zipFileName)throws Exception {
+		PaperExp paperExp = initPaperExp(paperId);
+		if(paperExp!=null){
+			String answerFileName = paperExp.getName()+"_"+paperExp.getCourseNo()+"_"+ExamFileType.ANSWER.getName()+DOCX_SUFFIX;
+			File file = new File(TEMP_FILE_EXP+File.separator+zipFileName+File.separator+answerFileName);
+			DocxProcessUtil.exportWordNew(paperExp,file,CQDX_TMPLATE_ANSWER);
+			DocxProcessUtil.processImage(zipFileName+File.separator+answerFileName,getPkgList(paperId));
+		}
+	}
+
+	@Override
+    public void uploadFile(ExtractConfig extractConfig,String paperId,ExportStructure exportStructure,User accessUser) throws Exception{
+		PaperExp paperExp = initPaperExp(paperId);
+        if (paperExp!=null) {
+        	String currNum = CommonUtils.getCurNum();
+        	//删除原有试卷文件
+        	/*ExamFile examFile = new ExamFile();
+        	examFile.setExamId(extractConfig.getExamId()+"");
+        	examFile.setCourseId(extractConfig.getCourseCode());
+        	examFile.setOrgId(extractConfig.getOrgId());
+        	examFileService.deleteExamFile(examFile);*/
+        	//没有试卷结构导出设置
+        	if(exportStructure==null){
+        		//上传试卷
+        		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,CQDX_TMPLATE_PAPER,ExamFileType.PAPER);
+	        	//上传答案
+        		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,CQDX_TMPLATE_ANSWER,ExamFileType.ANSWER);
+        	}else if(exportStructure!=null&&exportStructure.getExportType()==ExportType.NORMAL){
+        		List<QuestionTypeNum> questionTypeNums = exportStructure.getQuestionTypeNums();
+        		//检查试卷中客观题的数量是否大于试卷导出设置中的设置的数量
+        		checkObjectiveDetailsNum(paperExp,questionTypeNums);
+	    		//上传试卷
+        		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,CQDX_TMPLATE_PAPER,ExamFileType.PAPER);
+	        	//上传答案
+        		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,CQDX_TMPLATE_ANSWER,ExamFileType.ANSWER);
+				//上传试卷结构   不能在上传试卷和答案之前
+        		uploadPaperStructure(paperExp,extractConfig,accessUser,currNum,questionTypeNums);
+        	}else if(exportStructure!=null&&exportStructure.getExportType()==ExportType.ONLINE){
+        		//上传机考JSON文件
+        		uploadComputerTestFile(extractConfig,accessUser);
+        	}
+        }
+    }
+}

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

@@ -13,7 +13,6 @@ import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperDetailExp;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperDetailUnitExp;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
@@ -292,13 +291,13 @@ public class DzkdExportPaperService extends ExportPaperAbstractService {
 	}
 	
 	@Override
-    public void uploadFile(ExtractConfig extractConfig,String paperId,User accessUser) throws Exception{
+    public void uploadFile(ExtractConfig extractConfig,String paperId,ExportStructure exportStructure,User accessUser) throws Exception{
     	PaperExp paperExp = initPaperExp(paperId);
     	setSplitPaperDetailExp(paperExp,paperExp.getPaperDetails());
         if (paperExp!=null) {
         	String currNum = CommonUtils.getCurNum();
         	//没有试卷结构导出设置
-        	/*if(exportStructure==null){
+        	if(exportStructure==null){
         		//上传试卷
         		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,DZKD_TEMPLATE_PAPER,ExamFileType.PAPER);
 	        	//上传答案
@@ -316,13 +315,7 @@ public class DzkdExportPaperService extends ExportPaperAbstractService {
         	}else if(exportStructure!=null&&exportStructure.getExportType()==ExportType.ONLINE){
         		//上传机考JSON文件
         		uploadComputerTestFile(extractConfig,accessUser);
-        	}*/
-        	//上传试卷
-    		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,DZKD_TEMPLATE_PAPER,ExamFileType.PAPER);
-        	//上传答案
-    		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,DZKD_TEMPLATE_ANSWER,ExamFileType.ANSWER);
-    		//上传机考JSON文件
-    		uploadComputerTestFile(extractConfig,accessUser);
+        	}
         }
     }
 

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

@@ -198,6 +198,18 @@ public abstract class ExportPaperAbstractService {
 	//福建师范
 	protected static Template FJSF_TMPLATE_PAPER;
 	protected static Template FJSF_TMPLATE_ANSWER;
+	
+	//华南师范
+	protected static Template HNSF_TMPLATE_PAPER;
+	protected static Template HNSF_TMPLATE_ANSWER;
+		
+	//中国医科
+	protected static Template YKDX_TMPLATE_PAPER;
+	protected static Template YKDX_TMPLATE_ANSWER;
+		
+	//北京交通大学
+	protected static Template BJJT_TMPLATE_PAPER;
+	protected static Template BJJT_TMPLATE_ANSWER;
 
 	@Value("${upyun.bucketName}")
 	protected String bucketName;
@@ -264,6 +276,15 @@ public abstract class ExportPaperAbstractService {
 			
 			FJSF_TMPLATE_PAPER = CONFIGURATION.getTemplate("fjsf_paper_template.ftl", ENCODING);
 			FJSF_TMPLATE_ANSWER = CONFIGURATION.getTemplate("fjsf_answer_template.ftl", ENCODING);
+			
+			HNSF_TMPLATE_PAPER = CONFIGURATION.getTemplate("hnsf_paper_template.ftl", ENCODING);
+			HNSF_TMPLATE_ANSWER = CONFIGURATION.getTemplate("hnsf_answer_template.ftl", ENCODING);
+			
+			YKDX_TMPLATE_PAPER = CONFIGURATION.getTemplate("ykdx_paper_template.ftl", ENCODING);
+			YKDX_TMPLATE_ANSWER = CONFIGURATION.getTemplate("ykdx_answer_template.ftl", ENCODING);
+			
+			BJJT_TMPLATE_PAPER = CONFIGURATION.getTemplate("bjjt_paper_template.ftl", ENCODING);
+			BJJT_TMPLATE_ANSWER = CONFIGURATION.getTemplate("bjjt_answer_template.ftl", ENCODING);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -291,7 +312,7 @@ public abstract class ExportPaperAbstractService {
 	 * @param accessUser
 	 * @throws Exception
 	 */
-    public abstract void uploadFile(ExtractConfig extractConfig,String paperId,User accessUser)  throws Exception;
+    public abstract void uploadFile(ExtractConfig extractConfig,String paperId,ExportStructure exportStructure,User accessUser)  throws Exception;
     
     public PaperExp initPaperExp(String paperId) throws Exception{
     	PaperExp paperExp = initPaperExpService.initPaperExp(paperId);

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

@@ -1,96 +1,91 @@
-package cn.com.qmth.examcloud.core.questions.service.export;
-
-import java.io.File;
-
-import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
-import org.springframework.stereotype.Service;
-
-import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
-import cn.com.qmth.examcloud.core.questions.base.enums.ExamFileType;
-import cn.com.qmth.examcloud.core.questions.base.word.DocxProcessUtil;
-import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
-import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
-
-
-/**
- * @author  	weiwenhai
- * @date    	2018年6月2日 上午11:29:49
- * @company 	QMTH
- * @description 福建师范大学导出、上传文件service
- */
-@Service("fjsfExportPaperService")
-public class FjsfExportPaperService extends ExportPaperAbstractService {
-
-	@Override
-    public void downloadPaper(String paperId,String zipFileName,String examType) throws Exception {
-		PaperExp paperExp = super.initPaperExp(paperId);
-		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")){
-				WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.createPackage();
-				paperExp.setExamRemarkWord(DocxProcessUtil.html2Docx(wordMLPackage, CommonUtils.formatHtml(paperExp.getExamRemark())));
-				DocxProcessUtil.exportWordNew(paperExp, file,FJSF_TMPLATE_PAPER);
-			}else{
-				DocxProcessUtil.exportWordNew(paperExp, file,FJSF_TMPLATE_PAPER);
-			}
-			DocxProcessUtil.processImage(zipFileName+File.separator+paperfileName,getPkgList(paperId));
-			//下载音频
-			super.downloadAudio(paperExp, zipFileName);
-		}
-    }
-	
-	@Override
-	public void downloadPaperAnswer(String paperId, String zipFileName)throws Exception {
-		PaperExp paperExp = initPaperExp(paperId);
-		if(paperExp!=null){
-			String answerFileName = paperExp.getName()+"_"+paperExp.getCourseNo()+"_"+ExamFileType.ANSWER.getName()+DOCX_SUFFIX;
-			File file = new File(TEMP_FILE_EXP+File.separator+zipFileName+File.separator+answerFileName);
-			DocxProcessUtil.exportWordNew(paperExp,file,FJSF_TMPLATE_ANSWER);
-			DocxProcessUtil.processImage(zipFileName+File.separator+answerFileName,getPkgList(paperId));
-		}
-	}
-
-	@Override
-    public void uploadFile(ExtractConfig extractConfig,String paperId,User accessUser) throws Exception{
-		PaperExp paperExp = initPaperExp(paperId);
-        if (paperExp!=null) {
-        	String currNum = CommonUtils.getCurNum();
-        	//删除原有试卷文件
-        	/*ExamFile examFile = new ExamFile();
-        	examFile.setExamId(extractConfig.getExamId()+"");
-        	examFile.setCourseId(extractConfig.getCourseCode());
-        	examFile.setOrgId(extractConfig.getOrgId());
-        	examFileService.deleteExamFile(examFile);*/
-        	//没有试卷结构导出设置
-        	/*if(exportStructure==null){
-        		//上传试卷
-        		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,SXSF_TEMPLATE_PAPER,ExamFileType.PAPER);
-	        	//上传答案
-        		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,SXSF_TEMPLATE_ANSWER,ExamFileType.ANSWER);
-        	}else if(exportStructure!=null&&exportStructure.getExportType()==ExportType.NORMAL){
-        		List<QuestionTypeNum> questionTypeNums = exportStructure.getQuestionTypeNums();
-        		//检查试卷中客观题的数量是否大于试卷导出设置中的设置的数量
-        		checkObjectiveDetailsNum(paperExp,questionTypeNums);
-	    		//上传试卷
-        		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,SXSF_TEMPLATE_PAPER,ExamFileType.PAPER);
-	        	//上传答案
-        		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,SXSF_TEMPLATE_ANSWER,ExamFileType.ANSWER);
-				//上传试卷结构   不能在上传试卷和答案之前
-        		uploadPaperStructure(paperExp,extractConfig,accessUser,currNum,questionTypeNums);
-        	}else if(exportStructure!=null&&exportStructure.getExportType()==ExportType.ONLINE){
-        		//上传机考JSON文件
-        		uploadComputerTestFile(extractConfig,accessUser);
-        	}*/
-        	//checkObjectiveDetailsNum(paperExp,questionTypeNums);
-        	//上传试卷
-    		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,FJSF_TMPLATE_PAPER,ExamFileType.PAPER);
-        	//上传答案
-    		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,FJSF_TMPLATE_ANSWER,ExamFileType.ANSWER);
-    		//上传机考JSON文件
-    		uploadComputerTestFile(extractConfig,accessUser);
-    		//uploadPaperStructure(paperExp,extractConfig,accessUser,currNum,questionTypeNums);
-        }
-    }
-}
+package cn.com.qmth.examcloud.core.questions.service.export;
+
+import java.io.File;
+import java.util.List;
+
+import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
+import org.springframework.stereotype.Service;
+
+import cn.com.qmth.examcloud.commons.web.security.bean.User;
+import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
+import cn.com.qmth.examcloud.core.questions.base.enums.ExamFileType;
+import cn.com.qmth.examcloud.core.questions.base.enums.ExportType;
+import cn.com.qmth.examcloud.core.questions.base.word.DocxProcessUtil;
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
+import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionTypeNum;
+import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
+
+/**
+ * @author  	weiwenhai
+ * @date    	2018年6月2日 上午11:29:49
+ * @company 	QMTH
+ * @description 福建师范大学导出、上传文件service
+ */
+@Service("fjsfExportPaperService")
+public class FjsfExportPaperService extends ExportPaperAbstractService {
+
+	@Override
+    public void downloadPaper(String paperId,String zipFileName,String examType) throws Exception {
+		PaperExp paperExp = super.initPaperExp(paperId);
+		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")){
+				WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.createPackage();
+				paperExp.setExamRemarkWord(DocxProcessUtil.html2Docx(wordMLPackage, CommonUtils.formatHtml(paperExp.getExamRemark())));
+				DocxProcessUtil.exportWordNew(paperExp, file,FJSF_TMPLATE_PAPER);
+			}else{
+				DocxProcessUtil.exportWordNew(paperExp, file,FJSF_TMPLATE_PAPER);
+			}
+			DocxProcessUtil.processImage(zipFileName+File.separator+paperfileName,getPkgList(paperId));
+			//下载音频
+			super.downloadAudio(paperExp, zipFileName);
+		}
+    }
+	
+	@Override
+	public void downloadPaperAnswer(String paperId, String zipFileName)throws Exception {
+		PaperExp paperExp = initPaperExp(paperId);
+		if(paperExp!=null){
+			String answerFileName = paperExp.getName()+"_"+paperExp.getCourseNo()+"_"+ExamFileType.ANSWER.getName()+DOCX_SUFFIX;
+			File file = new File(TEMP_FILE_EXP+File.separator+zipFileName+File.separator+answerFileName);
+			DocxProcessUtil.exportWordNew(paperExp,file,FJSF_TMPLATE_ANSWER);
+			DocxProcessUtil.processImage(zipFileName+File.separator+answerFileName,getPkgList(paperId));
+		}
+	}
+
+	@Override
+    public void uploadFile(ExtractConfig extractConfig,String paperId,ExportStructure exportStructure,User accessUser) throws Exception{
+		PaperExp paperExp = initPaperExp(paperId);
+        if (paperExp!=null) {
+        	String currNum = CommonUtils.getCurNum();
+        	//删除原有试卷文件
+        	/*ExamFile examFile = new ExamFile();
+        	examFile.setExamId(extractConfig.getExamId()+"");
+        	examFile.setCourseId(extractConfig.getCourseCode());
+        	examFile.setOrgId(extractConfig.getOrgId());
+        	examFileService.deleteExamFile(examFile);*/
+        	//没有试卷结构导出设置
+        	if(exportStructure==null){
+        		//上传试卷
+        		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,FJSF_TMPLATE_PAPER,ExamFileType.PAPER);
+	        	//上传答案
+        		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,FJSF_TMPLATE_ANSWER,ExamFileType.ANSWER);
+        	}else if(exportStructure!=null&&exportStructure.getExportType()==ExportType.NORMAL){
+        		List<QuestionTypeNum> questionTypeNums = exportStructure.getQuestionTypeNums();
+        		//检查试卷中客观题的数量是否大于试卷导出设置中的设置的数量
+        		checkObjectiveDetailsNum(paperExp,questionTypeNums);
+	    		//上传试卷
+        		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,FJSF_TMPLATE_PAPER,ExamFileType.PAPER);
+	        	//上传答案
+        		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,FJSF_TMPLATE_ANSWER,ExamFileType.ANSWER);
+				//上传试卷结构   不能在上传试卷和答案之前
+        		uploadPaperStructure(paperExp,extractConfig,accessUser,currNum,questionTypeNums);
+        	}else if(exportStructure!=null&&exportStructure.getExportType()==ExportType.ONLINE){
+        		//上传机考JSON文件
+        		uploadComputerTestFile(extractConfig,accessUser);
+        	}
+        }
+    }
+}

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

@@ -8,7 +8,6 @@ import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperDetailExp;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
@@ -52,12 +51,12 @@ public class HzkjExportPaperService extends ExportPaperAbstractService {
 	}
 
 	@Override
-    public void uploadFile(ExtractConfig extractConfig,String paperId,User accessUser) throws Exception{
+    public void uploadFile(ExtractConfig extractConfig,String paperId,ExportStructure exportStructure,User accessUser) throws Exception{
 		PaperExp paperExp = initPaperExp(paperId);
         if (paperExp!=null) {
         	String currNum = CommonUtils.getCurNum();
         	//没有试卷结构导出设置
-        	/*if(exportStructure==null){
+        	if(exportStructure==null){
         		//上传试卷
         		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,HZKJ_TEMPLATE_PAPER,ExamFileType.PAPER);
 	        	//上传答案
@@ -75,16 +74,11 @@ public class HzkjExportPaperService extends ExportPaperAbstractService {
         	}else if(exportStructure!=null&&exportStructure.getExportType()==ExportType.ONLINE){
         		//上传机考JSON文件
         		uploadComputerTestFile(extractConfig,accessUser);
-        	}*/
-        	//上传试卷
-    		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,HZKJ_TEMPLATE_PAPER,ExamFileType.PAPER);
-        	//上传答案
-    		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,HZKJ_TEMPLATE_ANSWER,ExamFileType.ANSWER);
-    		//上传机考JSON文件
-    		uploadComputerTestFile(extractConfig,accessUser);
+        	}
         }
     }
 
+
 	@Override
 	public void setExpDtoTitle(List<PaperDetailExp> paperDetailExps) {
 		for(PaperDetailExp paperDetailExp:paperDetailExps){

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

@@ -6,7 +6,6 @@ import java.util.List;
 import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
@@ -48,7 +47,7 @@ public class RjgcExportPaperService extends ExportPaperAbstractService {
 	}
 
 	@Override
-    public void uploadFile(ExtractConfig extractConfig,String paperId,User accessUser) throws Exception{
+    public void uploadFile(ExtractConfig extractConfig,String paperId,ExportStructure exportStructure,User accessUser) throws Exception{
 		PaperExp paperExp = initPaperExp(paperId);
         if (paperExp!=null) {
         	String currNum = CommonUtils.getCurNum();
@@ -59,7 +58,7 @@ public class RjgcExportPaperService extends ExportPaperAbstractService {
         	examFile.setOrgId(extractConfig.getOrgId());
         	examFileService.deleteExamFile(examFile);*/
         	//没有试卷结构导出设置
-        	/*if(exportStructure==null){
+        	if(exportStructure==null){
         		//上传试卷
         		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,SXSF_TEMPLATE_PAPER,ExamFileType.PAPER);
 	        	//上传答案
@@ -77,14 +76,7 @@ public class RjgcExportPaperService extends ExportPaperAbstractService {
         	}else if(exportStructure!=null&&exportStructure.getExportType()==ExportType.ONLINE){
         		//上传机考JSON文件
         		uploadComputerTestFile(extractConfig,accessUser);
-        	}*/
-        	//上传试卷
-    		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,SXSF_TEMPLATE_PAPER,ExamFileType.PAPER);
-        	//上传答案
-    		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,SXSF_TEMPLATE_ANSWER,ExamFileType.ANSWER);
-    		//上传机考JSON文件
-    		uploadComputerTestFile(extractConfig,accessUser);
+        	}
         }
     }
-
 }

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

@@ -8,7 +8,6 @@ import java.util.List;
 import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
@@ -54,12 +53,12 @@ public class SddxExportPaperService extends ExportPaperAbstractService{
 	}
 
 	@Override
-    public void uploadFile(ExtractConfig extractConfig,String paperId,User accessUser) throws Exception{
+    public void uploadFile(ExtractConfig extractConfig,String paperId,ExportStructure exportStructure,User accessUser) throws Exception{
 		PaperExp paperExp = initPaperExp(paperId);
         if (paperExp!=null) {
         	String currNum = CommonUtils.getCurNum();
         	//没有试卷结构导出设置
-        	/*if(exportStructure==null){
+        	if(exportStructure==null){
         		//上传试卷
         		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,SDDX_TEMPLATE_PAPER,ExamFileType.PAPER);
 	        	//上传答案
@@ -77,13 +76,7 @@ public class SddxExportPaperService extends ExportPaperAbstractService{
         	}else if(exportStructure!=null&&exportStructure.getExportType()==ExportType.ONLINE){
         		//上传机考JSON文件
         		uploadComputerTestFile(extractConfig,accessUser);
-        	}*/
-        	//上传试卷
-    		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,SDDX_TEMPLATE_PAPER,ExamFileType.PAPER);
-        	//上传答案
-    		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,SDDX_TEMPLATE_ANSWER,ExamFileType.ANSWER);
-    		//上传机考JSON文件
-    		uploadComputerTestFile(extractConfig,accessUser);
+        	}
         }
     }
 }

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

@@ -7,7 +7,6 @@ import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
 import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
@@ -58,7 +57,7 @@ public class SxsfExportPaperService extends ExportPaperAbstractService {
 	}
 
 	@Override
-    public void uploadFile(ExtractConfig extractConfig,String paperId,User accessUser) throws Exception{
+    public void uploadFile(ExtractConfig extractConfig,String paperId,ExportStructure exportStructure,User accessUser) throws Exception{
 		PaperExp paperExp = initPaperExp(paperId);
         if (paperExp!=null) {
         	String currNum = CommonUtils.getCurNum();
@@ -69,7 +68,7 @@ public class SxsfExportPaperService extends ExportPaperAbstractService {
         	examFile.setOrgId(extractConfig.getOrgId());
         	examFileService.deleteExamFile(examFile);*/
         	//没有试卷结构导出设置
-        	/*if(exportStructure==null){
+        	if(exportStructure==null){
         		//上传试卷
         		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,SXSF_TEMPLATE_PAPER,ExamFileType.PAPER);
 	        	//上传答案
@@ -87,16 +86,7 @@ public class SxsfExportPaperService extends ExportPaperAbstractService {
         	}else if(exportStructure!=null&&exportStructure.getExportType()==ExportType.ONLINE){
         		//上传机考JSON文件
         		uploadComputerTestFile(extractConfig,accessUser);
-        	}*/
-        	//checkObjectiveDetailsNum(paperExp,questionTypeNums);
-        	//上传试卷
-    		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,SXSF_TEMPLATE_PAPER,ExamFileType.PAPER);
-        	//上传答案
-    		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,SXSF_TEMPLATE_ANSWER,ExamFileType.ANSWER);
-    		//上传机考JSON文件
-    		uploadComputerTestFile(extractConfig,accessUser);
-    		//uploadPaperStructure(paperExp,extractConfig,accessUser,currNum,questionTypeNums);
+        	}
         }
     }
-
 }

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

@@ -4,9 +4,6 @@ import java.io.File;
 import java.util.Collections;
 import java.util.List;
 
-
-
-
 import org.apache.commons.lang3.StringUtils;
 import org.docx4j.XmlUtils;
 import org.docx4j.jaxb.Context;
@@ -19,7 +16,6 @@ import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 
 import com.google.gson.Gson;
 
@@ -106,13 +102,13 @@ public class SydxExportPaperService extends ExportPaperAbstractService{
 	}
     
     @Override
-    public void uploadFile(ExtractConfig extractConfig,String paperId,User accessUser) throws Exception{
+    public void uploadFile(ExtractConfig extractConfig,String paperId,ExportStructure exportStructure,User accessUser) throws Exception{
     	PaperExp exportPaperExp = initExportSydxPaper(paperId);
     	PaperExp exportPaperStructureExp = initExportSydxPaper(paperId);
         if (exportPaperExp!=null&&exportPaperStructureExp!=null) {
         	String currNum = CommonUtils.getCurNum();
         	//没有试卷结构导出设置
-        	/*if(exportStructure==null){
+        	if(exportStructure==null){
         		//上传试卷
         		uploadPaperOrAnswerFile(exportPaperExp,extractConfig,accessUser,currNum,SYDX_TEMPLATE_PAPER,ExamFileType.PAPER);
 	        	//上传答案
@@ -130,13 +126,7 @@ public class SydxExportPaperService extends ExportPaperAbstractService{
         	}else if(exportStructure!=null&&exportStructure.getExportType()==ExportType.ONLINE){
         		//上传机考JSON文件
         		uploadComputerTestFile(extractConfig,accessUser);
-        	}*/
-        	//上传试卷
-    		uploadPaperOrAnswerFile(exportPaperExp,extractConfig,accessUser,currNum,SYDX_TEMPLATE_PAPER,ExamFileType.PAPER);
-        	//上传答案
-    		uploadPaperOrAnswerFile(exportPaperExp,extractConfig,accessUser,currNum,SYDX_TEMPLATE_ANSWER,ExamFileType.ANSWER);
-    		//上传机考JSON文件
-    		uploadComputerTestFile(extractConfig,accessUser);
+        	}
         }
     }
 	

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

@@ -8,7 +8,6 @@ import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
 import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
@@ -60,12 +59,12 @@ public class TjdxExportPaperService extends ExportPaperAbstractService {
 	}
 
 	@Override
-    public void uploadFile(ExtractConfig extractConfig,String paperId,User accessUser) throws Exception{
+    public void uploadFile(ExtractConfig extractConfig,String paperId,ExportStructure exportStructure,User accessUser) throws Exception{
 		PaperExp paperExp = initPaperExp(paperId);
         if (paperExp!=null) {
         	String currNum = CommonUtils.getCurNum();
         	//没有试卷结构导出设置
-        	/*if(exportStructure==null){
+        	if(exportStructure==null){
         		//上传试卷
         		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,TJDX_TEMPLATE_PAPER,ExamFileType.PAPER);
 	        	//上传答案
@@ -83,13 +82,7 @@ public class TjdxExportPaperService extends ExportPaperAbstractService {
         	}else if(exportStructure!=null&&exportStructure.getExportType()==ExportType.ONLINE){
         		//上传机考JSON文件
         		uploadComputerTestFile(extractConfig,accessUser);
-        	}*/
-        	//上传试卷
-    		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,TJDX_TEMPLATE_PAPER,ExamFileType.PAPER);
-        	//上传答案
-    		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,TJDX_TEMPLATE_ANSWER,ExamFileType.ANSWER);
-    		//上传机考JSON文件
-    		uploadComputerTestFile(extractConfig,accessUser);
+        	}
         }
     }
     

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

@@ -6,7 +6,6 @@ import java.util.List;
 import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExportStructure;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
@@ -48,12 +47,12 @@ public class xajdExportPaperService extends ExportPaperAbstractService{
 	}
 
 	@Override
-    public void uploadFile(ExtractConfig extractConfig,String paperId,User accessUser) throws Exception{
+    public void uploadFile(ExtractConfig extractConfig,String paperId,ExportStructure exportStructure,User accessUser) throws Exception{
 		PaperExp paperExp = initPaperExp(paperId);
         if (paperExp!=null) {
         	String currNum = CommonUtils.getCurNum();
         	//没有试卷结构导出设置
-        	/*if(exportStructure==null){
+        	if(exportStructure==null){
         		//上传试卷
         		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,XAJD_TEMPLATE_PAPER,ExamFileType.PAPER);
 	        	//上传答案
@@ -71,13 +70,7 @@ public class xajdExportPaperService extends ExportPaperAbstractService{
         	}else if(exportStructure!=null&&exportStructure.getExportType()==ExportType.ONLINE){
         		//上传机考JSON文件
         		uploadComputerTestFile(extractConfig,accessUser);
-        	}*/
-        	//上传试卷
-    		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,XAJD_TEMPLATE_PAPER,ExamFileType.PAPER);
-        	//上传答案
-    		uploadPaperOrAnswerFile(paperExp,extractConfig,accessUser,currNum,XAJD_TEMPLATE_ANSWER,ExamFileType.ANSWER);
-    		//上传机考JSON文件
-    		uploadComputerTestFile(extractConfig,accessUser);
+        	}
         }
     }
 	

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/ExportPaperServiceImpl.java

@@ -109,7 +109,7 @@ public class ExportPaperServiceImpl implements ExportPaperService{
 
 	@Override
 	public void exportPaperFile(String paperId,String serviceName,String exportContentList,HttpServletResponse response,String loginName, String examType) throws Exception {
-		ExportPaperAbstractService exportPaperAbstractService = (ExportPaperAbstractService) SpringContextUtils.getBeanById("cqdxExportPaperService");
+		ExportPaperAbstractService exportPaperAbstractService = (ExportPaperAbstractService) SpringContextUtils.getBeanById("tjdxExportPaperService");
 		//根据试卷id查询试卷 
 		Paper paper = paperRepo.findOne(paperId);
 		List<Paper> papers = new ArrayList<Paper>();