Merge branch 'question-branch' into aijia-branch

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

@@ -1917,7 +1917,7 @@
               and '${req.endTime} 23:59:59' > ebdc.import_date
           </if>
         </where>
-        group by ebdc.*, eb.assigned_batch
+        group by ebdc.exercise_book_id
         order by ebdc.import_date desc
         limit #{offset}
     </select>
@@ -2100,5 +2100,6 @@
         <foreach collection="exerciseBookIds" item="id" index="index" open="(" close=")" separator=",">
             #{id}
         </foreach>
+        group by exercise_book_id
     </select>
 </mapper>