|
|
@@ -400,10 +400,26 @@ class U8XkyServerService extends Service
|
|
|
public function fieldList($data, $user){
|
|
|
$model = $this->filedCommon($data, $user);
|
|
|
$list = $this->limit($model,'',$data);
|
|
|
+ $list = $this->fillFieldData($list,$user);
|
|
|
|
|
|
return [true, $list];
|
|
|
}
|
|
|
|
|
|
+ public function fillFieldData($data, $user){
|
|
|
+ if(empty($data['data'])) return $data;
|
|
|
+
|
|
|
+ $map = DDEmployee::whereIn('userid', array_unique(array_column($data['data'],'userid')))
|
|
|
+ ->pluck('name', 'userid')
|
|
|
+ ->toArray();
|
|
|
+ foreach ($data['data'] as $key => $value){
|
|
|
+ $data['data'][$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d H:i:s',$value['crt_time']) : '';
|
|
|
+ $data['data'][$key]['user_title'] = $map[$value['userid']] ?? '';
|
|
|
+ $data['data'][$key]['type_title'] = FieldData::$name[$value['type']] ?? '';
|
|
|
+ }
|
|
|
+
|
|
|
+ return $data;
|
|
|
+ }
|
|
|
+
|
|
|
public function fieldDetail($data, $user){
|
|
|
if(! isset($data['type'])) return [false, 'type不能为空'];
|
|
|
if(! isset($data['userid'])) return [false, '人员id不能为空'];
|