差异页修改提交

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

@@ -162,6 +162,10 @@ public class ExerciseBookDto extends ExerciseBookBaseDto implements Serializable
         this.bookYearList.add(dto);
     }
 
+    public void addBookPartType (){
+//        this.bookYearList.get
+    }
+
     public void addUnit(String unitId, String unitName, String courseId, String courseName){
         boolean isExist = false;
 

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

@@ -0,0 +1,27 @@
+package com.ssj.service.kmt.dto.exercise;
+
+import java.io.Serializable;
+
+public class ExerciseBookPartDto implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private int bookPartType;
+
+    private String bookPartName;
+
+    public int getBookPartType() {
+        return bookPartType;
+    }
+
+    public void setBookPartType(int bookPartType) {
+        this.bookPartType = bookPartType;
+    }
+
+    public String getBookPartName() {
+        return bookPartName;
+    }
+
+    public void setBookPartName(String bookPartName) {
+        this.bookPartName = bookPartName;
+    }
+}

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

@@ -24,6 +24,9 @@ public class ExerciseBookYearDto implements Serializable {
 
     private List<ExerciseBookTypeDto> bookTypeList = new ArrayList<>();
 
+    private List<ExerciseBookPartDto> bookPartList = new ArrayList<>();
+
+
 
     public int getBookYear() {
         return bookYear;
@@ -52,4 +55,12 @@ public class ExerciseBookYearDto implements Serializable {
     public void addBookType (int bookType, String exerciseBookId){
         this.bookTypeList.add(new ExerciseBookTypeDto(bookType, exerciseBookId));
     }
+
+    public List<ExerciseBookPartDto> getBookPartList() {
+        return bookPartList;
+    }
+
+    public void setBookPartList(List<ExerciseBookPartDto> bookPartList) {
+        this.bookPartList = bookPartList;
+    }
 }

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

@@ -1027,29 +1027,41 @@ public class KmtExerciseMapperServiceImpl implements KmtExerciseMapperService {
 
     @Override
     public List<ExerciseBookDto> findExerciseBooks(ExerciseConditionRequest request, String userId) {
-        List<ExerciseBookDto> list = null, result = new ArrayList<>();
+        List<ExerciseBookDto> list = null;
 
         if (StringUtils.isNotBlank(request.getQuestionId())){
             list = kmtExerciseMapper.findExerciseBookByQuestionId(request.getQuestionId().trim());
+            return getStaticFormatResult(list, request.getDealType());
         } else if (request.getDealType() == 1){
             list = kmtExerciseMapper.findUnHandleBooks(userId, request.getSearchType(), request.getBookName());
+            return getStaticFormatResult(list, request.getDealType());
         } else if (request.getDealType() == 2){
             list = kmtExerciseMapper.findUnAuditingBooks(userId, request.getSearchType(), request.getBookName());
+            return getStaticFormatResult(list, request.getDealType());
         } else if (request.getDealType() == 4) {
             //解析加工练习册列表
             list = kmtExerciseMapper.findUnAnalysisHandleBooks(userId, request.getSearchType(), request.getBookName());
+            return getStaticFormatResult(list, request.getDealType());
         } else if (request.getDealType() == 5) {
             //解析审核练习册列表
             list = kmtExerciseMapper.findUnAnalysisAuditingBooks(userId, request.getSearchType(), request.getBookName());
+            return getStaticFormatResult(list, request.getDealType());
         } else if (request.getDealType() == 6){
             //未校对练习册列表
             list = kmtExerciseMapper.findUnCorrectAnswerBooks(userId, request.getSearchType(), request.getBookName());
+            return getStaticFormatResult(list, request.getDealType());
         } else if (request.getDealType() == 7) {
             list = kmtExerciseMapper.findCorrectedAnswerBooks(userId, request.getSearchType(), request.getBookName());
+            return getStaticFormatResult(list, request.getDealType());
         } else {
             list = kmtExerciseMapper.findAllExerciseBooks(request.getSubject(), request.getSemester(),
                     request.getVersionType(),  request.getGrade(), request.getSearchType(),  request.getBookName());
+            return getStaticFormatResult(list, request.getDealType());
         }
+    }
+
+    private List<ExerciseBookDto> getStaticFormatResult (List<ExerciseBookDto> list, int type){
+        List<ExerciseBookDto> result = new ArrayList<>();
         if (list != null) {
             for (ExerciseBookDto bookDto : list) {
                 ExerciseBookDto resultBookDto = result.stream().filter(x ->