|
|
|
@ -157,12 +157,12 @@
|
|
|
|
|
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
|
|
|
|
|
AND date_format(ico.billTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
|
|
|
|
|
</if>
|
|
|
|
|
<if test="keywords != null and keywords != ''">
|
|
|
|
|
and (ico.billNo like concat('%', #{keywords}, '%')
|
|
|
|
|
or ico.fromCorp like concat('%', #{keywords}, '%')
|
|
|
|
|
or ico.fromCorpName like concat('%', #{keywords}, '%')
|
|
|
|
|
or ico.fromType like concat('%', #{keywords}, '%'))
|
|
|
|
|
</if>
|
|
|
|
|
<!-- <if test="keywords != null and keywords != ''">-->
|
|
|
|
|
<!-- and (ico.billNo like concat('%', #{keywords}, '%')-->
|
|
|
|
|
<!-- or ico.fromCorp like concat('%', #{keywords}, '%')-->
|
|
|
|
|
<!-- or ico.fromCorpName like concat('%', #{keywords}, '%')-->
|
|
|
|
|
<!-- or ico.fromType like concat('%', #{keywords}, '%'))-->
|
|
|
|
|
<!-- </if>-->
|
|
|
|
|
</where>
|
|
|
|
|
GROUP BY
|
|
|
|
|
ico.billNo
|
|
|
|
|