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

@@ -92,8 +92,8 @@ public class KmtExerciseSubmitServiceImpl implements KmtExerciseSubmitService {
             boolean isManagerSubmit = isManagerSubmit(userId, request.getType());  //是否是管理员提交
             request.setType(isManagerSubmit ? 3 : request.getType());  //管理员提交修改为3, 管理员修改不改变题目的状态
 
-            if (isExistQuestonsPulish(questions, request.getType())){
-                return responseEntity.failure(ResponseConstant.CODE_000, "题目已发布，不能提交审核");
+            if (isExistQuestionCantDeal(questions, request.getType())){
+                return responseEntity.failure(ResponseConstant.CODE_000, "非可加工状态， 请刷新题目列表");
             } else if (!isQuestionHandlerSubmitKnowledge(request)) {
                 return responseEntity.failure(ResponseConstant.CODE_000, "请添加知识点");
             } else {
@@ -252,6 +252,26 @@ public class KmtExerciseSubmitServiceImpl implements KmtExerciseSubmitService {
     }
 
     /**
+     * 是否存在不可操作题目
+     * @param questions
+     * @param type
+     * @return
+     */
+    private boolean isExistQuestionCantDeal (List<KmtExerciseQuestion> questions, int type){
+        boolean exist = false;
+        if (type == 0 && questions.stream().anyMatch(q -> q.getDealStatus() != 0 && q.getDealStatus() != 1)){
+            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)){
+            exist = true;
+        } else if (type == 5 && questions.stream().anyMatch(q -> q.getDealStatus() != 9 && q.getDealStatus() != 10)){
+            exist = true;
+        }
+        return exist;
+    }
+
+    /**
      * 练习册加工审核是否提交了知识点
      * @param request
      * @return

ssj-kmt-exercise-service/src/main/java/com/ssj/service/kmt/constant/KnowledgeVersion.java

@@ -87,6 +87,9 @@ public class KnowledgeVersion {
 
         temp = new KnowledgeBaseDto(14, "译林版");
         this.englishList.add(temp);
+
+        temp = new KnowledgeBaseDto(15, "外研版(三起点)");
+        this.englishList.add(temp);
     }
 
     /**

ssj-mybatis-service-impl/src/main/resources/mybatis/mapper/KmtExerciseMapper.xml

@@ -84,7 +84,7 @@
         eq.answer_image, eq.num, eq.small_question_name,  eq.parent_id, eq.big_name, eq.real_exam_type, eq.publish_time,
         eq.update_type, eq.difficulty_level, eq.training_skill, eq.course_name, eq.is_common_flag, eq.question_year, eq.exercise_book_id, eq.es_loaded,
         eq.analysis_handler_submit_time, eq.question_class_type, eq.repulse_time,
-        eq.proofread_status, eq.question_path, eq.handler_submit_time
+        eq.proofread_status, eq.question_path, eq.handler_submit_time, eq.concise_id
         from kmt_exercise_questions eq
         left join kmt_exercise_book eb on eq.exercise_book_id=eb.id where eq.id in
         <foreach collection="list" item="id" index="index" open="(" close=")" separator=",">