|
|
@@ -107,7 +107,6 @@ class DataAnalysisLogic extends BaseLogic
|
|
|
|
|
|
|
|
|
$res['free_class_flow'] = Db::name('master_worker_commission_notice')->alias('n')
|
|
|
- ->leftJoin('master_worker mw', 'n.master_worker_id = mw.id')
|
|
|
->leftJoin('service_work sw', 'n.master_worker_id = sw.master_worker_id AND sw.create_time >= n.signing_date AND sw.create_time <= n.signing_date_end')
|
|
|
->field([Db::raw("SUM(CASE WHEN sw.service_status = 3 THEN sw.work_total ELSE null END) AS work_total")])
|
|
|
->where([['sw.create_time', 'between', $time]])
|
liugc