|
|
@@ -108,11 +108,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
AND
|
|
|
<foreach collection="incomeListJson" item="item" separator="OR">
|
|
|
((
|
|
|
- income_start BETWEEN #{item.incomeStart} AND #{item.incomeEnd}
|
|
|
- OR income_end BETWEEN #{item.incomeStart} AND #{item.incomeEnd}
|
|
|
+ #{item.incomeStart} BETWEEN rn.income_start AND rn.income_end
|
|
|
+ OR #{item.incomeEnd} BETWEEN rn.income_start AND rn.income_end
|
|
|
AND income_type = 1
|
|
|
)
|
|
|
- OR ( income_start BETWEEN #{item.incomeStart} * 12 AND #{item.incomeEnd} * 12 OR income_end BETWEEN #{item.incomeStart} * 12 AND #{item.incomeEnd} * 12 AND income_type = 2 ) )
|
|
|
+ OR ( #{item.incomeStart} * 12 BETWEEN rn.income_start AND rn.income_end
|
|
|
+ OR #{item.incomeEnd} * 12 BETWEEN rn.income_start AND rn.income_end AND income_type = 2 ) )
|
|
|
</foreach>
|
|
|
</if>
|
|
|
<if test="pushTimeEnd != null and pushTimeEnd != ''">
|
