|
@@ -56,6 +56,7 @@
|
|
<result column="subject_name_" property="splitSubjectName"/>
|
|
<result column="subject_name_" property="splitSubjectName"/>
|
|
<result column="id_card_no_" property="idCardNo"/>
|
|
<result column="id_card_no_" property="idCardNo"/>
|
|
<result column="is_settlement_salary_" property="isSettlementSalary"/>
|
|
<result column="is_settlement_salary_" property="isSettlementSalary"/>
|
|
|
|
+ <result column="contract_url_" property="contractUrl"/>
|
|
<result column="tenant_id_" property="tenantId"/>
|
|
<result column="tenant_id_" property="tenantId"/>
|
|
</resultMap>
|
|
</resultMap>
|
|
|
|
|
|
@@ -375,9 +376,10 @@
|
|
<!-- 分页查询 -->
|
|
<!-- 分页查询 -->
|
|
<select id="queryPage" resultMap="Teacher" parameterType="map">
|
|
<select id="queryPage" resultMap="Teacher" parameterType="map">
|
|
SELECT t.id_,su.real_name_,su.lock_flag_,t.subject_id_,su.phone_,t.organ_id_ teacher_organ_id_,t.organ_id_,t.is_support_extra_practice_lesson_,
|
|
SELECT t.id_,su.real_name_,su.lock_flag_,t.subject_id_,su.phone_,t.organ_id_ teacher_organ_id_,t.organ_id_,t.is_support_extra_practice_lesson_,
|
|
- t.job_nature_,t.demission_date_,t.formal_staff_date_,t.is_probation_period_,t.memo_,GROUP_CONCAT(s.name_) subject_name_,su.del_flag_,t.is_settlement_salary_
|
|
|
|
|
|
+ t.job_nature_,t.demission_date_,t.formal_staff_date_,t.is_probation_period_,t.memo_,GROUP_CONCAT(s.name_) subject_name_,su.del_flag_,t.is_settlement_salary_,tc.url_ contract_url_
|
|
FROM teacher t
|
|
FROM teacher t
|
|
LEFT JOIN sys_user su ON t.id_ = su.id_
|
|
LEFT JOIN sys_user su ON t.id_ = su.id_
|
|
|
|
+ left join teacher_contracts tc on tc.user_id_ = t.id_
|
|
LEFT JOIN `subject` s ON FIND_IN_SET(s.id_,t.subject_id_)
|
|
LEFT JOIN `subject` s ON FIND_IN_SET(s.id_,t.subject_id_)
|
|
<include refid="queryPageMap"/>
|
|
<include refid="queryPageMap"/>
|
|
GROUP BY t.id_
|
|
GROUP BY t.id_
|