hehele/hyperf_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:dish

Browse Source
This commit is contained in:
LAPTOP-7SGDREK0\shiweijun
2025-02-18 17:15:00 +08:00
parent a314c6153e
commit 39924b5780
8 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Service/Admin/Material/DishService.php
View File

@@ -32,12 +32,11 @@ class DishService extends BaseService
$id = (int)$this->request->input('query_id');
$cityId = (int)$this->request->input('query_city_id',0);
$dishName = $this->request->input('query_dish_name');
$dateId = (int)$this->request->input('query_date_id');
$date = $this->request->input('query_date');
$status = (int)$this->request->input('query_status');
$chefId = (int)$this->request->input('query_chef_id',0);
$list = $this->DishModel
->leftJoin('cycle','dish.cycle_id','=','cycle.id')
->where('is_del',DishCode::IS_NO_DEL)
->when($id > 0, function ($query) use ($id) {
$query->where('id', $id);
@@ -48,8 +47,8 @@ class DishService extends BaseService
->when($dishName, function ($query) use ($dishName) {
$query->where('dish', 'like', "$dishName%");
})
->when($dateId, function ($query) use ($dateId) {
$query->where('cycle_id', $dateId);
->when($date, function ($query) use ($date) {
$query->where('date', $date);
})
->when($status, function ($query) use ($status) {
$query->where('status', $status);
@@ -57,8 +56,8 @@ class DishService extends BaseService
->when($chefId, function ($query) use ($chefId) {
$query->where('chef_id', $chefId);
})
->orderBy('cycle.dates','desc')
->paginate($limit,['dish.*','cycle.dates'])->toArray();
->orderBy('date','desc')
->paginate($limit)->toArray();
return $this->return->success('success',$list);
}