|
@@ -195,7 +195,9 @@
|
|
|
<if test="endTime !=null ">
|
|
<if test="endTime !=null ">
|
|
|
and t.end_time= #{endTime}
|
|
and t.end_time= #{endTime}
|
|
|
</if>
|
|
</if>
|
|
|
-
|
|
|
|
|
|
|
+ <if test="endDate !=null ">
|
|
|
|
|
+ and t.end_date= #{endDate}
|
|
|
|
|
+ </if>
|
|
|
<if test="signType !=null and signType != ''">
|
|
<if test="signType !=null and signType != ''">
|
|
|
and t.sign_type= #{signType}
|
|
and t.sign_type= #{signType}
|
|
|
</if>
|
|
</if>
|
|
@@ -205,9 +207,12 @@
|
|
|
<if test="startTime !=null ">
|
|
<if test="startTime !=null ">
|
|
|
and t.start_time= #{startTime}
|
|
and t.start_time= #{startTime}
|
|
|
</if>
|
|
</if>
|
|
|
|
|
+ <if test="startDate !=null ">
|
|
|
|
|
+ and t.start_date= #{startDate}
|
|
|
|
|
+ </if>
|
|
|
<if test="curTime !=null ">
|
|
<if test="curTime !=null ">
|
|
|
- and t.start_time < #{curTime}
|
|
|
|
|
- and t.end_time > #{curTime}
|
|
|
|
|
|
|
+ and t.start_date < #{curTime}
|
|
|
|
|
+ and t.end_date > #{curTime}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="createUserId !=null and createUserId != ''">
|
|
<if test="createUserId !=null and createUserId != ''">
|
|
|
and t.create_user_id= #{createUserId}
|
|
and t.create_user_id= #{createUserId}
|