Commit 6dbf88b9 authored by huyuchen's avatar huyuchen

优化修改

parent 12a9c38a
...@@ -75,9 +75,24 @@ ...@@ -75,9 +75,24 @@
a.VACATION_END_TIME between #{query.vacationStartTime} and #{query.vacationEndTime} a.VACATION_END_TIME between #{query.vacationStartTime} and #{query.vacationEndTime}
) )
</if> </if>
<if test="query.vacationStatus != null and query.vacationStatus.trim() != ''"> <if test="query.vacationStatus != null and query.vacationStatus.trim() != ''">
and a.VACATION_STATUS = #{query.vacationStatus} <!-- 待休 -->
</if> <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> </sql>
<select id="getListByPage" resultMap="TVacationInfoVO"> <select id="getListByPage" resultMap="TVacationInfoVO">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment