差异页筛选

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

@@ -157,10 +157,12 @@ public class ExerciseBookDto extends ExerciseBookBaseDto implements Serializable
         return bookYearList;
     }
 
-    public void addBookYear (int bookYear, int bookType, String exerciseBookId){
+    public void addBookYear (int bookYear, int bookType, String exerciseBookId, int type){
         ExerciseBookYearDto dto = new ExerciseBookYearDto(bookYear);
         dto.addBookType(bookType, exerciseBookId);
-        dto.addBookPartType(bookType);
+        if (type == 3){
+            dto.addBookPartType(bookType);
+        }
         this.bookYearList.add(dto);
     }
 

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

@@ -1086,7 +1086,7 @@ public class KmtExerciseMapperServiceImpl implements KmtExerciseMapperService {
                             x.getBookYear() == bookDto.getBookYear()).findAny().orElse(null);
                     if (resultBookYearDto == null){
                         //是新年份， 增加年份
-                        resultBookDto.addBookYear(bookDto.getBookYear(), bookDto.getBookType(), bookDto.getExerciseBookId());
+                        resultBookDto.addBookYear(bookDto.getBookYear(), bookDto.getBookType(), bookDto.getExerciseBookId(), type);
                     } else {
                         resultBookYearDto.addBookType(bookDto.getBookType(), bookDto.getExerciseBookId());
                     }