so-manager/krgm.so-manager-dev.com
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

契約許容市区のリスト表示するように修正
All checks were successful
Deploy main / deploy (push) Successful in 22s
Details

Browse Source
This commit is contained in:
kin.rinzen 2025-10-28 15:02:18 +09:00
parent 1aa942030c
commit aa91bc6617
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/Admin/ContractAllowableCityController.php
View File

@ -48,7 +48,6 @@ class ContractAllowableCityController extends Controller
$query->where('park_id', $request->park_id);
}
// 推荐：直接批量删除
$count = $query->delete();
return redirect()->route('contract_allowable_cities')->with('success', '解除しました');
}

18
app/Models/ContractAllowableCity.php
View File

@ -28,20 +28,27 @@ class ContractAllowableCity extends Model
*/
public static function search($inputs)
{
$list = self::query();
$list = self::query()
->leftJoin('park', 'contract_allowable_city.park_id', '=', 'park.park_id')
->leftJoin('city', 'contract_allowable_city.city_id', '=', 'city.city_id')
->select(
'contract_allowable_city.*',
'park.park_name',
'city.city_name'
);
if ($inputs['isMethodPost'] ?? false) {
if (!empty($inputs['contract_allowable_city_id'])) {
$list->where('contract_allowable_city_id', $inputs['contract_allowable_city_id']);
$list->where('contract_allowable_city.contract_allowable_city_id', $inputs['contract_allowable_city_id']);
}
if (!empty($inputs['city_id'])) {
$list->where('city_id', $inputs['city_id']);
$list->where('contract_allowable_city.city_id', $inputs['city_id']);
}
if (!empty($inputs['contract_allowable_city_name'])) {
$list->where('contract_allowable_city_name', 'like', '%' . $inputs['contract_allowable_city_name'] . '%');
$list->where('contract_allowable_city.contract_allowable_city_name', 'like', '%' . $inputs['contract_allowable_city_name'] . '%');
}
if (!empty($inputs['park_id'])) {
$list->where('park_id', $inputs['park_id']);
$list->where('contract_allowable_city.park_id', $inputs['park_id']);
}
}
@ -57,6 +64,7 @@ class ContractAllowableCity extends Model
}
}
/**
* 主キーで取得
*/

6
resources/views/admin/contract_allowable_cities/list.blade.php
View File

@ -130,9 +130,11 @@
</div>
</td>
<td class="sm-item text-left align-middle">{{ $item->contract_allowable_city_id }}</td>
<td class="sm-item text-left align-middle">{{ $item->city_id }}</td>
<td class="sm-item text-left align-middle">{{ $item->city_name }}</td>
<td class="sm-item text-left align-middle">{{ $item->contract_allowable_city_name }}</td>
<td class="sm-item text-left align-middle">{{ $item->park_id }}</td>
<td>{{ $item->park_name }}</td>
<!-- <td class="sm-item text-left align-middle">{{ $item->park_id }}</td> -->
<td class="sm-item text-left align-middle">{{ $item->same_district_flag == 0 ? '隣接市' : 'その他' }}</td>
</tr>
@endforeach