|
|
|
@ -99,7 +99,7 @@
|
|
|
|
|
</if>
|
|
|
|
|
|
|
|
|
|
<if test="supInoivceSearch != null">
|
|
|
|
|
<if test="invoiceActions1 != null and invoiceActions1.size() != 0">
|
|
|
|
|
<if test="invoiceActions1 != null and invoiceActions2 == null">
|
|
|
|
|
AND ((`action` in
|
|
|
|
|
<foreach collection="invoiceActions1" index="index" item="item" open="(" close=")" separator=",">
|
|
|
|
|
#{item}
|
|
|
|
@ -133,19 +133,18 @@
|
|
|
|
|
</if>
|
|
|
|
|
</if>
|
|
|
|
|
|
|
|
|
|
<if test="supInoivceSearch != null and invoiceActions1 == null and invoiceActions1.size() == 0 ">
|
|
|
|
|
|
|
|
|
|
<if test="supInoivceSearch != null and invoiceActions1 == null and invoiceActions1.size() == 0">
|
|
|
|
|
<if test="invoiceActions2 != null and invoiceActions2.size() != 0">
|
|
|
|
|
and (
|
|
|
|
|
`action` in
|
|
|
|
|
`action` in
|
|
|
|
|
<foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
|
|
|
|
|
#{item}
|
|
|
|
|
</foreach>
|
|
|
|
|
and status = 7
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
</if>
|
|
|
|
|
</if>
|
|
|
|
|
<if test="supInoivceSearch != null and invoiceActions2 == null and invoiceActions2.size()== 0 ">
|
|
|
|
|
<if test="supInoivceSearch != null and invoiceActions2 == null and invoiceActions2.size() == 0">
|
|
|
|
|
<if test="invoiceActions1 != null and invoiceActions2 == null">
|
|
|
|
|
AND (`action` in
|
|
|
|
|
<foreach collection="invoiceActions1" index="index" item="item" open="(" close=")" separator=",">
|
|
|
|
@ -154,7 +153,6 @@
|
|
|
|
|
and status = 10)
|
|
|
|
|
</if>
|
|
|
|
|
</if>
|
|
|
|
|
|
|
|
|
|
</where>
|
|
|
|
|
order by createTime desc
|
|
|
|
|
</select>
|
|
|
|
|