生成试卷bug
This commit is contained in:
@@ -201,7 +201,7 @@ public class ClassExamServiceImpl extends ServiceImpl<ClassExamDao, ClassExam> i
|
|||||||
.select(ClassExamSubject::getId,ClassExamSubject::getType,ClassExamSubject::getContent)
|
.select(ClassExamSubject::getId,ClassExamSubject::getType,ClassExamSubject::getContent)
|
||||||
.eq(ClassExamSubject::getCourseId,classCourse.getCourseId())
|
.eq(ClassExamSubject::getCourseId,classCourse.getCourseId())
|
||||||
.eq(ClassExamSubject::getType,0)
|
.eq(ClassExamSubject::getType,0)
|
||||||
.notIn(ClassExamSubject::getId,historySubjectList));
|
.notIn(historySubjectList.size()>0,ClassExamSubject::getId,historySubjectList));
|
||||||
Collections.shuffle(singleList);//打乱顺序
|
Collections.shuffle(singleList);//打乱顺序
|
||||||
try {
|
try {
|
||||||
if (sList.size()+snum>stotal){
|
if (sList.size()+snum>stotal){
|
||||||
@@ -217,7 +217,7 @@ public class ClassExamServiceImpl extends ServiceImpl<ClassExamDao, ClassExam> i
|
|||||||
.select(ClassExamSubject::getId,ClassExamSubject::getType,ClassExamSubject::getContent)
|
.select(ClassExamSubject::getId,ClassExamSubject::getType,ClassExamSubject::getContent)
|
||||||
.eq(ClassExamSubject::getCourseId,classCourse.getCourseId())
|
.eq(ClassExamSubject::getCourseId,classCourse.getCourseId())
|
||||||
.eq(ClassExamSubject::getType,1)
|
.eq(ClassExamSubject::getType,1)
|
||||||
.notIn(ClassExamSubject::getId,historySubjectList));
|
.notIn(historySubjectList.size()>0,ClassExamSubject::getId,historySubjectList));
|
||||||
Collections.shuffle(mulList);//打乱顺序
|
Collections.shuffle(mulList);//打乱顺序
|
||||||
try {
|
try {
|
||||||
if (mList.size()+mnum>mtotal){
|
if (mList.size()+mnum>mtotal){
|
||||||
|
|||||||
Reference in New Issue
Block a user