|
|
@@ -377,6 +377,9 @@
|
|
|
left join public_release_details b on a.id=b.prid
|
|
|
left join user e on b.uid=e.id
|
|
|
</if>
|
|
|
+ <if test="type==5">
|
|
|
+ left join t_order_new ton on a.order_no =ton.order_no
|
|
|
+ </if>
|
|
|
where 1=1
|
|
|
<if test="type==0">
|
|
|
and a.public_type in (0,1,2,3)
|
|
|
@@ -425,6 +428,10 @@
|
|
|
and e.aid = #{aid}
|
|
|
and a.public_type in (1,2)
|
|
|
</if>
|
|
|
+ <if test="type==5">
|
|
|
+ and a.tech_start_process=1
|
|
|
+ and ton.salesman_id =#{aid}
|
|
|
+ </if>
|
|
|
<if test="clockIn !=null">
|
|
|
and a.clock_in =#{clockIn}
|
|
|
</if>
|
|
|
@@ -462,6 +469,9 @@
|
|
|
left join public_release_details b on a.id=b.prid
|
|
|
left join user e on b.uid=e.id
|
|
|
</if>
|
|
|
+ <if test="type==5">
|
|
|
+ left join t_order_new ton on a.order_no =ton.order_no
|
|
|
+ </if>
|
|
|
where 1=1
|
|
|
<if test="type==0">
|
|
|
and a.public_type in (0,1,2,3)
|
|
|
@@ -510,6 +520,10 @@
|
|
|
and e.aid = #{aid}
|
|
|
and a.public_type in (1,2)
|
|
|
</if>
|
|
|
+ <if test="type==5">
|
|
|
+ and a.tech_start_process=1
|
|
|
+ and ton.salesman_id =#{aid}
|
|
|
+ </if>
|
|
|
<if test="userName !=null">
|
|
|
and e.nickname like concat('%',#{userName},'%')
|
|
|
</if>
|