|
|
@@ -9,6 +9,9 @@
|
|
|
INNER JOIN teacher_award_item a2 ON a1.teacher_award_item_id = a2.id
|
|
|
WHERE a1.status = 1 AND a1.delete_mark = 0 AND a2.delete_mark = 0
|
|
|
AND a1.applicant_user_id = t1.id
|
|
|
+ <if test="dto.awardDateStart != null and dto.awardDateEnd != null">
|
|
|
+ and a1.award_date between #{dto.awardDateStart} and #{dto.awardDateEnd}
|
|
|
+ </if>
|
|
|
) AS score FROM xjr_user t1
|
|
|
INNER JOIN base_teacher t2 ON t1.id = t2.user_id
|
|
|
left join xjr_user_dept_relation t4 on t4.user_id = t1.id
|
|
|
@@ -23,8 +26,6 @@
|
|
|
<if test="dto.deptId != null">
|
|
|
and t4.dept_id = #{dto.deptId}
|
|
|
</if>
|
|
|
- <if test="dto.awardDateStart != null and dto.awardDateEnd != null">
|
|
|
- and t4.award_date between #{dto.awardDateStart} and #{dto.awardDateEnd}
|
|
|
- </if>
|
|
|
+
|
|
|
</select>
|
|
|
</mapper>
|
