提交
This commit is contained in:
1 parent
c137b46939
commit
b6c63591ea
126 files changed
+41593
-22990
No files matched your search
@@ -164,7 +164,7 @@ async def get_collection_protocol_detail(
|
||||
class ProtocolCreateBody(BaseModel):
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
|
||||
protocol_no: str = Field(..., alias="protocolNo")
|
||||
protocol_no: Optional[str] = Field(None, alias="protocolNo")
|
||||
protocol_no_id: Optional[str] = Field(None, alias="protocolNoId")
|
||||
protocol_status: str = Field("dsx", alias="protocolStatus")
|
||||
protocol_attachments: Optional[str] = Field(None, alias="protocolAttachments")
|
||||
@@ -266,7 +266,7 @@ async def create_collection_protocol(
|
||||
)
|
||||
obj = cp_svc.create_collection_protocol(
|
||||
db,
|
||||
protocol_no=body.protocol_no,
|
||||
protocol_no=body.protocol_no or "",
|
||||
protocol_no_id=body.protocol_no_id,
|
||||
protocol_status=body.protocol_status,
|
||||
protocol_attachments=protocol_attachments,
|
||||
|
||||
@@ -28,7 +28,7 @@ STATIC_MENU_TREE = [
|
||||
"name": "CellStorageProtocol",
|
||||
"path": "protocol",
|
||||
"component": "/cell-storage/protocol/index",
|
||||
"meta": {"title": "采集协议单录入", "keepAlive": True, "menuCode": "biz:cellStorageProtocol:list"},
|
||||
"meta": {"title": "采集协议单录入", "keepAlive": True, "isHide": True, "menuCode": "biz:cellStorageProtocol:list"},
|
||||
},
|
||||
{
|
||||
"id": "50000000000000000000000000000003",
|
||||
@@ -74,7 +74,7 @@ STATIC_MENU_TREE = [
|
||||
"name": "ResearchDonationList",
|
||||
"path": "list",
|
||||
"component": "/research-donation/list/index",
|
||||
"meta": {"title": "捐赠协议单录入", "keepAlive": True, "menuCode": "biz:researchDonation:list"},
|
||||
"meta": {"title": "捐赠协议单录入", "keepAlive": True, "isHide": True, "menuCode": "biz:researchDonation:list"},
|
||||
},
|
||||
{
|
||||
"id": "60000000000000000000000000000003",
|
||||
|
||||
@@ -40,7 +40,7 @@ def _get_current_user_id(user: dict) -> str:
|
||||
class DonationCreateBody(BaseModel):
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
|
||||
donation_no: str = Field(..., alias="donationNo")
|
||||
donation_no: Optional[str] = Field(None, alias="donationNo")
|
||||
donation_status: Optional[str] = Field("dsx", alias="donationStatus")
|
||||
donation_date: Optional[str] = Field(None, alias="donationDate")
|
||||
source_type: Optional[str] = Field("direct", alias="sourceType")
|
||||
@@ -233,7 +233,7 @@ async def update_research_donation(
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
user_id = _get_current_user_id(user)
|
||||
try:
|
||||
data = body.model_dump(exclude_none=False, by_alias=True)
|
||||
data = body.model_dump(exclude_unset=True, by_alias=True)
|
||||
obj = rd_svc.update_donation(
|
||||
db,
|
||||
donation_id,
|
||||
|
||||
Reference in new issue
Block a user