|
|
@@ -58,7 +58,7 @@
|
|
|
SELECT t1.id,t1.credential_number,t1.name,t4.name AS gender_cn,t1.graduate_school,t1.graduate_class,
|
|
|
t5.name AS first_ambition, t6.name AS second_ambition,t7.name AS stduy_status_cn,t1.height,t1.weight,t1.score,t3.name AS class_name,
|
|
|
t8.name AS teacher_name FROM base_new_student t1
|
|
|
- INNER JOIN banding_task_class_student t2 ON t1.id = t2.new_student_id
|
|
|
+ LEFT JOIN banding_task_class_student t2 ON t1.id = t2.new_student_id AND t2.delete_mark = 0
|
|
|
LEFT JOIN banding_task_class t3 ON t2.banding_task_class_id = t3.id
|
|
|
AND t3.delete_mark = 0 AND t3.banding_task_id = #{dto.bandingTaskId}
|
|
|
LEFT JOIN xjr_dictionary_detail t4 ON t1.gender = t4.code
|
|
|
@@ -67,7 +67,7 @@
|
|
|
LEFT JOIN xjr_dictionary_detail t7 ON t1.stduy_status = t7.code
|
|
|
LEFT JOIN xjr_user t8 ON t3.teacher_id = t8.id
|
|
|
INNER JOIN enrollment_plan t9 ON t1.enrollment_plan_id = t9.id
|
|
|
- WHERE t1.delete_mark = 0 AND t2.delete_mark = 0
|
|
|
+ WHERE t1.delete_mark = 0
|
|
|
and t9.grade_id = #{dto.gradeId} and t9.enroll_type = #{dto.enrollType}
|
|
|
<if test="dto.credentialNumber != null and dto.credentialNumber != ''">
|
|
|
AND t1.credential_number like concat('%', #{dto.credentialNumber}, '%')
|
