提交

backend/app/api/basic_info.py

@@ -198,6 +198,7 @@ class CellSampleTypeCreateBody(BaseModel):
 
     type_code: str = Field(..., alias="typeCode")
     type_name: str = Field(..., alias="typeName")
+    type_logo: Optional[str] = Field(None, alias="typeLogo")
     storage_years: Optional[int] = Field(None, alias="storageYears")
     storage_price: Optional[float] = Field(None, alias="storagePrice")
     order_num: Optional[int] = Field(0, alias="orderNum")
@@ -209,6 +210,7 @@ class CellSampleTypeUpdateBody(BaseModel):
 
     type_code: Optional[str] = Field(None, alias="typeCode")
     type_name: Optional[str] = Field(None, alias="typeName")
+    type_logo: Optional[str] = Field(None, alias="typeLogo")
     storage_years: Optional[int] = Field(None, alias="storageYears")
     storage_price: Optional[float] = Field(None, alias="storagePrice")
     order_num: Optional[int] = Field(None, alias="orderNum")
@@ -240,7 +242,7 @@ async def list_cell_sample_types(
             )
     query = apply_data_scope(query, BizCellSampleType, user, db, tenant_no)
     total = query.count()
-    items = query.order_by(BizCellSampleType.create_time.desc()).offset((page - 1) * pageSize).limit(pageSize).all()
+    items = query.order_by(BizCellSampleType.order_num.asc(), BizCellSampleType.create_time.desc()).offset((page - 1) * pageSize).limit(pageSize).all()
     result_list = [cell_type_svc._row_to_dict(r) for r in items]
     tp = cell_type_svc.total_pages(total, pageSize)
     return success_response({"list": result_list, "total": total, "page": page, "pageSize": pageSize, "totalPages": tp})
@@ -258,6 +260,7 @@ async def create_cell_sample_type(
             db,
             type_code=body.type_code,
             type_name=body.type_name,
+            type_logo=body.type_logo,
             storage_years=body.storage_years,
             storage_price=body.storage_price,
             tenant_no=tenant_no,
@@ -285,6 +288,7 @@ async def update_cell_sample_type(
             row_id,
             type_code=payload.get("type_code"),
             type_name=payload.get("type_name"),
+            type_logo=payload.get("type_logo"),
             storage_years=payload.get("storage_years"),
             storage_price=payload.get("storage_price"),
             order_num=payload.get("order_num"),