|
|
@@ -1026,9 +1026,6 @@
|
|
|
<if test="endDate != null">
|
|
|
and a.create_time < #{endDate,jdbcType=TIMESTAMP}
|
|
|
</if>
|
|
|
- <if test="buyerName != null and buyerName != ''">
|
|
|
- and b.nickname = #{buyerName,jdbcType=VARCHAR}
|
|
|
- </if>
|
|
|
<if test="orderStatus != null">
|
|
|
and a.order_status = #{orderStatus,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
@@ -1044,6 +1041,12 @@
|
|
|
<if test="approval != null">
|
|
|
and a.approval = #{approval,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
+ <if test="buyerName != null and buyerName != ''">
|
|
|
+ and b.nickname = #{buyerName,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
+ <if test="salesmanName != null and salesmanName != ''">
|
|
|
+ and c.name = #{salesmanName,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
<!-- 特殊处理字段 开始 -->
|
|
|
<if test="intention == 1">
|
|
|
and a.order_stage = 0
|
|
|
@@ -1091,9 +1094,6 @@
|
|
|
<if test="endDate != null">
|
|
|
and a.create_time < #{endDate,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
- <if test="buyerName != null and buyerName != ''">
|
|
|
- and b.nickname = #{buyerName,jdbcType=VARCHAR}
|
|
|
- </if>
|
|
|
<if test="orderStatus != null">
|
|
|
and a.order_status = #{orderStatus,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
@@ -1110,11 +1110,17 @@
|
|
|
and a.liquidation_status = #{liquidationStatus,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
<if test="orderChannel != null">
|
|
|
- and.order_channel =#{orderChannel,jdbcType=INTEGER}
|
|
|
+ and a.order_channel =#{orderChannel,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
<if test="approval != null">
|
|
|
and a.approval = #{approval,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
+ <if test="buyerName != null and buyerName != ''">
|
|
|
+ and b.nickname = #{buyerName,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
+ <if test="salesmanName != null and salesmanName != ''">
|
|
|
+ and c.name = #{salesmanName,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
<!-- 特殊处理字段 开始 -->
|
|
|
<if test="intention == 1">
|
|
|
and a.order_stage = 0
|
|
|
@@ -1373,6 +1379,9 @@
|
|
|
b.salesman_id = f.id left join department_management g on
|
|
|
f.department_id = g.id
|
|
|
where 1=1
|
|
|
+ <if test="orderNo != null and orderNo != ''">
|
|
|
+ and b.order_no = #{orderNo,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
<if test="payeeName != null and payeeName != ''">
|
|
|
and c.nickname = #{payeeName,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
@@ -1421,6 +1430,9 @@
|
|
|
b.salesman_id = f.id left join department_management g on
|
|
|
f.department_id = g.id
|
|
|
where 1=1
|
|
|
+ <if test="orderNo != null and orderNo != ''">
|
|
|
+ and b.order_no = #{orderNo,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
<if test="payeeName != null and payeeName != ''">
|
|
|
and c.nickname = #{payeeName,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
@@ -1527,15 +1539,22 @@
|
|
|
<if test="endDate != null">
|
|
|
and a.create_time < #{a.endDate,jdbcType=TIMESTAMP}
|
|
|
</if>
|
|
|
- <if test="buyerName != null and buyerName != ''">
|
|
|
- and b.nickname = #{buyerName,jdbcType=VARCHAR}
|
|
|
- </if>
|
|
|
+
|
|
|
<if test="approval != null">
|
|
|
and a.approval = #{approval,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
<if test="depId != null and depId != ''">
|
|
|
and f.id = #{depId,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
+ <if test="buyerName != null and buyerName != ''">
|
|
|
+ and b.nickname = #{buyerName,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
+ <if test="salesmanName != null and salesmanName != ''">
|
|
|
+ and c.name = #{salesmanName,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
+ <if test="financeName != null and financeName != ''">
|
|
|
+ and d.name = #{financeName,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
<if test="page_sql != null">
|
|
|
${page_sql}
|
|
|
</if>
|
|
|
@@ -1567,15 +1586,21 @@
|
|
|
<if test="endDate != null">
|
|
|
and a.create_time < #{a.endDate,jdbcType=TIMESTAMP}
|
|
|
</if>
|
|
|
- <if test="buyerName != null and buyerName != ''">
|
|
|
- and b.nickname = #{buyerName,jdbcType=VARCHAR}
|
|
|
- </if>
|
|
|
<if test="approval != null">
|
|
|
and a.approval = #{approval,jdbcType=INTEGER}
|
|
|
</if>
|
|
|
<if test="depId != null and depId != ''">
|
|
|
and f.id = #{depId,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
+ <if test="buyerName != null and buyerName != ''">
|
|
|
+ and b.nickname = #{buyerName,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
+ <if test="salesmanName != null and salesmanName != ''">
|
|
|
+ and c.name = #{salesmanName,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
+ <if test="financeName != null and financeName != ''">
|
|
|
+ and d.name = #{financeName,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
<if test="page_sql != null">
|
|
|
${page_sql}
|
|
|
</if>
|