|
@@ -35,7 +35,7 @@
|
|
|
<if test="dto.endDate != null and dto.endDate != ''">
|
|
|
and t.assessment_date <= #{dto.endDate}
|
|
|
</if>
|
|
|
- <if test="dto.assessmentUserIds != null and dto.assessmentUserIds != ''">
|
|
|
+ <if test="dto.assessmentUserIds != null and dto.assessmentUserIds.size() > 0">
|
|
|
AND t.assessment_user_id in
|
|
|
<foreach item="userId" index="index" collection="dto.assessmentUserIds" open="(" close=")" separator=",">
|
|
|
#{userId}
|
|
@@ -77,19 +77,19 @@
|
|
|
AND t5.class_id IN (
|
|
|
SELECT id FROM base_class WHERE teacher_id = #{dto.teacherId}
|
|
|
)
|
|
|
- <if test="dto.gradeIds != null and dto.gradeIds != ''">
|
|
|
+ <if test="dto.gradeIds != null and dto.gradeIds.size() > 0">
|
|
|
AND t5.grade_id in
|
|
|
<foreach item="gradeId" index="index" collection="dto.gradeIds" open="(" close=")" separator=",">
|
|
|
#{gradeId}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- <if test="dto.classIds != null and dto.classIds != ''">
|
|
|
+ <if test="dto.classIds != null and dto.classIds.size() > 0">
|
|
|
AND t5.class_id in
|
|
|
<foreach item="classId" index="index" collection="dto.classIds" open="(" close=")" separator=",">
|
|
|
#{classId}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- <if test="dto.assessmentUserIds != null and dto.assessmentUserIds != ''">
|
|
|
+ <if test="dto.assessmentUserIds != null and dto.assessmentUserIds.size() > 0">
|
|
|
AND t.assessment_user_id in
|
|
|
<foreach item="assessmentUserId" index="index" collection="dto.assessmentUserIds" open="(" close=")" separator=",">
|
|
|
#{assessmentUserId}
|