|
@@ -60,9 +60,9 @@ public class GenPaperController extends ControllerSupport {
|
|
if (genPaperDto.getGenNumber() == 1) {
|
|
if (genPaperDto.getGenNumber() == 1) {
|
|
//判断抽题类型 按数量 按分数
|
|
//判断抽题类型 按数量 按分数
|
|
if (genPaperDto.getSimpleGenPaperPolicy().getKey() == 1L) {
|
|
if (genPaperDto.getSimpleGenPaperPolicy().getKey() == 1L) {
|
|
- paperMap = genPaperService.genPaperByQuestionNum(genPaperDto);
|
|
|
|
|
|
+ paperMap = genPaperService.genPaperByQuestionNumW(genPaperDto);
|
|
}else {
|
|
}else {
|
|
- paperMap = genPaperService.genPaperByScore(genPaperDto);
|
|
|
|
|
|
+ paperMap = genPaperService.genPaperByScoreW(genPaperDto);
|
|
}
|
|
}
|
|
}else {
|
|
}else {
|
|
//如果是组多套试卷
|
|
//如果是组多套试卷
|
|
@@ -70,9 +70,9 @@ public class GenPaperController extends ControllerSupport {
|
|
genPaperDto.setPaperName(genPaperDto.getPaperName() + "_" + i);
|
|
genPaperDto.setPaperName(genPaperDto.getPaperName() + "_" + i);
|
|
//判断抽题类型 按数量 按分数
|
|
//判断抽题类型 按数量 按分数
|
|
if (genPaperDto.getSimpleGenPaperPolicy().getKey() == 1L) {
|
|
if (genPaperDto.getSimpleGenPaperPolicy().getKey() == 1L) {
|
|
- paperMap.putAll(genPaperService.genPaperByQuestionNum(genPaperDto));
|
|
|
|
|
|
+ paperMap.putAll(genPaperService.genPaperByQuestionNumW(genPaperDto));
|
|
}else {
|
|
}else {
|
|
- paperMap.putAll(genPaperService.genPaperByScore(genPaperDto));
|
|
|
|
|
|
+ paperMap.putAll(genPaperService.genPaperByScoreW(genPaperDto));
|
|
}
|
|
}
|
|
if (!paperMap.get("msg").equals("success")) {
|
|
if (!paperMap.get("msg").equals("success")) {
|
|
return new ResponseEntity<Object>(paperMap, HttpStatus.INTERNAL_SERVER_ERROR);
|
|
return new ResponseEntity<Object>(paperMap, HttpStatus.INTERNAL_SERVER_ERROR);
|