This commit is contained in:
zlwu committed 2026-06-18 11:05:53 +08:00
1 parent 58a47b96a5
commit 482d6bbe5d
70 files changed
+28702 -25810

No files matched your search

+8
View File
@@ -201,6 +201,7 @@ class CellSampleTypeCreateBody(BaseModel):
type_logo: Optional[str] = Field(None, alias="typeLogo")
storage_years: Optional[int] = Field(None, alias="storageYears")
storage_price: Optional[float] = Field(None, alias="storagePrice")
sample_code_filter: Optional[str] = Field(None, alias="sampleCodeFilter")
order_num: Optional[int] = Field(0, alias="orderNum")
remark: Optional[str] = None
@@ -213,6 +214,7 @@ class CellSampleTypeUpdateBody(BaseModel):
type_logo: Optional[str] = Field(None, alias="typeLogo")
storage_years: Optional[int] = Field(None, alias="storageYears")
storage_price: Optional[float] = Field(None, alias="storagePrice")
sample_code_filter: Optional[str] = Field(None, alias="sampleCodeFilter")
order_num: Optional[int] = Field(None, alias="orderNum")
remark: Optional[str] = None
@@ -263,6 +265,7 @@ async def create_cell_sample_type(
type_logo=body.type_logo,
storage_years=body.storage_years,
storage_price=body.storage_price,
sample_code_filter=body.sample_code_filter,
tenant_no=tenant_no,
order_num=body.order_num,
remark=body.remark,
@@ -291,6 +294,7 @@ async def update_cell_sample_type(
type_logo=payload.get("type_logo"),
storage_years=payload.get("storage_years"),
storage_price=payload.get("storage_price"),
sample_code_filter=payload.get("sample_code_filter"),
order_num=payload.get("order_num"),
remark=payload.get("remark"),
user_id=user.get("user_id"),
@@ -900,6 +904,7 @@ async def list_sample_codes(
pageSize: int = Query(10, ge=1, le=100, alias="pageSize"),
keyword: Optional[str] = None,
sample_code_type: Optional[str] = Query(None, alias="sampleCodeType"),
code_filter: Optional[str] = Query(None, alias="codeFilter"),
issued_user_id: Optional[str] = Query(None, alias="issuedUserId"),
user: dict = Depends(require_menu_code("biz:sampleCode:list")),
db: Session = Depends(get_db),
@@ -921,6 +926,9 @@ async def list_sample_codes(
code_type = (sample_code_type or "").strip()
if code_type:
query = query.filter(BizSampleCode.sample_code_type == code_type)
cf = (code_filter or "").strip()
if cf:
query = query.filter(BizSampleCode.sample_code.like(f"%{cf}%"))
uid = (issued_user_id or "").strip()
if uid:
query = query.filter(BizSampleCode.issued_user_id == uid)