|
@@ -76,11 +76,8 @@
|
|
|
</foreach>
|
|
|
</if>
|
|
|
<if test="dto.planBegindate != null and dto.planEnddate != null ">
|
|
|
- and (t1.PLAN_BEGINDATE >= #{dto.planBegindate}
|
|
|
- and t1.PLAN_ENDDATE <= #{dto.planEnddate}
|
|
|
- or
|
|
|
- t1.PLAN_BEGINDATE <= #{dto.planBegindate}
|
|
|
- and t1.PLAN_ENDDATE >= #{dto.planEnddate})
|
|
|
+ and (t1.PLAN_BEGINDATE between #{dto.planBegindate} and #{dto.planEnddate}
|
|
|
+ or t1.PLAN_ENDDATE between #{dto.planBegindate} and #{dto.planEnddate})
|
|
|
</if>
|
|
|
<if test="dto.createUser != null ">
|
|
|
and t1.CREATE_USER = #{createUser}
|