From ea48728ff9053b0c3afed7d851a5bc794ba071b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=80=9D=E5=B7=9D?= Date: Tue, 15 Nov 2022 15:03:11 +0800 Subject: [PATCH] changes --- App/Router/ScoreCardRouter.py | 4 +--- App/Schema/ScoreCardSchema.py | 5 +++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/App/Router/ScoreCardRouter.py b/App/Router/ScoreCardRouter.py index b272a55..2c79d91 100644 --- a/App/Router/ScoreCardRouter.py +++ b/App/Router/ScoreCardRouter.py @@ -1,5 +1,3 @@ -from typing import List - from fastapi import APIRouter, Depends, HTTPException from sqlalchemy.orm import Session @@ -69,7 +67,7 @@ def func(_id: str, db: Session = Depends(get_db)): return item.dict() -@router.post("/search", summary="查询打分卡", response_model=List[Schema.SearchScoreCardResItem]) +@router.post("/search", summary="查询打分卡", response_model=Schema.SearchScoreCardResBody) def func(schema: Schema.SearchScoreCardReqBody, db: Session = Depends(get_db)): scorecards, total = Crud.search_scorecard(db=db, schema=schema) diff --git a/App/Schema/ScoreCardSchema.py b/App/Schema/ScoreCardSchema.py index 4bb3d6a..ca9433e 100644 --- a/App/Schema/ScoreCardSchema.py +++ b/App/Schema/ScoreCardSchema.py @@ -32,3 +32,8 @@ class SearchScoreCardResItem(BaseModel): id: str = None name: str = None subcategory: str = None + + +class SearchScoreCardResBody(BaseModel): + items: List[SearchScoreCardResItem] = [] + total: int = 0