Browse Source

用户列表停车场必填取消,停车资讯返回车位属性

master
wanghongjun 1 month ago
parent
commit
75cc1af14d
  1. 1
      app/Http/Controllers/Admin/ParkingSpaceController.php
  2. 2
      app/Http/Controllers/Admin/UserController.php
  3. 4
      app/Services/AdminUsersService.php

1
app/Http/Controllers/Admin/ParkingSpaceController.php

@ -311,6 +311,7 @@ class ParkingSpaceController extends BaseController
$data['license_plate'] = ParkingLicensePlate::getNumber($item['license_plate_id']);
$data['status'] = $this->service->getParkingSpaceStatus($item['status'], $item['license_plate_id'], $parking_space_id);
$data['parking_space_type'] = ParkingSpaceType::getName($item['space_type_id']);
$data['parking_space_attr'] = ParkingSpaceAttributes::getAttr($item['space_attr_id']);
$data['berthing_time_str'] = '';
if ($item['berthing_time']) {
$data['berthing_time_str'] = get_time_difference_str($item['berthing_time']);

2
app/Http/Controllers/Admin/UserController.php

@ -137,7 +137,6 @@ class UserController extends BaseController
$rules = [
'username' => 'required|alpha_num|between:4,20',
'role_id' => 'required|numeric',
'packing_id' => 'required|numeric',
'password' => 'required|between:12,30',
'email' => 'email'
];
@ -146,7 +145,6 @@ class UserController extends BaseController
'username.alpha_num' => __('validation.admin_user.l_a_alpha_num'),
'username.between' => __('validation.admin_user.l_a_between'),
'role_id.required' => __('validation.admin_user.r_empty'),
'packing_id.required' => __('validation.admin_user.s_p_empty'),
'password.required' => __('validation.admin_user.p_empty'),
'password.between' => __('validation.admin_user.p_between'),
'email.email' => __('validation.admin_user.email'),

4
app/Services/AdminUsersService.php

@ -63,7 +63,7 @@ final class AdminUsersService
'email' => $data['email'] ?? '',
'position' => $data['position'] ?? '',
'status' => $data['status'],
'packing_id' => $data['packing_id'],
'packing_id' => $data['packing_id'] ?? 0,
'created_at' => get_datetime()
]);
@ -116,7 +116,7 @@ final class AdminUsersService
'email' => $data['email'] ?? '',
'position' => $data['position'] ?? '',
'status' => $data['status'],
'packing_id' => $data['packing_id'],
'packing_id' => $data['packing_id'] ?? 0,
'created_at' => get_datetime()
];
if (isset($data['password']) && !empty($data['password'])) {

Loading…
Cancel
Save