|
|
@@ -14,6 +14,7 @@
|
|
|
LEFT JOIN base_grade t7 ON t6.grade_id = t7.id
|
|
|
LEFT JOIN base_class t8 ON t6.class_id = t8.id
|
|
|
LEFT JOIN xjr_dictionary_detail t9 ON t2.gender = t9.code AND t9.item_id = 2023000000000000004
|
|
|
+ where t1.delete_mark = 0 and t2.delete_mark = 0
|
|
|
<if test="dto.officeBuildId != null">
|
|
|
and t2.office_build_id = #{dto.officeBuildId}
|
|
|
</if>
|
|
|
@@ -38,6 +39,9 @@
|
|
|
<if test="dto.studentId != null">
|
|
|
and t5.student_id like concat('%',#{dto.studentId},'%')
|
|
|
</if>
|
|
|
+ <if test="dto.identity != null and dto.identity != ''">
|
|
|
+ and t5.check_in_status like concat('%',#{dto.identity},'%')
|
|
|
+ </if>
|
|
|
ORDER BY t1.sort_code
|
|
|
</select>
|
|
|
<select id="getMaxSortCode" resultType="java.lang.Integer">
|