提交题库BUG

cqb-paper/src/main/java/com/qmth/cqb/paper/service/impl/ExtractConfigFileServiceImpl.java

@@ -123,8 +123,6 @@ public class ExtractConfigFileServiceImpl implements ExtractConfigFileService {
 		}
 		//生成试卷
 		Map<String, String> finishedPaperIdMap = extractConfigService.saveExtractConfig(extractConfig,accessUser);
-		extractConfig.setFinishedPaperIdMap(finishedPaperIdMap);
-    	extractConfig.setIfFinish((short)1);
     	if(isbuildFile==1){
     		Set<Entry<String,String>> entrySet = finishedPaperIdMap.entrySet();
     		Iterator<Entry<String,String>> iterator = entrySet.iterator();
@@ -134,7 +132,6 @@ public class ExtractConfigFileServiceImpl implements ExtractConfigFileService {
     			uploadPaperFile(extractConfig,paperId,exportStructure,accessUser);
     		}
     	}
-    	extractConfigRepo.save(extractConfig);
 	}
 	
 	/**

cqb-paper/src/main/java/com/qmth/cqb/paper/service/impl/ExtractConfigServiceImpl.java

@@ -9,6 +9,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;
+import java.util.Map.Entry;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -140,16 +141,13 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
 
 	@Override
 	public Map<String, String> saveExtractConfig(ExtractConfig extractConfig,AccessUser accessUser) throws Exception {
-		List<ExamPaper> examPapers = extractConfig.getExamPaperList();
-		for(int i=0;i<examPapers.size();i++){
-			ExamPaper examPaper = examPapers.get(i);
-			Paper paper = examPaper.getPaper();
-			paper = paperRepo.findOne(paper.getId());
-			examPaper.setPaper(paper);
-		}
 		Course course = courseRepo.findFirstByCodeAndOrgId(extractConfig.getCourseCode(),extractConfig.getOrgId());
 		extractConfig.setCourse(course);
-		return makePaperByConfig(extractConfig);
+		Map<String,String> newFinishedPaperIdMap = makePaperByConfig(extractConfig);
+		extractConfig.setFinishedPaperIdMap(newFinishedPaperIdMap);
+    	extractConfig.setIfFinish((short)1);
+    	extractConfigRepo.save(extractConfig);
+		return newFinishedPaperIdMap;
 	}
 
 	@Override

cqb-paper/src/main/java/com/qmth/cqb/paper/service/impl/PaperServiceImpl.java

@@ -725,6 +725,7 @@ public class PaperServiceImpl implements PaperService{
         question.setOrgId(user.getRootOrgId().toString());
         quesService.updateQuesWord(question);
         question.setCourse(paper.getCourse());
+        question.setCourseNo(paper.getCourse().getCode());//必须设置，因为部分方法需要courseNo作为查询条件
         question.setCreateTime(CommonUtils.getCurDateTime());
         question = quesRepo.save(question);