|
@@ -837,7 +837,7 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
|
|
|
and a.order_no= #{orderNo,jdbcType=VARCHAR}
|
|
and a.order_no= #{orderNo,jdbcType=VARCHAR}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="name != null">
|
|
<if test="name != null">
|
|
|
- and a.commodity_name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
|
|
|
|
|
|
|
+ and f.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
|
|
|
</if>
|
|
</if>
|
|
|
<if test="orderNo != null">
|
|
<if test="orderNo != null">
|
|
|
and a.order_no= #{orderNo,jdbcType=VARCHAR}
|
|
and a.order_no= #{orderNo,jdbcType=VARCHAR}
|
|
@@ -865,13 +865,14 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
|
|
|
from t_task_log x left join t_order_task a on x.task_id=a.id
|
|
from t_task_log x left join t_order_task a on x.task_id=a.id
|
|
|
left join admin d on a.task_receiver=d.id
|
|
left join admin d on a.task_receiver=d.id
|
|
|
left join t_order_new e on a.order_no=e.order_no
|
|
left join t_order_new e on a.order_no=e.order_no
|
|
|
|
|
+ left join user f on e.buyer_id=f.id
|
|
|
where e.delete_sign=0
|
|
where e.delete_sign=0
|
|
|
and x.task_receiver= #{aid,jdbcType=VARCHAR}
|
|
and x.task_receiver= #{aid,jdbcType=VARCHAR}
|
|
|
<if test="orderNo != null">
|
|
<if test="orderNo != null">
|
|
|
and a.order_no= #{orderNo,jdbcType=VARCHAR}
|
|
and a.order_no= #{orderNo,jdbcType=VARCHAR}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="name != null">
|
|
<if test="name != null">
|
|
|
- and a.commodity_name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
|
|
|
|
|
|
|
+ and f.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
|
|
|
</if>
|
|
</if>
|
|
|
<if test="depId != null">
|
|
<if test="depId != null">
|
|
|
and g.department_id= #{depId ,jdbcType=VARCHAR}
|
|
and g.department_id= #{depId ,jdbcType=VARCHAR}
|