|
|
@@ -585,7 +585,7 @@ public class ElPaperServiceImpl implements IElPaperService {
|
|
|
public ElPaper startAssess(Long courseChapterId) {
|
|
|
|
|
|
ElCourseChapter courseChapter = courseChapterMapper.selectElCourseChapterById(courseChapterId);
|
|
|
- if(courseChapter == null && courseChapter.getIsAssess() == 0){
|
|
|
+ if(courseChapter == null || courseChapter.getIsAssess() == 0){
|
|
|
throw new ServiceException("该章节不需要考核!");
|
|
|
}
|
|
|
// 检验该章节完成,完成则才能考核
|
|
|
@@ -746,7 +746,7 @@ public class ElPaperServiceImpl implements IElPaperService {
|
|
|
* @param examId
|
|
|
* @return
|
|
|
*/
|
|
|
- private List<ElPaperQu> generateByRepo(Long examId, Integer level) {
|
|
|
+ private List<ElPaperQu> generateByRepo(Long examId, Integer levelPar) {
|
|
|
|
|
|
// 查找规则指定的题库
|
|
|
List<ElExamRepo> list = elExamRepoService.queryByExamId(examId);
|
|
|
@@ -758,7 +758,7 @@ public class ElPaperServiceImpl implements IElPaperService {
|
|
|
List<Long> excludes = new ArrayList<>();
|
|
|
|
|
|
// 去掉 难度匹配
|
|
|
- level = null;
|
|
|
+ Integer level = null;
|
|
|
if (!CollectionUtils.isEmpty(list)) {
|
|
|
for (ElExamRepo item : list) {
|
|
|
// 2.1需求, 需要在组题模式下 根据分类组题
|