|
@@ -240,6 +240,7 @@
|
|
|
<result column="sign_out_status_" property="signOutStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
|
|
|
<result column="sign_in_time_" property="signInTime"/>
|
|
|
<result column="sign_out_time_" property="signOutTime"/>
|
|
|
+ <result column="complaints_status_" property="complaintsStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
|
|
|
<result column="remark_" property="remark"/>
|
|
|
<result column="course_schedule_id_" property="courseScheduleId"/>
|
|
|
</resultMap>
|
|
@@ -338,7 +339,7 @@
|
|
|
cs.class_date_,cs.start_class_time_,cs.end_class_time_,cs.type_ course_schedule_type_,
|
|
|
IF(ta.sign_in_status_ IS NULL,3,ta.sign_in_status_) sign_in_status_,
|
|
|
IF(ta.sign_out_status_ IS NULL,3,ta.sign_out_status_) sign_out_status_,
|
|
|
- ta.sign_in_time_,ta.sign_out_time_,ta.remark_,o.name_ organ_name_,t.job_nature_
|
|
|
+ ta.sign_in_time_,ta.sign_out_time_,ta.remark_,o.name_ organ_name_,t.job_nature_,ta.complaints_status_
|
|
|
FROM course_schedule_teacher_salary csts
|
|
|
LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
|
|
|
LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = csts.course_schedule_id_ AND ta.teacher_id_ = csts.user_id_
|