|
|
@@ -15,7 +15,8 @@
|
|
|
COUNT(DISTINCT a.id) AS 'all'
|
|
|
from pg_order_base a
|
|
|
left join pg_order_worker b on a.id = b.order_base_id
|
|
|
- where ((b.worker_id=#{workerId} or b.worker_number=#{workerNumber}) or a.order_status = 'DQD') and a.order_status not in ('YQX','FWQX','FL','FWZT','YCGB')
|
|
|
+ where ((b.worker_id=#{workerId} or b.worker_number=#{workerNumber}) or (a.order_status = 'DQD' and a.order_status not in ('YQX','FWQX','FL','FWZT','YCGB'))
|
|
|
+ ) and a.order_status not in ('YQX','FWQX','FL','FWZT','YCGB')
|
|
|
<if test="isYb != null and isYb == true">
|
|
|
and a.pg_incre_order_id != ''
|
|
|
</if>
|
‘linchangsheng’