提交调卷规则BUG

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

@@ -126,13 +126,13 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
 	public Map<String, Object> extract(Long exam_id,String course_code,String group_code){
 		Map<String, Object> returnMap = new HashMap<String,Object>();
 		logger.info("调卷开始...");
-		logger.info("根据examId和courseCode获取调卷规则");
+		logger.info("根据examId:"+exam_id+"和courseCode:"+course_code+"获取调卷规则");
 		ExtractConfig extractConfig = this.findConfig(new ExtractConfig(exam_id,course_code));
 		if(extractConfig==null){
 			 returnMap.put("errorMsg","该考试和课程下调卷规则未制定,请先制定调卷规则");
 			 return returnMap;
 		}
-		logger.info("根据调卷规则中设置的概率获取该类型的试卷");
+		logger.info("根据调卷规则中设置的概率获取类型为"+group_code+"的试卷");
 		Map<String,Paper> paperMap = this.getExamPaperByProbability(extractConfig.getExamPaperList());
 		if(paperMap.isEmpty()){
 			returnMap.put("errorMsg","该考试和课程下调卷规则中试卷不存在,请重新制定调卷规则");
@@ -147,7 +147,7 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
     	Paper newPaper = this.recombinationPaper(paper, 
 						        				 extractConfig.getScrambling_the_question_order(), 
 						        				 extractConfig.getScrambling_the_option_order());
-    	logger.info("根据新试卷得到PaperDto后返回");
+    	logger.info("根据新试卷 paperId:"+newPaper.getId()+"得到PaperDto后返回");
 		returnMap.put("paperDto", getPaperDtoByPaper(newPaper));
 		logger.info("调卷结束");
 		return returnMap;

cqb-paper/src/main/java/com/qmth/cqb/paper/web/ExtractConfigController.java

@@ -87,7 +87,7 @@ public class ExtractConfigController {
     public ResponseEntity extract(@PathVariable Long exam_id, @PathVariable String course_code,@PathVariable String group_code) {
 		try{
 			Map<String, Object> returnMap = extractConfigService.extract(exam_id, course_code, group_code);
-			if(StringUtils.isBlank(returnMap.get("errorMsg")+"")){
+			if(returnMap.get("errorMsg")==null){
 				PaperDto paperDto = (PaperDto) returnMap.get("paperDto");
 				return new ResponseEntity<PaperDto>(paperDto, HttpStatus.OK);
 			}else{