|
|
@@ -21,9 +21,9 @@
|
|
|
select (select count(id) from welcome_accompany where student_card = ws.card_id) as accompanyNum,
|
|
|
ws.id,ws.admiss_num,ws.name,ws.card_id,ws.college,ws.major,ws.classstr,
|
|
|
ws.traffic_method,ws.arrive,ws.amount_payable,ws.pay_amount,
|
|
|
- CONCAT(wsd.building, '-', wsd.dormitory, '-', wsd.bed_num) as dormitory
|
|
|
+ CONCAT(wsd.build, '-', wsd.dormitory, '-', wsd.number) as dormitory
|
|
|
from welcome_student ws
|
|
|
- left join welcome_student_dormitory wsd on wsd.deleted =0 and wsd.student_card = ws.card_id
|
|
|
+ left join welcome_bed wsd on wsd.deleted =0 and wsd.student_card = ws.card_id
|
|
|
where ws.deleted = 0
|
|
|
<if test="collegeId != null and collegeId != ''">
|
|
|
and ws.college_id = #{collegeId}
|
