|
@@ -1064,6 +1064,9 @@
|
|
|
a.technician_id = e.id left join department f on
|
|
a.technician_id = e.id left join department f on
|
|
|
c.department_id = f.id
|
|
c.department_id = f.id
|
|
|
where a.order_type = 0 and a.delete_sign != 1
|
|
where a.order_type = 0 and a.delete_sign != 1
|
|
|
|
|
+ <if test="deleteStatus==1">
|
|
|
|
|
+ and a.delete_sign = 0
|
|
|
|
|
+ </if>
|
|
|
<if test="orderNo != null">
|
|
<if test="orderNo != null">
|
|
|
and a.order_no= #{orderNo,jdbcType=VARCHAR}
|
|
and a.order_no= #{orderNo,jdbcType=VARCHAR}
|
|
|
</if>
|
|
</if>
|
|
@@ -1138,7 +1141,10 @@
|
|
|
a.finance_id = d.id left join admin e on
|
|
a.finance_id = d.id left join admin e on
|
|
|
a.technician_id = e.id left join department f on
|
|
a.technician_id = e.id left join department f on
|
|
|
c.department_id = f.id
|
|
c.department_id = f.id
|
|
|
- where a.order_type = 0
|
|
|
|
|
|
|
+ where a.order_type = 0 and a.delete_sign != 1
|
|
|
|
|
+ <if test="deleteStatus==1">
|
|
|
|
|
+ and a.delete_sign = 0
|
|
|
|
|
+ </if>
|
|
|
<if test="orderNo != null">
|
|
<if test="orderNo != null">
|
|
|
and a.order_no= #{orderNo,jdbcType=VARCHAR}
|
|
and a.order_no= #{orderNo,jdbcType=VARCHAR}
|
|
|
</if>
|
|
</if>
|