|
|
@@ -20,7 +20,6 @@ import org.springframework.data.mongodb.core.query.Criteria;
|
|
|
import org.springframework.data.mongodb.core.query.Query;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.util.Assert;
|
|
|
-import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
import cn.com.qmth.examcloud.common.dto.question.PaperDetailDto;
|
|
|
import cn.com.qmth.examcloud.common.dto.question.PaperDetailUnitDto;
|
|
|
@@ -34,7 +33,6 @@ import com.qmth.cqb.paper.dao.ExtractConfigRepo;
|
|
|
import com.qmth.cqb.paper.dao.PaperDetailRepo;
|
|
|
import com.qmth.cqb.paper.dao.PaperDetailUnitRepo;
|
|
|
import com.qmth.cqb.paper.dao.PaperRepo;
|
|
|
-import com.qmth.cqb.paper.dto.PaperDetailUnitExp;
|
|
|
import com.qmth.cqb.paper.model.ExamPaper;
|
|
|
import com.qmth.cqb.paper.model.ExtractConfig;
|
|
|
import com.qmth.cqb.paper.model.Paper;
|
|
|
@@ -129,30 +127,33 @@ 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:"+exam_id+"和courseCode:"+course_code+"获取调卷规则");
|
|
|
+ logger.info("开始根据examId:"+exam_id+"和courseCode:"+course_code+"获取调卷规则");
|
|
|
ExtractConfig extractConfig = this.findConfig(new ExtractConfig(exam_id,course_code));
|
|
|
if(extractConfig==null){
|
|
|
+ logger.info("该考试和课程下调卷规则未制定,请先制定调卷规则,调卷程序退出");
|
|
|
returnMap.put("errorMsg","该考试和课程下调卷规则未制定,请先制定调卷规则");
|
|
|
return returnMap;
|
|
|
}
|
|
|
logger.info("根据调卷规则中设置的概率获取类型为"+group_code+"的试卷");
|
|
|
Map<String,Paper> paperMap = this.getExamPaperByProbability(extractConfig.getExamPaperList());
|
|
|
if(paperMap.isEmpty()){
|
|
|
+ logger.info("该考试和课程下调卷规则中试卷不存在,请检查调卷规则,调卷程序退出");
|
|
|
returnMap.put("errorMsg","该考试和课程下调卷规则中试卷不存在,请重新制定调卷规则");
|
|
|
return returnMap;
|
|
|
}
|
|
|
Paper paper = paperMap.get(group_code);
|
|
|
if(paper==null){
|
|
|
+ logger.info("该考试和课程下调卷规则中该类型试卷不存在,请检查调卷规则,调卷程序退出");
|
|
|
returnMap.put("errorMsg","该考试和课程下调卷规则中该类型试卷不存在,请重新制定调卷规则");
|
|
|
return returnMap;
|
|
|
}
|
|
|
- logger.info("将该类型的试卷根据规则重新组卷");
|
|
|
+ logger.info("将试卷:"+paper.getId()+"根据规则重新组卷");
|
|
|
Paper newPaper = this.recombinationPaper(paper,
|
|
|
extractConfig.getScrambling_the_question_order(),
|
|
|
extractConfig.getScrambling_the_option_order());
|
|
|
- logger.info("根据新试卷 paperId:"+newPaper.getId()+"得到PaperDto后返回");
|
|
|
+ logger.info("根据新试卷 paperId:"+newPaper.getId()+"组装PaperDto后返回");
|
|
|
returnMap.put("paperDto", getPaperDtoByPaper(newPaper));
|
|
|
- logger.info("调卷结束");
|
|
|
+ logger.info("调卷完成");
|
|
|
return returnMap;
|
|
|
}
|
|
|
|
宋悦