|
@@ -356,19 +356,29 @@
|
|
|
where
|
|
|
p.deleted = 0 and p.client_manager_id = #{personal.clientManagerId}
|
|
|
<if test="keyword!=null and keyword!='' ">
|
|
|
- and (
|
|
|
- p.location like concat ('%',#{keyword},'%')
|
|
|
- or p.order_id like concat('%',#{keyword},'%')
|
|
|
- or p.agent like concat('%',#{keyword},'%')
|
|
|
- or p.bailorA like concat('%',#{keyword},'%')
|
|
|
- or p.bailorB like concat('%',#{keyword},'%')
|
|
|
- or cc1.name like concat('%',#{keyword},'%')
|
|
|
- or cc2.name like concat('%',#{keyword},'%')
|
|
|
- or cl.name like concat('%',#{keyword},'%')
|
|
|
- or p.bailorA_tel like concat('%',#{keyword},'%')
|
|
|
- or p.bailorB_tel like concat('%',#{keyword},'%')
|
|
|
+ and p.location like concat ('%',#{keyword},'%')
|
|
|
+ </if>
|
|
|
+ <if test="personal!=null and personal.orderId!=null">
|
|
|
+ AND p.order_id like concat('%',#{personal.orderId},'%')
|
|
|
+ </if>
|
|
|
+ <if test="personal!=null and personal.bailor!=null">
|
|
|
+ AND (
|
|
|
+ p.bailorA like concat('%',#{personal.bailor},'%')
|
|
|
+ or p.bailorB like concat('%',#{personal.bailor},'%')
|
|
|
)
|
|
|
</if>
|
|
|
+ <if test="personal!=null and personal.clientName!=null">
|
|
|
+ AND cc1.name like concat('%',#{personal.clientName},'%')
|
|
|
+ </if>
|
|
|
+ <if test="personal!=null and personal.clientSubName!=null">
|
|
|
+ AND cc2.name like concat('%',#{personal.clientSubName},'%')
|
|
|
+ </if>
|
|
|
+ <if test="personal!=null and personal.shouldAmount!=null">
|
|
|
+ AND o.should_amount = #{personal.shouldAmount}
|
|
|
+ </if>
|
|
|
+ <if test="personal!=null and personal.invoiceAmountCondition!=null">
|
|
|
+ AND fi.invoiceAmount = #{personal.invoiceAmountCondition}
|
|
|
+ </if>
|
|
|
<if test="personal!=null and personal.startDate!=null and personal.startDate!=''">
|
|
|
and p.created >= #{personal.startDate}
|
|
|
</if>
|