fix:修改添加报告审核页面审查文档字段

master
HuangHuiKang 6 days ago
parent c63cb8d532
commit 2d04b821cc

@ -61,8 +61,12 @@ class EnergyReportReviewOutSchema(EnergyReportReviewCreateSchema, BaseSchema, Us
reviewer: CommonSchema | None = Field(default=None, description="审查人") reviewer: CommonSchema | None = Field(default=None, description="审查人")
template_name: str | None = Field(default=None, description="模板名称") template_name: str | None = Field(default=None, description="模板名称")
reviewer_name: str | None = Field(default=None, description="审查人名称") reviewer_name: str | None = Field(default=None, description="审查人名称")
report_file_url: str | None = Field(default=None, description="报告文档访问地址")
report_file_original_name: str | None = Field(default=None, description="报告文档原始名称")
file_url: str | None = Field(default=None, description="文档访问地址") file_url: str | None = Field(default=None, description="文档访问地址")
original_name: str | None = Field(default=None, description="文档原始名称") original_name: str | None = Field(default=None, description="文档原始名称")
attachment_file_url: str | None = Field(default=None, description="附件文件访问地址")
attachment_file_original_name: str | None = Field(default=None, description="附件文件原始名称")
attachment_url: str | None = Field(default=None, description="附件下载地址") attachment_url: str | None = Field(default=None, description="附件下载地址")
attachment_original_name: str | None = Field(default=None, description="附件原始名称") attachment_original_name: str | None = Field(default=None, description="附件原始名称")

@ -147,9 +147,13 @@ class EnergyReportReviewService:
if review_out.file: if review_out.file:
review_out.file_url = review_out.file.file_url review_out.file_url = review_out.file.file_url
review_out.original_name = review_out.file.original_name review_out.original_name = review_out.file.original_name
review_out.report_file_url = review_out.file_url
review_out.report_file_original_name = review_out.original_name
if review_out.attachment_file: if review_out.attachment_file:
review_out.attachment_url = review_out.attachment_file.file_url review_out.attachment_url = review_out.attachment_file.file_url
review_out.attachment_original_name = review_out.attachment_file.original_name review_out.attachment_original_name = review_out.attachment_file.original_name
review_out.attachment_file_url = review_out.attachment_url
review_out.attachment_file_original_name = review_out.attachment_original_name
if hasattr(review, "reviewer") and review.reviewer: if hasattr(review, "reviewer") and review.reviewer:
review_out.reviewer_name = review.reviewer.name review_out.reviewer_name = review.reviewer.name
return review_out return review_out
@ -159,11 +163,17 @@ class EnergyReportReviewService:
file_info = item.get("file") or {} file_info = item.get("file") or {}
attachment_file_info = item.get("attachment_file") or {} attachment_file_info = item.get("attachment_file") or {}
reviewer_info = item.get("reviewer") or {} reviewer_info = item.get("reviewer") or {}
item["file"] = file_info or None
item["attachment_file"] = attachment_file_info or None
item["template_name"] = template_info.get("template_name") item["template_name"] = template_info.get("template_name")
item["file_url"] = file_info.get("file_url") item["file_url"] = file_info.get("file_url")
item["original_name"] = file_info.get("original_name") item["original_name"] = file_info.get("original_name")
item["report_file_url"] = item["file_url"]
item["report_file_original_name"] = item["original_name"]
item["attachment_url"] = attachment_file_info.get("file_url") or item.get("attachment_url") item["attachment_url"] = attachment_file_info.get("file_url") or item.get("attachment_url")
item["attachment_original_name"] = attachment_file_info.get("original_name") item["attachment_original_name"] = attachment_file_info.get("original_name")
item["attachment_file_url"] = item["attachment_url"]
item["attachment_file_original_name"] = item["attachment_original_name"]
item["reviewer_name"] = reviewer_info.get("name") item["reviewer_name"] = reviewer_info.get("name")
return item return item

Loading…
Cancel
Save