修改调卷规则代码

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

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

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

@@ -87,12 +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(returnMap.get("errorMsg")==null){
-				PaperDto paperDto = (PaperDto) returnMap.get("paperDto");
-				return new ResponseEntity<PaperDto>(paperDto, HttpStatus.OK);
-			}else{
-				return new ResponseEntity<String>(returnMap.get("errorMsg")+"", HttpStatus.OK);
-			}
+			return new ResponseEntity<Map<String, Object>>(returnMap, HttpStatus.OK);
 		}catch(Exception e){
 			logger.error("抽卷失败",e);
 			return new ResponseEntity(HttpStatus.INTERNAL_SERVER_ERROR);