|
|
@@ -180,19 +180,19 @@
|
|
|
d.`name` as websit_name,
|
|
|
d.link_name,
|
|
|
d.link_mobile,
|
|
|
- a.worker_name,
|
|
|
- a.worker_number,
|
|
|
- a.worker_mobile,
|
|
|
- b.order_small_type_text
|
|
|
+ b.worker_name,
|
|
|
+ b.worker_number,
|
|
|
+ b.worker_mobile,
|
|
|
+ a.order_small_type_text
|
|
|
FROM
|
|
|
- pg_order_worker a
|
|
|
- JOIN admin_websit d on a.websit_id = d.websit_id
|
|
|
- JOIN pg_order_base b ON a.order_base_id = b.id and a.is_master = true and b.order_status in ("YWG","GCSZX","WDWG","YWGO","YJS","LRCD")
|
|
|
+ pg_order_worker b
|
|
|
+ JOIN admin_websit d on b.websit_id = d.websit_id
|
|
|
+ JOIN pg_order_base a ON b.order_base_id = a.id and b.is_master = true and a.order_status in ("YWG","GCSZX","WDWG","YWGO","YJS","LRCD")
|
|
|
${ex.query}
|
|
|
<if test="overTime != null and overTime !=''">
|
|
|
AND a.create_time between #{overTime} and #{overEndTime}
|
|
|
</if>
|
|
|
GROUP BY
|
|
|
- a.worker_number,b.order_small_type,a.websit_id
|
|
|
+ b.worker_number,a.order_small_type,b.websit_id
|
|
|
</select>
|
|
|
</mapper>
|
‘linchangsheng’