|
@@ -38,13 +38,14 @@ class ApiService{
|
|
|
|
|
|
|
|
$depart_arr = [];
|
|
$depart_arr = [];
|
|
|
foreach ($depart as $key => $val) {
|
|
foreach ($depart as $key => $val) {
|
|
|
|
|
+ $depart_name = str_replace('洗选中心', '', $val->DEPARTMENTNAME);
|
|
|
$depart_arr[$key] = [
|
|
$depart_arr[$key] = [
|
|
|
- 'name' => $val->DEPARTMENTNAME,
|
|
|
|
|
|
|
+ 'name' => $depart_name,
|
|
|
|
|
|
|
|
];
|
|
];
|
|
|
$query = DB::connection('mysql_fwview')->table('uf_wghgl_new')
|
|
$query = DB::connection('mysql_fwview')->table('uf_wghgl_new')
|
|
|
->join('hrmresource', 'uf_wghgl_new.lrr', '=', 'hrmresource.id')
|
|
->join('hrmresource', 'uf_wghgl_new.lrr', '=', 'hrmresource.id')
|
|
|
- ->where('xjdw1', $val->DEPARTMENTNAME)
|
|
|
|
|
|
|
+ ->where('xjdw1', $depart_name)
|
|
|
->where('lrsj', 'like', '%' . $date . '%')
|
|
->where('lrsj', 'like', '%' . $date . '%')
|
|
|
->groupBy('lrr')->select(
|
|
->groupBy('lrr')->select(
|
|
|
[
|
|
[
|
