优化修改

yifu-business/yifu-business-biz/src/main/resources/mapper/TVacationInfoMapper.xml

@@ -75,9 +75,24 @@
              a.VACATION_END_TIME between #{query.vacationStartTime} and #{query.vacationEndTime}
              )
         </if>
-        <if test="query.vacationStatus != null and query.vacationStatus.trim() != ''">
-			and a.VACATION_STATUS = #{query.vacationStatus}
-        </if>
+		<if test="query.vacationStatus != null and query.vacationStatus.trim() != ''">
+			<!-- 待休 -->
+			<if test="query.vacationStatus == '0'.toString()">
+				and now() <![CDATA[<]]> a.VACATION_START_TIME and a.VACATION_STATUS = '4'
+			</if>
+			<!-- 休假中 -->
+			<if test="query.vacationStatus == '1'.toString()">
+				and now() <![CDATA[>=]]> a.VACATION_START_TIME and now() <![CDATA[<=]]> a.VACATION_END_TIME and a.VACATION_STATUS = '4'
+			</if>
+			<!-- 到期待销假 -->
+			<if test="query.vacationStatus == '2'.toString()">
+				and now() <![CDATA[>]]> a.VACATION_END_TIME and a.VACATION_STATUS = '4'
+			</if>
+			<!-- 已销假 -->
+			<if test="query.vacationStatus == '3'.toString()">
+				and a.VACATION_STATUS <![CDATA[<>]]> '4'
+			</if>
+		</if>
     </sql>
 
     <select id="getListByPage" resultMap="TVacationInfoVO">