练习册bug

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

@@ -1627,6 +1627,7 @@ public class KmtExerciseSysServiceImpl implements KmtExerciseSysService {
         dto.setEditName(exerciseBook.getUserName());
         dto.setBookType(exerciseBook.getBookType());
         dto.setUpdateTime(exerciseBook.getUpdatedTime() != null ? DateHelper.format(exerciseBook.getUpdatedTime(), "yyyy-MM-dd HH:mm:ss") : null);
+        dto.setAssignedBatch(exerciseBook.getAssignedBatch());
         //机构相关
         List<KmtExerciseBookLib> exerciseLibList = KmtExerciseBookLibService.findByExerciseBookId(req.getExerciseBookId());
         List<Exercise2Dto.Library> libraryList = new ArrayList<>();

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

@@ -145,7 +145,7 @@ public class KmtExerciseQuestionServiceImpl extends BaseServiceImpl<KmtExerciseQ
         if (StringUtils.isNotBlank(request.getPeriodId())){
             List<ExerciseQuetionDto> questions = null;
             if (StringUtil.isNotBlank(request.getQuestionId())){
-                questions = kmtExerciseMapper.findExerciseQuestionByQuestionId(request.getQuestionId(), page);
+                questions = kmtExerciseMapper.findExerciseQuestionByQuestionId(request.getQuestionId().trim(), page);
             } else {
                 questions = kmtExerciseMapperService.findQuestionByBookCourseIdAndUserId(request, page,  userId);
             }

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

@@ -92,6 +92,11 @@ public class Exercise2Dto implements Serializable {
      */
     private int bookType;
 
+    /**
+     * 归属批次
+     */
+    private String assignedBatch;
+
     public int getBookType() {
         return bookType;
     }
@@ -279,4 +284,12 @@ public class Exercise2Dto implements Serializable {
     public void setLibList(List<Library> libList) {
         this.libList = libList;
     }
+
+    public String getAssignedBatch() {
+        return assignedBatch;
+    }
+
+    public void setAssignedBatch(String assignedBatch) {
+        this.assignedBatch = assignedBatch;
+    }
 }

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

@@ -34,6 +34,7 @@ import com.ssj.service.kmt.request.UnitAndPeriodListRequest;
 import com.ssj.service.kmt.service.*;
 import com.ssj.service.mapper.HomeworkMapper;
 import com.ssj.service.mapper.KmtExerciseMapper;
+import com.ssj.service.mapper.RecordQuestionMapper;
 import com.ssj.service.weixin.library.service.IBookManagerService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -1029,7 +1030,7 @@ public class KmtExerciseMapperServiceImpl implements KmtExerciseMapperService {
         List<ExerciseBookDto> list = null, result = new ArrayList<>();
 
         if (StringUtils.isNotBlank(request.getQuestionId())){
-            list = kmtExerciseMapper.findExerciseBookByQuestionId(request.getQuestionId());
+            list = kmtExerciseMapper.findExerciseBookByQuestionId(request.getQuestionId().trim());
         } else if (request.getDealType() == 1){
             list = kmtExerciseMapper.findUnHandleBooks(userId, request.getSearchType(), request.getBookName());
         } else if (request.getDealType() == 2){
@@ -1088,11 +1089,14 @@ public class KmtExerciseMapperServiceImpl implements KmtExerciseMapperService {
         List<ExerciseUnitBookcourseDto> list;
         List<ExerciseBookUnitDto> result = new ArrayList<>();
         if (request.getDealType() != 3){
+            if (StringUtil.isNotBlank(request.getQuestionId())){
+                request.setQuestionId(request.getQuestionId().trim());
+            }
             list = kmtExerciseMapper.findUnHandleExerciseBookCourse(request.getExerciseBookId(), request.getDealType(),
                     request.getQuestionId(), userId);
         } else {
             if (StringUtil.isNotBlank(request.getQuestionId())){
-                list = kmtExerciseMapper.findExerciseBookCourseByQuestionId(request.getQuestionId());
+                list = kmtExerciseMapper.findExerciseBookCourseByQuestionId(request.getQuestionId().trim());
             } else {
                 KmtExerciseBook book = kmtExerciseBookService.getById(request.getExerciseBookId());
                 if (book.getBookType() == 1 || book.getBookType() == 2){

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

@@ -1252,7 +1252,7 @@
             and t.book_year = #{map.bookYear}
         </if>
         <if test="map.assignedBatch != null and map.assignedBatch != '' ">
-            and t.assigned_batch = like concat('%',#{map.assignedBatch},'%')
+            and t.assigned_batch like concat('%',#{map.assignedBatch},'%')
         </if>
         order by t.updated_time desc,t.book_name
     </select>
@@ -1851,6 +1851,9 @@
             <if test="req.endTime != null and req.endTime != ''">
                 and '${req.endTime} 23:59:59' > create_time
             </if>
+            <if test="req.assignedBatch != null and req.assignedBatch != ''">
+                and assigned_batch like '%${req.assignedBatch}%'
+            </if>
     </select>
 
     <update id="updateAnswerCorrecterIdByIds">