Merge remote-tracking branch 'origin/master'

mec-biz/src/main/resources/config/mybatis/CourseScheduleTeacherSalaryMapper.xml

@@ -768,14 +768,20 @@
 			<if test="courseScheduleId!=null">
 				AND cs.id_=#{courseScheduleId}
 			</if>
-			<if test="signInStatus!=null">
+			<if test="signInStatus!=null and signInStatus==1">
 				AND ta.sign_in_status_=#{signInStatus}
 			</if>
-			<if test="signOutStatus!=null">
+            <if test="signInStatus!=null and signInStatus==0">
+                AND (ta.sign_in_status_=#{signInStatus} OR ta.sign_in_status_ IS NULL)
+            </if>
+			<if test="signOutStatus!=null and signOutStatus==1">
 				AND ta.sign_out_status_=#{signOutStatus}
 			</if>
+            <if test="signOutStatus!=null and signOutStatus==1">
+                AND (ta.sign_out_status_=#{signOutStatus} OR ta.sign_out_status_ IS NULL)
+            </if>
 			<if test="confirmStatus!=null">
-				AND csts.confirm_status_=#{confirmStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+				AND csts.confirm_status_=#{confirmStatus}
 			</if>
 			<if test="groupName!=null">
 				AND cs.name_ LIKE CONCAT('%', #{groupName}, '%')