|
|
@@ -72,6 +72,7 @@
|
|
|
<result column="grade_type_" property="gradeType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
|
|
|
<result column="cooperation_organ_id_" property="cooperationOrganId"/>
|
|
|
<result column="cooperation_organ_name_" property="cooperationOrganName"/>
|
|
|
+ <result column="membershipEndTime" property="membership_end_time_"/>
|
|
|
</resultMap>
|
|
|
|
|
|
<sql id="queryCondition">
|
|
|
@@ -163,7 +164,7 @@
|
|
|
tu.`real_name_` teacher_name_,CASE s.service_tag_ WHEN 2 THEN 0 ELSE s.service_tag_ END service_tag_ ,s.`operating_tag_` ,
|
|
|
s.care_package_, s.come_on_package_, suca.`course_balance_` ,suca.balance_,
|
|
|
sub.`name_` music_group_subject_ ,su.birthdate_,s.subject_id_list_,s.teacher_id_,s.current_grade_num_,s.current_class_,s.member_rank_setting_id_,
|
|
|
- CASE WHEN su.password_ IS NULL THEN FALSE ELSE TRUE END isActive_,s.is_new_user_,CASE WHEN sut.user_id_ IS NULL THEN 0 ELSE 1 END is_signed_contract_,
|
|
|
+ CASE WHEN su.password_ IS NULL THEN FALSE ELSE TRUE END isActive_,s.is_new_user_,s.membership_end_time_,CASE WHEN sut.user_id_ IS NULL THEN 0 ELSE 1 END is_signed_contract_,
|
|
|
s.cooperation_organ_id_,co.name_ cooperation_organ_name_
|
|
|
FROM `student` s LEFT JOIN `sys_user` su ON s.`user_id_` = su.`id_`
|
|
|
LEFT JOIN `organization` o ON o.`id_` = su.`organ_id_`
|
zouxuan