|
@@ -301,22 +301,21 @@ class ApiService{
|
|
|
$result['status'] = true;
|
|
|
$result['msg'] = ApiEnum::RETURN_SUCCESS;
|
|
|
$result['data'] = [];
|
|
|
--
|
|
|
+
|
|
|
$query = DB::connection('mysql_fwview')->table('uf_wghgl_new')
|
|
|
->join('hrmresource', 'uf_wghgl_new.lrr', '=', 'hrmresource.id')
|
|
|
->where('lrr', $person_id)
|
|
|
->where('xjdw', $depart)
|
|
|
- ->where('date', 'like', $date . '%')
|
|
|
+ ->where('lrsj', 'like', $date . '%')
|
|
|
->orderBy('lrsj', 'desc')
|
|
|
->select(
|
|
|
[
|
|
|
'uf_wghgl_new.id',
|
|
|
'lastname',
|
|
|
'xjdw',
|
|
|
- 'jcqy',
|
|
|
+ 'lrsj',
|
|
|
]
|
|
|
- )
|
|
|
- ->get();
|
|
|
+ )->get();
|
|
|
|
|
|
$query = json_decode($query);
|
|
|
|