|
|
|
@ -156,11 +156,14 @@ |
|
|
|
|
and t.qs_name = #{qsr} |
|
|
|
|
</if> |
|
|
|
|
<if test="rzhr != null and rzhr != '' and rzhr != 'null' "> |
|
|
|
|
and (t.confirm_user in |
|
|
|
|
<foreach collection="rzhr" index="index" item="item" open="(" separator="," close=")"> |
|
|
|
|
#{item} |
|
|
|
|
</foreach> |
|
|
|
|
or t.confirm_user is null or t.confirm_user = '') |
|
|
|
|
<choose> |
|
|
|
|
<when test="rzhr = 'admin'"> |
|
|
|
|
and (t.confirm_user = 'admin' or t.confirm_user is null or t.confirm_user = '') |
|
|
|
|
</when> |
|
|
|
|
<otherwise> |
|
|
|
|
and t.confirm_user like CONCAT(#{rzhr},'%') |
|
|
|
|
</otherwise> |
|
|
|
|
</choose> |
|
|
|
|
</if> |
|
|
|
|
<if |
|
|
|
|
test="invoiceNo != null and invoiceNo != '' and invoiceNo != 'null' "> |
|
|
|
@ -435,11 +438,14 @@ |
|
|
|
|
and t.qs_name = #{qsr} |
|
|
|
|
</if> |
|
|
|
|
<if test="rzhr != null and rzhr != '' and rzhr != 'null' "> |
|
|
|
|
and (t.confirm_user in |
|
|
|
|
<foreach collection="rzhr" index="index" item="item" open="(" separator="," close=")"> |
|
|
|
|
#{item} |
|
|
|
|
</foreach> |
|
|
|
|
or t.confirm_user is null or t.confirm_user = '') |
|
|
|
|
<choose> |
|
|
|
|
<when test="rzhr = 'admin'"> |
|
|
|
|
and (t.confirm_user = 'admin' or t.confirm_user is null or t.confirm_user = '') |
|
|
|
|
</when> |
|
|
|
|
<otherwise> |
|
|
|
|
and t.confirm_user like CONCAT(#{rzhr},'%') |
|
|
|
|
</otherwise> |
|
|
|
|
</choose> |
|
|
|
|
</if> |
|
|
|
|
<if test="paymentDateStart != null and paymentDateStart != '' and paymentDateStart != 'null' "> |
|
|
|
|
<![CDATA[ AND t.payment_date >= #{paymentDateStart} ]]> |
|
|
|
|