增加销假逻辑

common/src/main/resources/mapper/business/RequestForLeaveInfo.xml

@@ -391,7 +391,12 @@
 			and status_ = 1
 			and person_id =#{personId}
 			and start_time < #{attendanceDate}
-			and end_time >= #{attendanceDate}
+			and
+			(
+				(cancel_status='5' and end_time >= #{attendanceDate})
+			or
+				(cancel_status in('1','4') and cancel_time>#{attendanceDate})
+			)
 			order by start_time asc
 		]]>
 	</select>