Merge remote-tracking branch 'origin/bug-branch' into bug-branch

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

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

@@ -236,12 +236,12 @@ public class KmtExerciseQuestionDealServiceImpl implements KmtExerciseQuestionDe
             kmtExerciseQuestion.setParentId(null);
             kmtExerciseQuestion.setQuestionClassType(0);
         }
-        kmtExerciseQuestion.setPageIndex(previousQuestion.getPageIndex());
         kmtExerciseQuestion.setImage(questionImage);
         kmtExerciseQuestion.setCreateTime(new Date());
         kmtExerciseQuestion.setDealStatus(3);
         kmtExerciseQuestion.setAnswerImage(answerImage);
         kmtExerciseQuestion.setNum(previousQuestion.getNum() + 1);
+        kmtExerciseQuestion.setPageIndex(request.getPageIndex());
         if (StringUtil.isBlank(request.getSmallQuestionIndex())){
             request.setSmallQuestionIndex("0");
         }

ssj-kmt-exercise-service/src/main/java/com/ssj/service/kmt/dto/ExerciseQuetionDto.java

@@ -87,6 +87,7 @@ public class ExerciseQuetionDto implements Serializable {
     private int moduleType;
 
     private  int num;
+    private Integer pageIndex;
 
     private String questionImage;
 
@@ -155,6 +156,14 @@ public class ExerciseQuetionDto implements Serializable {
         this.num = num;
     }
 
+    public Integer getPageIndex() {
+        return pageIndex;
+    }
+
+    public void setPageIndex(Integer pageIndex) {
+        this.pageIndex = pageIndex;
+    }
+
     public String getQuestionId() {
         return questionId;
     }

ssj-kmt-exercise-service/src/main/java/com/ssj/service/kmt/request/rollbackai/AddExerciseQuestionRequest.java

@@ -45,7 +45,10 @@ public class AddExerciseQuestionRequest implements Serializable {
     private String  analysisJson;
 
     @ApiModelProperty(name = "num", value = "当前题的num, 题目插入到前一题", required = false)
-    private int  num;
+    private int num;
+
+    @ApiModelProperty(name = "pageIndex", value = "页码", required = true)
+    private Integer pageIndex;
 
     public Integer getType() {
         return type;
@@ -150,4 +153,12 @@ public class AddExerciseQuestionRequest implements Serializable {
     public void setNum(int num) {
         this.num = num;
     }
+
+    public Integer getPageIndex() {
+        return pageIndex;
+    }
+
+    public void setPageIndex(Integer pageIndex) {
+        this.pageIndex = pageIndex;
+    }
 }

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

@@ -1174,7 +1174,7 @@ 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 = #{dealStatus}" +
+            " answer_image=#{answerImage}, deal_status = #{dealStatus}, page_index = #{req.pageIndex}" +
             " where id=#{req.questionId}")
     int updateQuestionEditData (@Param("req") AddExerciseQuestionRequest req,
                                 @Param("questionImage") String questionImage,