|
@@ -157,22 +157,24 @@ class ApiService{
|
|
|
$date = date('Y-m-d', time());
|
|
|
}
|
|
|
|
|
|
- $depart = DB::connection('mysql_fwe10_eteams')->table('department')
|
|
|
- ->where('parent', '100001980000000049')
|
|
|
- ->where('name', 'like', '%' . '洗煤厂')
|
|
|
- ->where('id','!=','100001590000001602')
|
|
|
- ->get();
|
|
|
+ // $depart = DB::connection('mysql_fwe10_eteams')->table('department')
|
|
|
+ // ->where('parent', '100001980000000049')
|
|
|
+ // ->where('name', 'like', '%' . '洗煤厂')
|
|
|
+ // ->where('id','!=','100001590000001602')
|
|
|
+ // ->get();
|
|
|
+
|
|
|
+ $depart = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcqyzd')->pluck('szxmc')->toArray();
|
|
|
+ $depart = array_unique($depart);
|
|
|
+ $depart = array_values($depart);
|
|
|
|
|
|
$depart_arr = [];
|
|
|
foreach ($depart as $key => $val) {
|
|
|
- $depart_name = str_replace('洗选中心', '', $val->fullname);
|
|
|
$depart_arr[$key] = [
|
|
|
- 'name' => $depart_name,
|
|
|
-
|
|
|
+ 'name' => $val
|
|
|
];
|
|
|
|
|
|
$query = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcxjjl')
|
|
|
- ->where('xjdw', $depart_name)
|
|
|
+ ->where('xjdw', $val)
|
|
|
->where('lrsj', 'like', '%' . $date . '%')
|
|
|
->groupBy('lrr')->select(
|
|
|
[
|