weiwenhai 6 éve
szülő
commit
7689fbfd1d

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

@@ -1199,7 +1199,8 @@ public abstract class ExportPaperAbstractService {
     	List<PaperDetailExp> paperDetailExps = fillObjectiveQuestions(objectiveDetails,questionTypeNums);
     	List<ObjectiveQuestionStructure> objectiveQuestionStructureList = new ArrayList<ObjectiveQuestionStructure>();
     	
-    	String paperType = findPaperType(extractConfig,paperExp.getId());
+    	//String paperType = findPaperType(extractConfig,paperExp.getId());
+    	String paperType = examPaper.getGroupCode();
     	for(PaperDetailExp paperDetailExp:paperDetailExps){
     		for(PaperDetailUnitExp unit:paperDetailExp.getPaperDetailUnits()){
     			objectiveQuestionStructureList.add(new ObjectiveQuestionStructure(paperExp,paperDetailExp,unit,paperType));
@@ -1233,7 +1234,8 @@ public abstract class ExportPaperAbstractService {
     	String subjectiveFileName = currNum+ExamFileType.PAPER_STRUCTURE_SUBJECTIVE.name()+EXCEL_SUFFIX;
     	List<PaperDetailExp> subjectiveDetails = getAllSubjectiveDetails(paperExp);
     	List<SubjectiveQuestionStructure> subjectiveQuestionStructureList = new ArrayList<SubjectiveQuestionStructure>();
-    	String paperType = findPaperType(extractConfig,paperExp.getId());
+    	//String paperType = findPaperType(extractConfig,paperExp.getId());
+    	String paperType = examPaper.getGroupCode();
     	for(PaperDetailExp paperDetailExp:subjectiveDetails){
     		for(PaperDetailUnitExp unit:paperDetailExp.getPaperDetailUnits()){
     			subjectiveQuestionStructureList.add(new SubjectiveQuestionStructure(paperExp,paperDetailExp,unit,paperType));