linweidong
/
csg-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:修复bug

Browse Source
master
HuangHuiKang 6 days ago
parent 8d594060ed
commit 58540e2d6e
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File

8
app/api/v1/module_energy/report_review/service.py
Unescape Escape View File

@ -66,7 +66,7 @@ class EnergyReportReviewService:
} }
async def create(self, data: EnergyReportReviewCreateSchema) -> EnergyReportReviewOutSchema: async def create(self, data: EnergyReportReviewCreateSchema) -> EnergyReportReviewOutSchema:
template = await self._validate_template(template_id=data.template_id) await self._validate_template(template_id=data.template_id)
await self._validate_file(file_id=data.file_id) await self._validate_file(file_id=data.file_id)
attachment_file = await self._validate_attachment_file( attachment_file = await self._validate_attachment_file(
attachment_file_id=data.attachment_file_id, attachment_file_id=data.attachment_file_id,
@ -74,8 +74,6 @@ class EnergyReportReviewService:
) )
await self._validate_reviewer(reviewer_id=data.reviewer_id) await self._validate_reviewer(reviewer_id=data.reviewer_id)
create_data = data.model_dump() create_data = data.model_dump()
if template:
create_data["report_type"] = template.report_type
create_data["attachment_url"] = attachment_file.file_url if attachment_file else None create_data["attachment_url"] = attachment_file.file_url if attachment_file else None
review = await EnergyReportReviewCRUD(self.auth).create(data=create_data) review = await EnergyReportReviewCRUD(self.auth).create(data=create_data)
await self._bind_file(file_id=data.file_id, review_id=review.id) await self._bind_file(file_id=data.file_id, review_id=review.id)
@ -91,7 +89,7 @@ class EnergyReportReviewService:
async def update(self, id: int, data: EnergyReportReviewUpdateSchema) -> EnergyReportReviewOutSchema: async def update(self, id: int, data: EnergyReportReviewUpdateSchema) -> EnergyReportReviewOutSchema:
old_review = await EnergyReportReviewCRUD(self.auth).get_or_404(id=id, msg="更新失败，能源报告审核任务不存在") old_review = await EnergyReportReviewCRUD(self.auth).get_or_404(id=id, msg="更新失败，能源报告审核任务不存在")
template = await self._validate_template(template_id=data.template_id) await self._validate_template(template_id=data.template_id)
await self._validate_file(file_id=data.file_id, current_review_id=id) await self._validate_file(file_id=data.file_id, current_review_id=id)
if old_review.attachment_file_id and old_review.attachment_file_id == data.file_id: if old_review.attachment_file_id and old_review.attachment_file_id == data.file_id:
raise CustomException(msg="更新失败，上传文档不能使用原附件文件") raise CustomException(msg="更新失败，上传文档不能使用原附件文件")
@ -104,8 +102,6 @@ class EnergyReportReviewService:
) )
await self._validate_reviewer(reviewer_id=data.reviewer_id) await self._validate_reviewer(reviewer_id=data.reviewer_id)
update_data = data.model_dump(exclude_unset=True) update_data = data.model_dump(exclude_unset=True)
if template:
update_data["report_type"] = template.report_type
update_data["attachment_url"] = attachment_file.file_url if attachment_file else None update_data["attachment_url"] = attachment_file.file_url if attachment_file else None
review = await EnergyReportReviewCRUD(self.auth).update(id=id, data=update_data) review = await EnergyReportReviewCRUD(self.auth).update(id=id, data=update_data)
if old_review.file_id != data.file_id: if old_review.file_id != data.file_id:

Write Preview
Loading…
Cancel
Save