|
@@ -259,11 +259,13 @@ public class KmtExerciseSubmitServiceImpl implements KmtExerciseSubmitService {
|
|
|
*/
|
|
|
private boolean isExistQuestionCantDeal (List<KmtExerciseQuestion> questions, int type){
|
|
|
boolean exist = false;
|
|
|
- if (type == 0 && questions.stream().anyMatch(q -> q.getDealStatus() != 0 && q.getDealStatus() != 1)){
|
|
|
+ if (type == 0 && questions.stream().anyMatch(q ->
|
|
|
+ q.getDealStatus() != 0 && q.getDealStatus() != 1 && q.getDealStatus() != 3 && q.getDealStatus() != 7)){
|
|
|
exist = true;
|
|
|
} else if (type == 1 && questions.stream().anyMatch(q -> q.getDealStatus() != 3 && q.getDealStatus() != 7)){
|
|
|
exist = true;
|
|
|
- } else if (type == 4 && questions.stream().anyMatch(q -> q.getDealStatus() != 5 && q.getDealStatus() != 8)){
|
|
|
+ } else if (type == 4 && questions.stream().anyMatch(q ->
|
|
|
+ q.getDealStatus() != 5 && q.getDealStatus() != 8 && q.getDealStatus() != 9 && q.getDealStatus() != 10)){
|
|
|
exist = true;
|
|
|
} else if (type == 5 && questions.stream().anyMatch(q -> q.getDealStatus() != 9 && q.getDealStatus() != 10)){
|
|
|
exist = true;
|