|
|
@@ -608,7 +608,7 @@ class OaService extends Service
|
|
|
}
|
|
|
|
|
|
|
|
|
- public function report($oaOrder, $oa_sub_id)
|
|
|
+ public function report($oaOrder, $oa_sub_id,$user_id)
|
|
|
{
|
|
|
$oa_sub_report_employee = OaSubReportEmployee::where('oa_sub_id', $oa_sub_id)->select('*')->get()->toArray();
|
|
|
if (!empty($oa_sub_report_employee)) {
|
|
|
@@ -617,6 +617,7 @@ class OaService extends Service
|
|
|
$report->menu_id = $oaOrder->menu_id;
|
|
|
$report->order_no = $oaOrder->order_no;
|
|
|
$report->opt_case = $oaOrder->opt_case;
|
|
|
+ $report->user_id = $user_id;
|
|
|
$report->save();
|
|
|
foreach ($oa_sub_report_employee as $v) {
|
|
|
$list[] = [
|
|
|
@@ -803,8 +804,9 @@ class OaService extends Service
|
|
|
$list = OaReportOrder::from('oa_report_order_employee as e')
|
|
|
->leftJoin('oa_report_order as o','o.id','e.oa_report_order_id')
|
|
|
->leftJoin('oa_order as oo','oo.order_no','o.order_no')
|
|
|
+ ->leftJoin('employee as ee','ee.id','o.user_id')
|
|
|
->where('e.employee_id',$id)->groupBy('oo.id')->orderBy('oo.id','desc')
|
|
|
- ->select('oo.*','o.id as sid','o.check');
|
|
|
+ ->select('oo.*','o.id as sid','o.check','o.user_id','ee.emp_name');
|
|
|
$list = $this->limit($list,'',$data);
|
|
|
|
|
|
return [true,$list];
|
cqpCow