Merge branch 'bug-branch' of chchen/exercise into master

列表返回字段

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

@@ -73,22 +73,26 @@ public class KmtExerciseQuestionDealServiceImpl implements KmtExerciseQuestionDe
                 //题目id不存在则是新增, 前端传过来的是新增题目的上一题
                 KmtExerciseBook book  = kmtExerciseBookService.getById(request.getExerciseBookId());
                 KmtExerciseQuestion previousQuestion = kmtExerciseMapper.findPreviousByBookIdAndNum(book.getBookId(), request.getNum());
+                KmtExerciseQuestion newQuestion = null;
                 //新增小题
                 if (request.getQuestionClassType() == 2){
-                    KmtExerciseQuestion newQuestion = saveQuestion(book, request, previousQuestion, questionImage, answerImage);
+                    newQuestion = saveQuestion(book, request, previousQuestion, questionImage, answerImage);
                     saveJSONFile(newQuestion, request, questionImage);
                     ThreadPool.getInstance().addTask(new SyncSaveExerciseBookTask(kmtExerciseMapper, exerciseQuestionSearchService, book.getBookId()));
                 } else {
                     //新增大题, 如果已存在当前大题号，则报错
                     String bqi = kmtExerciseMapper.findBigQuestionIndexByBookCourseId(previousQuestion.getBookCourseId(), request.getBigQuestionIndex());
                     if (StringUtil.isBlank(bqi)){
-                        KmtExerciseQuestion newQuestion = saveQuestion(book, request, previousQuestion, questionImage, answerImage);
+                        newQuestion = saveQuestion(book, request, previousQuestion, questionImage, answerImage);
                         saveJSONFile(newQuestion, request, questionImage);
                         ThreadPool.getInstance().addTask(new SyncSaveExerciseBookTask(kmtExerciseMapper, exerciseQuestionSearchService, book.getBookId()));
                     } else {
                         return responseEntity.failure(ResponseConstant.CODE_000, "当前课时已存在该大题号，请在大题号下添加小题");
                     }
                 }
+                //更新练习册为审核中
+                kmtExerciseMapper.updateExerciseBookNotAuditing(book.getId());
+
             } else {
                 KmtExerciseQuestion kmtExerciseQuestion = kmtExerciseQuestionService.getById(request.getQuestionId());
                 if (kmtExerciseQuestion.getQuestionClassType() == 2){
@@ -120,8 +124,10 @@ public class KmtExerciseQuestionDealServiceImpl implements KmtExerciseQuestionDe
                         ThreadPool.getInstance().addTask(new SyncSaveExerciseBookCourseTask(kmtExerciseMapper, exerciseQuestionSearchService,
                                 kmtExerciseQuestion.getBookCourseId()));
                     }
-
                 }
+                //更新练习册为审核中
+                kmtExerciseMapper.updateExerciseBookNotAuditing(kmtExerciseQuestion.getExerciseBookId());
+
             }
             return responseEntity.success("成功");
         } else {
@@ -213,6 +219,9 @@ public class KmtExerciseQuestionDealServiceImpl implements KmtExerciseQuestionDe
         kmtExerciseQuestion.setDealStatus(3);
         kmtExerciseQuestion.setAnswerImage(answerImage);
         kmtExerciseQuestion.setNum(previousQuestion.getNum() + 1);
+        if (StringUtil.isBlank(request.getSmallQuestionIndex())){
+            request.setSmallQuestionIndex("0");
+        }
         kmtExerciseQuestion.setSmallQuestionName(request.getSmallQuestionIndex());
         kmtExerciseQuestion.setCourseName(previousQuestion.getCourseName());
         kmtExerciseQuestion.setIsCommonFlag(previousQuestion.getIsCommonFlag());
@@ -434,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.getVersion());
+            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,13 +12,10 @@ public class ExerciseQuestionEditDto  implements Serializable {
 
     private String exerciseBookName;
 
-    private String courseName;
+    private String subject;
 
     private String grade;
 
-    @JSONField(serialize = false)
-    private int version;
-
     private String versionName;
 
     private int semester;
@@ -26,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;
 
@@ -41,6 +37,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;
     }
@@ -57,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() {
@@ -73,14 +81,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;
     }
@@ -97,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;
     }
@@ -129,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;
     }
@@ -152,4 +152,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/java/com/ssj/service/mapper/KmtExerciseMapper.java

@@ -1253,4 +1253,7 @@ public interface KmtExerciseMapper {
                                                       @Param("questionClassType") int questionClassType,
                                                       @Param("num") int num,
                                                       @Param("id") String id);
+
+    @Update("update kmt_exercise_book set had_auditing = 0 where id=#{exerciseBookId}")
+    int updateExerciseBookNotAuditing (@Param("exerciseBookId") String exerciseBookId);
 }

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 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
         <choose>