|
@@ -70,7 +70,7 @@ class ApiService{
|
|
|
];
|
|
];
|
|
|
$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', $depart_name)
|
|
|
|
|
|
|
+ ->where('xjdw', $depart_name)
|
|
|
->where('lrsj', 'like', '%' . $date . '%')
|
|
->where('lrsj', 'like', '%' . $date . '%')
|
|
|
->groupBy('lrr')->select(
|
|
->groupBy('lrr')->select(
|
|
|
[
|
|
[
|
|
@@ -104,7 +104,7 @@ class ApiService{
|
|
|
$query = DB::connection('mysql_fwview')->table('uf_wghgl_new')
|
|
$query = DB::connection('mysql_fwview')->table('uf_wghgl_new')
|
|
|
->where('lrr', $person_id)
|
|
->where('lrr', $person_id)
|
|
|
->where('lrsj', 'like', '%' . $date . '%')
|
|
->where('lrsj', 'like', '%' . $date . '%')
|
|
|
- ->where('xjdw1', $depart)
|
|
|
|
|
|
|
+ ->where('xjdw', $depart)
|
|
|
->orderBy('lrsj', 'asc')->get();
|
|
->orderBy('lrsj', 'asc')->get();
|
|
|
$query = json_decode($query);
|
|
$query = json_decode($query);
|
|
|
if ($query) {
|
|
if ($query) {
|
