提交
This commit is contained in:
1 parent
d84f4b944c
commit
7c838cfb2d
249 files changed
+50600
-18556
No files matched your search
@@ -22,19 +22,23 @@ from app.models.pl_models import (
|
||||
from app.schemas.pl import (
|
||||
CarrierAuditReject,
|
||||
CarrierCreate,
|
||||
CarrierListResponse,
|
||||
CarrierRead,
|
||||
CarrierUpdate,
|
||||
carrier_to_read,
|
||||
DriverCreate,
|
||||
DriverListResponse,
|
||||
DriverRead,
|
||||
DriverUpdate,
|
||||
PersonnelCreate,
|
||||
PersonnelDetailRead,
|
||||
PersonnelListResponse,
|
||||
PersonnelRead,
|
||||
PersonnelUpdate,
|
||||
VehicleCreate,
|
||||
VehicleDetailRead,
|
||||
VehicleDriverCreate,
|
||||
VehicleListResponse,
|
||||
VehicleRead,
|
||||
VehicleUpdate,
|
||||
)
|
||||
@@ -62,14 +66,16 @@ router = APIRouter(prefix="", tags=["运输计划-基础数据"])
|
||||
# =============================================================================
|
||||
|
||||
|
||||
@router.get("/carrier", response_model=list[CarrierRead])
|
||||
@router.get("/carrier", response_model=CarrierListResponse)
|
||||
def list_carriers(
|
||||
q: Optional[str] = Query(default=None, description="模糊搜索"),
|
||||
status: Optional[str] = Query(default=None, description="状态"),
|
||||
audit_status: Optional[str] = Query(default=None, alias="auditStatus", description="审核状态"),
|
||||
page: int = Query(default=1, ge=1),
|
||||
page_size: int = Query(default=20, ge=1, le=100, alias="pageSize"),
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> list[CarrierRead]:
|
||||
) -> CarrierListResponse:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
query = db.query(PlCarrier).filter(
|
||||
PlCarrier.tenant_no == tenant_no,
|
||||
@@ -96,7 +102,13 @@ def list_carriers(
|
||||
case((PlCarrier.order_num.is_(None), 1), else_=0).asc(),
|
||||
PlCarrier.create_time.desc(),
|
||||
)
|
||||
return [carrier_to_read(row) for row in query.all()]
|
||||
total = query.count()
|
||||
offset = (page - 1) * page_size
|
||||
rows = query.offset(offset).limit(page_size).all()
|
||||
return CarrierListResponse(
|
||||
total=total,
|
||||
list=[carrier_to_read(row) for row in rows],
|
||||
)
|
||||
|
||||
|
||||
@router.post("/carrier", response_model=CarrierRead, status_code=status.HTTP_201_CREATED)
|
||||
@@ -286,7 +298,7 @@ def _vehicle_to_detail(
|
||||
)
|
||||
|
||||
|
||||
@router.get("/vehicle", response_model=list[VehicleRead])
|
||||
@router.get("/vehicle", response_model=VehicleListResponse)
|
||||
def list_vehicles(
|
||||
q: Optional[str] = Query(default=None, description="模糊搜索车牌号"),
|
||||
vehicle_type: Optional[str] = Query(default=None, alias="vehicleType", description="车辆类型"),
|
||||
@@ -297,9 +309,11 @@ def list_vehicles(
|
||||
alias="excludeIneligibleCarrier",
|
||||
description="排除资质不全或协议过期的承运商车辆",
|
||||
),
|
||||
page: int = Query(default=1, ge=1),
|
||||
page_size: int = Query(default=20, ge=1, le=100, alias="pageSize"),
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> list[VehicleRead]:
|
||||
) -> VehicleListResponse:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
query = db.query(PlVehicle).filter(
|
||||
PlVehicle.tenant_no == tenant_no,
|
||||
@@ -324,9 +338,9 @@ def list_vehicles(
|
||||
case((PlVehicle.order_num.is_(None), 1), else_=0).asc(),
|
||||
PlVehicle.create_time.desc(),
|
||||
)
|
||||
vehicles = query.all()
|
||||
|
||||
if exclude_ineligible_carrier:
|
||||
vehicles = query.all()
|
||||
carrier_ids = {
|
||||
v.carrier_id for v in vehicles if v.vehicle_type == "carrier" and v.carrier_id
|
||||
}
|
||||
@@ -352,14 +366,28 @@ def list_vehicles(
|
||||
and carrier_eligible_for_transport(carrier_map[v.carrier_id])
|
||||
)
|
||||
]
|
||||
summaries = load_vehicle_personnel_summaries(
|
||||
db, tenant_no, [v.id for v in vehicles]
|
||||
)
|
||||
items = [
|
||||
_vehicle_to_read(v, *summaries.get(v.id, ("", None)))
|
||||
for v in vehicles
|
||||
]
|
||||
return VehicleListResponse(total=len(items), list=items)
|
||||
|
||||
total = query.count()
|
||||
offset = (page - 1) * page_size
|
||||
vehicles = query.offset(offset).limit(page_size).all()
|
||||
summaries = load_vehicle_personnel_summaries(
|
||||
db, tenant_no, [v.id for v in vehicles]
|
||||
)
|
||||
return [
|
||||
_vehicle_to_read(v, *summaries.get(v.id, ("", None)))
|
||||
for v in vehicles
|
||||
]
|
||||
return VehicleListResponse(
|
||||
total=total,
|
||||
list=[
|
||||
_vehicle_to_read(v, *summaries.get(v.id, ("", None)))
|
||||
for v in vehicles
|
||||
],
|
||||
)
|
||||
|
||||
|
||||
@router.post("/vehicle", response_model=VehicleDetailRead, status_code=status.HTTP_201_CREATED)
|
||||
@@ -549,13 +577,15 @@ def _personnel_to_detail(
|
||||
)
|
||||
|
||||
|
||||
@router.get("/personnel", response_model=list[PersonnelRead])
|
||||
@router.get("/personnel", response_model=PersonnelListResponse)
|
||||
def list_personnel(
|
||||
q: Optional[str] = Query(default=None, description="模糊搜索姓名/手机号"),
|
||||
status: Optional[str] = Query(default=None, description="状态"),
|
||||
page: int = Query(default=1, ge=1),
|
||||
page_size: int = Query(default=20, ge=1, le=100, alias="pageSize"),
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> list[PersonnelRead]:
|
||||
) -> PersonnelListResponse:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
query = db.query(PlPersonnel).filter(
|
||||
PlPersonnel.tenant_no == tenant_no,
|
||||
@@ -579,8 +609,13 @@ def list_personnel(
|
||||
case((PlPersonnel.order_num.is_(None), 1), else_=0).asc(),
|
||||
PlPersonnel.create_time.desc(),
|
||||
)
|
||||
rows = query.all()
|
||||
return [_personnel_to_read(db, tenant_no, p) for p in rows]
|
||||
total = query.count()
|
||||
offset = (page - 1) * page_size
|
||||
rows = query.offset(offset).limit(page_size).all()
|
||||
return PersonnelListResponse(
|
||||
total=total,
|
||||
list=[_personnel_to_read(db, tenant_no, p) for p in rows],
|
||||
)
|
||||
|
||||
|
||||
@router.post("/personnel", response_model=PersonnelDetailRead, status_code=status.HTTP_201_CREATED)
|
||||
@@ -727,12 +762,14 @@ def _personnel_to_driver_read(personnel: PlPersonnel) -> DriverRead:
|
||||
)
|
||||
|
||||
|
||||
@router.get("/driver", response_model=list[DriverRead])
|
||||
@router.get("/driver", response_model=DriverListResponse)
|
||||
def list_drivers(
|
||||
q: Optional[str] = Query(default=None, description="模糊搜索姓名/手机号"),
|
||||
page: int = Query(default=1, ge=1),
|
||||
page_size: int = Query(default=20, ge=1, le=100, alias="pageSize"),
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> list[DriverRead]:
|
||||
) -> DriverListResponse:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
query = db.query(PlPersonnel).filter(
|
||||
PlPersonnel.tenant_no == tenant_no,
|
||||
@@ -753,7 +790,13 @@ def list_drivers(
|
||||
case((PlPersonnel.order_num.is_(None), 1), else_=0).asc(),
|
||||
PlPersonnel.create_time.desc(),
|
||||
)
|
||||
return [_personnel_to_driver_read(p) for p in query.all()]
|
||||
total = query.count()
|
||||
offset = (page - 1) * page_size
|
||||
rows = query.offset(offset).limit(page_size).all()
|
||||
return DriverListResponse(
|
||||
total=total,
|
||||
list=[_personnel_to_driver_read(p) for p in rows],
|
||||
)
|
||||
|
||||
|
||||
@router.post("/driver", response_model=DriverRead, status_code=status.HTTP_201_CREATED)
|
||||
|
||||
Reference in new issue
Block a user