|
|
@ -697,7 +697,7 @@ class ActivityController extends Controller |
|
|
|
'm_version_gantt.name_version', |
|
|
|
'm_version_gantt.name_version', |
|
|
|
DB::raw('user_names.user_name as user_name'), |
|
|
|
DB::raw('user_names.user_name as user_name'), |
|
|
|
DB::raw('SUM(report_activity_material.qty) as qty'), |
|
|
|
DB::raw('SUM(report_activity_material.qty) as qty'), |
|
|
|
'assign_material_to_activity.qty_planning', |
|
|
|
DB::raw('SUM(assign_material_to_activity.qty_planning) as qty_planning'), |
|
|
|
'assign_material_to_activity.id as join_third_id' |
|
|
|
'assign_material_to_activity.id as join_third_id' |
|
|
|
) |
|
|
|
) |
|
|
|
->join('m_version_gantt', 'm_version_gantt.id', '=', 'selfTable.version_gantt_id') |
|
|
|
->join('m_version_gantt', 'm_version_gantt.id', '=', 'selfTable.version_gantt_id') |
|
|
@ -710,11 +710,9 @@ class ActivityController extends Controller |
|
|
|
GROUP BY activity_id) as user_names'), function ($join) { |
|
|
|
GROUP BY activity_id) as user_names'), function ($join) { |
|
|
|
$join->on('user_names.activity_id', '=', 'selfTable.id'); |
|
|
|
$join->on('user_names.activity_id', '=', 'selfTable.id'); |
|
|
|
}) |
|
|
|
}) |
|
|
|
|
|
|
|
->where('report_activity_material.assign_material_id', '=', DB::raw('assign_material_to_activity.id')) |
|
|
|
->groupBy('selfTable.id') |
|
|
|
->groupBy('selfTable.id') |
|
|
|
->groupBy('selfTable.name') |
|
|
|
|
|
|
|
->groupBy('selfTable.persentase_progress') |
|
|
|
|
|
|
|
->groupBy('m_version_gantt.name_version') |
|
|
|
->groupBy('m_version_gantt.name_version') |
|
|
|
->groupBy('assign_material_to_activity.qty_planning') |
|
|
|
|
|
|
|
->groupBy('assign_material_to_activity.id') |
|
|
|
->groupBy('assign_material_to_activity.id') |
|
|
|
->groupBy('user_names.user_name') |
|
|
|
->groupBy('user_names.user_name') |
|
|
|
->get(); |
|
|
|
->get(); |
|
|
|