|
@@ -464,13 +464,14 @@ class ApiService{
|
|
|
$query = $query->whereIn('lrr', 'like','%'.$person_id.'%');
|
|
|
}
|
|
|
|
|
|
- $query = $query->orderBy('lrdate', 'desc')->groupBy('lrsj', 'xjdw', 'lrr','jcwt')
|
|
|
+ $query = $query->orderBy('lrdate', 'desc')->groupBy('lrsj', 'xjdw', 'lrr','jcwt','id')
|
|
|
->select(
|
|
|
[
|
|
|
DB::raw('DATE(lrsj) as lrdate'),
|
|
|
'xjdw',
|
|
|
'lrr',
|
|
|
- 'jcwt'
|
|
|
+ 'jcwt',
|
|
|
+ 'id'
|
|
|
]
|
|
|
)
|
|
|
->get();
|
|
@@ -488,7 +489,8 @@ class ApiService{
|
|
|
'lastname' => $lastname,
|
|
|
'person_id' => $val->lrr,
|
|
|
'date' => $val->lrdate,
|
|
|
- 'is_complete' => $is_complete
|
|
|
+ 'is_complete' => $is_complete,
|
|
|
+ 'id' => $val->id
|
|
|
];
|
|
|
|
|
|
}
|