|
|
@@ -33,7 +33,8 @@
|
|
|
t11.name AS student_form,
|
|
|
MAX(CASE WHEN t10.feeitemcode LIKE '999010604%' THEN t10.jfzt ELSE NULL END) AS jxf,
|
|
|
MAX(CASE WHEN t10.feeitemcode = 103042766003001 AND t10.beltcode LIKE '%2024%' THEN t10.jfzt ELSE NULL END) AS ssf,
|
|
|
- MAX(CASE WHEN t10.feeitemcode LIKE '999010603%' THEN t10.jfzt ELSE NULL END) AS jcf
|
|
|
+ MAX(CASE WHEN t10.feeitemcode LIKE '999010603%' THEN t10.jfzt ELSE NULL END) AS jcf,
|
|
|
+ CONCAT(t16.name, ' ', t15.room_name, ' ', t14.bed_number) AS bed_info
|
|
|
FROM base_student t1
|
|
|
INNER JOIN xjr_user t2 ON t1.user_id = t2.id
|
|
|
INNER JOIN base_student_school_roll t3 ON t1.user_id = t3.user_id
|
|
|
@@ -47,6 +48,9 @@
|
|
|
LEFT JOIN xjr_dictionary_detail t13 ON t13.code = t3.roll_modality
|
|
|
LEFT JOIN pb_v_xssfdetail t9 ON t9.personalid = t1.student_id
|
|
|
LEFT JOIN pb_v_xsxxsfytb t10 ON t10.Studentcode = t9.personalid
|
|
|
+ LEFT JOIN room_bed t14 ON t14.student_user_id = t2.id
|
|
|
+ LEFT JOIN room t15 ON t14.room_id = t15.id
|
|
|
+ LEFT JOIN base_office_build t16 ON t15.office_build_id = t16.id
|
|
|
WHERE t2.delete_mark = 0
|
|
|
AND t1.delete_mark = 0
|
|
|
AND t3.archives_status = 'FB2901'
|
|
|
@@ -74,7 +78,7 @@
|
|
|
GROUP BY t2.id, t2.name, t1.student_id, t2.mobile, t5.mobile, t5.name, t4.name,
|
|
|
(SELECT mobile FROM base_student_family_member WHERE delete_mark = 0 AND user_id = t2.id AND is_guardian = 1),
|
|
|
t7.name, t8.name, t2.gender, t10.sex, t2.birth_date, t2.avatar, t6.name,
|
|
|
- t12.name, t13.name, t11.name,t3.stduy_status,t3.archives_status,t3.roll_modality
|
|
|
+ t12.name, t13.name, t11.name,t3.stduy_status,t3.archives_status,t3.roll_modality,CONCAT(t16.name, ' ', t15.room_name, ' ', t14.bed_number)
|
|
|
</select>
|
|
|
|
|
|
<select id="getInfoById" resultType="com.xjrsoft.module.student.vo.BaseStudentInfoDetailVo">
|