题目列表修改

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

@@ -443,20 +443,21 @@ 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.getVersionType());
+            String versionStr = knowledgeVersion.getVersionNameBySubjectAndVersionNum(questionEditDto.getSubject(), questionEditDto.getVersionType());
             questionEditDto.setVersionName(versionStr);
             if (questionEditDto.getDealStatus() != 2){
                 questionEditDto.setEditStatus(2);
             }
 
-            if (questionEditDto.getType() == 1){
-                questionEditDto.setBookType("上半");
-            } else if (questionEditDto.getType() == 2){
-                questionEditDto.setBookType("下半");
-            } else if (questionEditDto.getType() == 3) {
-                questionEditDto.setBookType("不同");
+            if (questionEditDto.getBookType() == 1){
+                questionEditDto.setBookTypeName("上半");
+            } else if (questionEditDto.getBookType() == 2){
+                questionEditDto.setBookTypeName("下半");
+            } else if (questionEditDto.getBookType() == 3) {
+                questionEditDto.setBookTypeName("不同");
+                questionEditDto.setBookType(0);
             } else {
-                questionEditDto.setBookType("整本");
+                questionEditDto.setBookTypeName("整本");
             }
             if (users.containsKey(questionEditDto.getUserId())){
                 questionEditDto.setCreateUserName(users.get(questionEditDto.getUserId()));

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

@@ -12,7 +12,7 @@ public class ExerciseQuestionEditDto  implements Serializable {
 
     private String exerciseBookName;
 
-    private String courseName;
+    private String subject;
 
     private String grade;
 
@@ -23,10 +23,9 @@ public class ExerciseQuestionEditDto  implements Serializable {
     @JSONField(serialize = false)
     private int dealStatus;
 
-    @JSONField(serialize = false)
-    private int type;
+    private int bookType;
 
-    private String bookType;
+    private String bookTypeName;
 
     private Date createTime;
 
@@ -66,12 +65,12 @@ public class ExerciseQuestionEditDto  implements Serializable {
         this.exerciseBookName = exerciseBookName;
     }
 
-    public String getCourseName() {
-        return courseName;
+    public String getSubject() {
+        return subject;
     }
 
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
+    public void setSubject(String subject) {
+        this.subject = subject;
     }
 
     public String getGrade() {
@@ -98,14 +97,6 @@ public class ExerciseQuestionEditDto  implements Serializable {
         this.dealStatus = dealStatus;
     }
 
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
     public Date getCreateTime() {
         return createTime;
     }
@@ -130,14 +121,22 @@ public class ExerciseQuestionEditDto  implements Serializable {
         this.versionName = versionName;
     }
 
-    public String getBookType() {
+    public int getBookType() {
         return bookType;
     }
 
-    public void setBookType(String bookType) {
+    public void setBookType(int bookType) {
         this.bookType = bookType;
     }
 
+    public String getBookTypeName() {
+        return bookTypeName;
+    }
+
+    public void setBookTypeName(String bookTypeName) {
+        this.bookTypeName = bookTypeName;
+    }
+
     public String getCreateUserName() {
         return createUserName;
     }

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

@@ -2054,8 +2054,8 @@
     </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 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,
+        select eq.id question_id, eb.book_name exercise_book_name, eb.course_name subject, eb.grade, eb.version version_type, eb.semester,
+        eq.deal_status, eb.book_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