列表返回字段

ssj-kmt-exercise-api/src/main/java/com/ssj/aijia/kmt/exercise/controller/KmtExerciseController.java

@@ -692,7 +692,7 @@ public class KmtExerciseController extends BaseController {
     }
 
     @RequestMapping(value = "/findEditExerciseQuestions", method = RequestMethod.POST)
-    @ApiOperation(value = "题目修改查询练习册", httpMethod = "POST", notes = "题目修改查询练习册")
+    @ApiOperation(value = "题目修改查询练习册题目", httpMethod = "POST", notes = "题目修改查询练习册题目")
     public ResponseEntity findEditExerciseQuestions(@RequestParam(name = "accessToken") String accessToken,
                                                @RequestBody ExerciseQuestionsEditRequest request) {
         ResponseEntity responseEntity = new ResponseEntity();

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

@@ -440,7 +440,7 @@ public class KmtExerciseQuestionDealServiceImpl implements KmtExerciseQuestionDe
         List<ExerciseQuestionEditDto> list = kmtExerciseMapper.findEditExerciseQuestions(request, page);
         Map<String, String> users = new HashMap<>();
         for (ExerciseQuestionEditDto questionEditDto : list){
-            String versionStr = knowledgeVersion.getVersionNameBySubjectAndVersionNum(questionEditDto.getCourseName(), questionEditDto.getVersion());
+            String versionStr = knowledgeVersion.getVersionNameBySubjectAndVersionNum(questionEditDto.getCourseName(), questionEditDto.getVersionType());
             questionEditDto.setVersionName(versionStr);
             if (questionEditDto.getDealStatus() != 2){
                 questionEditDto.setEditStatus(2);

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

@@ -16,9 +16,6 @@ public class ExerciseQuestionEditDto  implements Serializable {
 
     private String grade;
 
-    @JSONField(serialize = false)
-    private int version;
-
     private String versionName;
 
     private int semester;
@@ -41,6 +38,18 @@ public class ExerciseQuestionEditDto  implements Serializable {
     private int editStatus = 1;
 
 
+    //跳转接口需要的参数
+    private String bookId;
+    private int bookPartType = 1;
+    private int bookYear;
+    private String exerciseBookId;
+    private String periodId;
+    private int rollbackType = 0;
+    private String unitId;
+    private int versionType;
+
+
+
     public String getQuestionId() {
         return questionId;
     }
@@ -73,14 +82,6 @@ public class ExerciseQuestionEditDto  implements Serializable {
         this.grade = grade;
     }
 
-    public int getVersion() {
-        return version;
-    }
-
-    public void setVersion(int version) {
-        this.version = version;
-    }
-
     public int getSemester() {
         return semester;
     }
@@ -152,4 +153,68 @@ public class ExerciseQuestionEditDto  implements Serializable {
     public void setEditStatus(int editStatus) {
         this.editStatus = editStatus;
     }
+
+    public String getBookId() {
+        return bookId;
+    }
+
+    public void setBookId(String bookId) {
+        this.bookId = bookId;
+    }
+
+    public int getBookPartType() {
+        return bookPartType;
+    }
+
+    public void setBookPartType(int bookPartType) {
+        this.bookPartType = bookPartType;
+    }
+
+    public int getBookYear() {
+        return bookYear;
+    }
+
+    public void setBookYear(int bookYear) {
+        this.bookYear = bookYear;
+    }
+
+    public String getExerciseBookId() {
+        return exerciseBookId;
+    }
+
+    public void setExerciseBookId(String exerciseBookId) {
+        this.exerciseBookId = exerciseBookId;
+    }
+
+    public String getPeriodId() {
+        return periodId;
+    }
+
+    public void setPeriodId(String periodId) {
+        this.periodId = periodId;
+    }
+
+    public int getRollbackType() {
+        return rollbackType;
+    }
+
+    public void setRollbackType(int rollbackType) {
+        this.rollbackType = rollbackType;
+    }
+
+    public String getUnitId() {
+        return unitId;
+    }
+
+    public void setUnitId(String unitId) {
+        this.unitId = unitId;
+    }
+
+    public int getVersionType() {
+        return versionType;
+    }
+
+    public void setVersionType(int versionType) {
+        this.versionType = versionType;
+    }
 }

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

@@ -2054,8 +2054,9 @@
     </select>
 
     <select id="findEditExerciseQuestions" resultType="com.ssj.service.kmt.dto.exercise.ExerciseQuestionEditDto">
-        select eq.id question_id, eb.book_name exercise_book_name, eb.course_name, eb.grade, eb.version, eb.semester,
-        eq.deal_status, eb.book_type type, rb.create_time, rb.user_id from kmt_exercise_question_rollback rb,
+        select eq.id question_id, eb.book_name exercise_book_name, eb.course_name, eb.grade, eb.version version_type, eb.semester,
+        eq.deal_status, eb.book_type type, rb.create_time, rb.user_id, eq.book_id, eq.exercise_book_id, eb.book_year,
+        eq.book_course_id period_id, unit_id from kmt_exercise_question_rollback rb,
         kmt_exercise_questions eq, kmt_exercise_book eb
         where rb.question_id=eq.id and eq.exercise_book_id=eb.id and  rb.type=2
         <choose>