Merge branch 'edit-branch' into bug-branch

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

@@ -97,11 +97,15 @@ public class KmtExerciseQuestionDealServiceImpl implements KmtExerciseQuestionDe
 
             } else {
                 KmtExerciseQuestion kmtExerciseQuestion = kmtExerciseQuestionService.getById(request.getQuestionId());
+                int dealStatus = kmtExerciseQuestion.getDealStatus();
+                if (kmtExerciseQuestion.getDealStatus() == 2){
+                    dealStatus = 3;
+                }
                 if (kmtExerciseQuestion.getQuestionClassType() == 2){
                     if (!kmtExerciseQuestion.getBigQuestionIndex().equals(request.getBigQuestionIndex())){
                         return responseEntity.failure(ResponseConstant.CODE_000, "大题号不能修改");
                     }
-                    kmtExerciseMapper.updateQuestionEditData(request, questionImage, answerImage);
+                    kmtExerciseMapper.updateQuestionEditData(request, questionImage, answerImage, dealStatus);
                     saveJSONFile(kmtExerciseQuestion, request, questionImage);
                     ThreadPool.getInstance().addTask(new SyncSaveExerciseQuestionsTask(kmtExerciseMapper, exerciseQuestionSearchService,
                             Collections.singletonList(kmtExerciseQuestion.getId())));
@@ -115,7 +119,7 @@ public class KmtExerciseQuestionDealServiceImpl implements KmtExerciseQuestionDe
                         }
                     }
                     //修改大题以及小题的题号
-                    kmtExerciseMapper.updateQuestionEditData(request, questionImage, answerImage);
+                    kmtExerciseMapper.updateQuestionEditData(request, questionImage, answerImage, dealStatus);
                     saveJSONFile(kmtExerciseQuestion, request, questionImage);
                     if (kmtExerciseQuestion.getQuestionClassType() == 0){
                         //单题
@@ -129,8 +133,9 @@ public class KmtExerciseQuestionDealServiceImpl implements KmtExerciseQuestionDe
                     }
                 }
                 //更新练习册为审核中
-                kmtExerciseMapper.updateExerciseBookNotAuditing(kmtExerciseQuestion.getExerciseBookId());
-
+                if (dealStatus == 3){
+                    kmtExerciseMapper.updateExerciseBookNotAuditing(kmtExerciseQuestion.getExerciseBookId());
+                }
             }
             return responseEntity.success("成功");
         } else {

ssj-mybatis-service-impl/src/main/java/com/ssj/service/mapper/KmtExerciseMapper.java

@@ -1174,11 +1174,12 @@ public interface KmtExerciseMapper {
                                                        @Param("id")String id);
 
     @Update("update kmt_exercise_questions set big_question_index=#{req.bigQuestionIndex}, small_question_name=#{req.smallQuestionIndex}, image=#{questionImage}, " +
-            " answer_image=#{answerImage}, deal_status =3" +
+            " answer_image=#{answerImage}, deal_status = #{dealStatus}" +
             " where id=#{req.questionId}")
     int updateQuestionEditData (@Param("req") AddExerciseQuestionRequest req,
                                 @Param("questionImage") String questionImage,
-                                @Param("answerImage") String answerImage);
+                                @Param("answerImage") String answerImage,
+                                @Param("dealStatus") int dealStatus);
 
     @Select("select * from kmt_exercise_questions where book_id=#{bookId} and num >= #{num} order by num limit 1")
     KmtExerciseQuestion findNextByBookIdAndNum (@Param("bookId") String bookId,