|
|
@@ -98,10 +98,11 @@ class Audit extends BaseController
|
|
|
if($pageCount>0){
|
|
|
$data = (new InfoAudit)
|
|
|
->alias("t")
|
|
|
- ->field("t.*,u.nickname,u.mobile as user_mobile,a.username as admin_name,s.title as service_time_type_title")
|
|
|
+ ->field("t.*,u.nickname,u.mobile as user_mobile,a.username as admin_name,s.title as service_time_type_title,w.title as user_work_type_title")
|
|
|
->leftJoin("user u", "u.uid = t.uid")
|
|
|
->leftJoin("admin a", "a.id = t.admin_id")
|
|
|
->leftJoin("service_time_type s", "s.code = t.service_type")
|
|
|
+ ->leftJoin("user_work_type w", "w.id = t.user_work_type_id")
|
|
|
->where($where)
|
|
|
->page((int)$post["page"], $pageSize)
|
|
|
->order("t.id","desc")
|
|
|
@@ -202,10 +203,11 @@ class Audit extends BaseController
|
|
|
(new InfoAudit)
|
|
|
->where('id', $post['id'])
|
|
|
->save([
|
|
|
- 'status' => 1,
|
|
|
- 'admin_mono' => $post['mono'],
|
|
|
- 'admin_time' => time(),
|
|
|
- 'admin_id' => $request->adminInfo['id'],
|
|
|
+ 'status' => 1,
|
|
|
+ 'admin_mono' => $post['mono'],
|
|
|
+ 'admin_time' => time(),
|
|
|
+ 'admin_id' => $request->adminInfo['id'],
|
|
|
+ 'user_work_type_id' => $certData["user_work_type_id"]
|
|
|
]);
|
|
|
return app('json')->success('操作成功');
|
|
|
}
|
yingzi