feat:material_application
This commit is contained in:
@@ -113,12 +113,14 @@ class MaterialService extends BaseService{
|
|||||||
public function applicationList(): array
|
public function applicationList(): array
|
||||||
{
|
{
|
||||||
$limit = (int)$this->request->input('limit', 10);
|
$limit = (int)$this->request->input('limit', 10);
|
||||||
|
$dishId = (int)$this->request->input('dish_id');
|
||||||
$list = $this->MaterialApplication
|
$list = $this->MaterialApplication
|
||||||
->leftJoin('material', 'material.id', '=', 'material_id')
|
->leftJoin('material', 'material.id', '=', 'material_id')
|
||||||
->leftJoin('dish', 'dish.id', '=', 'dish_id')
|
->leftJoin('dish', 'dish.id', '=', 'dish_id')
|
||||||
->leftJoin('admin_user', 'admin_user.id', '=', 'operator_id')
|
->leftJoin('admin_user', 'admin_user.id', '=', 'operator_id')
|
||||||
->where('material_application.is_del',MaterialCode::IS_NO_DEL)
|
->where('material_application.is_del',MaterialCode::IS_NO_DEL)
|
||||||
->where('material_application.operator_id', $this->userId)
|
->where('material_application.operator_id', $this->userId)
|
||||||
|
->where('material_application.dish_id', $dishId)
|
||||||
->paginate($limit,['material_application.*','material.name as material_name','dish.dish as dish_name','admin_user.chinese_name as operator_name'])
|
->paginate($limit,['material_application.*','material.name as material_name','dish.dish as dish_name','admin_user.chinese_name as operator_name'])
|
||||||
->toArray();
|
->toArray();
|
||||||
|
|
||||||
|
|||||||
@@ -445,7 +445,7 @@ Content-Type: application/x-www-form-urlencoded
|
|||||||
Authorization: Bearer {{admin_token}}
|
Authorization: Bearer {{admin_token}}
|
||||||
|
|
||||||
### 个人申请材料列表
|
### 个人申请材料列表
|
||||||
GET {{host}}/api/material/application_list?limit=10
|
GET {{host}}/api/material/application_list?limit=10&dish_id=1
|
||||||
content-type: application/json
|
content-type: application/json
|
||||||
Authorization: Bearer {{admin_token}}
|
Authorization: Bearer {{admin_token}}
|
||||||
|
|
||||||
@@ -541,3 +541,9 @@ Content-Type: application/x-www-form-urlencoded
|
|||||||
Authorization: Bearer {{admin_token}}
|
Authorization: Bearer {{admin_token}}
|
||||||
|
|
||||||
user_id=5&kitchen_id=1
|
user_id=5&kitchen_id=1
|
||||||
|
|
||||||
|
### 厨师成本列表
|
||||||
|
GET {{host}}/admin/material/chef_cost_list?limit=10&query_kitchen_id=1
|
||||||
|
content-type: application/json
|
||||||
|
Authorization: Bearer {{admin_token}}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user