Merge branch 'bug-branch' of chchen/exercise into master

练习册bug修改

ssj-kmt-exercise-service-impl/src/main/java/com/ssj/service/kmt/kmt/service/impl/KmtExerciseSubmitServiceImpl.java

@@ -258,11 +258,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;