|
@@ -20,13 +20,13 @@ class QuotaInputStore:
|
|
|
return self._current_user
|
|
|
|
|
|
def get_quotas_paginated(
|
|
|
- self,
|
|
|
- project_id: str,
|
|
|
- budget_id: int,
|
|
|
- item_id: int,
|
|
|
- page: int = 1,
|
|
|
- page_size: int = 10,
|
|
|
- keyword: Optional[str] = None,
|
|
|
+ self,
|
|
|
+ project_id: str,
|
|
|
+ budget_id: int,
|
|
|
+ item_id: int,
|
|
|
+ page: int = 1,
|
|
|
+ page_size: int = 10,
|
|
|
+ keyword: Optional[str] = None,
|
|
|
):
|
|
|
"""分页查询定额输入列表
|
|
|
|
|
@@ -134,8 +134,8 @@ class QuotaInputStore:
|
|
|
# mechanical_workday_salary=dto.mechanical_workday_salary,
|
|
|
# compilation_mechanical_workday_salary=dto.compilation_mechanical_workday_salary,
|
|
|
compiler=dto.compiler,
|
|
|
- modify_date=datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
|
|
|
- # quota_consumption=dto.quota_consumption,
|
|
|
+ modify_date=datetime.now().strftime("%Y/%m/%d %H:%M:%S"),
|
|
|
+ # quota_consumption=dto.quota_consumption,0
|
|
|
# basic_quota=dto.basic_quota,
|
|
|
# quota_comprehensive_unit_price=dto.quota_comprehensive_unit_price,
|
|
|
# quota_comprehensive_total_price=dto.quota_comprehensive_total_price
|
|
@@ -147,7 +147,7 @@ class QuotaInputStore:
|
|
|
return QuotaInputDto.from_model(model)
|
|
|
|
|
|
def update_quota(
|
|
|
- self, project_id: str, dto: QuotaInputDto
|
|
|
+ self, project_id: str, dto: QuotaInputDto
|
|
|
) -> Optional[QuotaInputDto]:
|
|
|
"""更新定额输入
|
|
|
|
|
@@ -204,7 +204,7 @@ class QuotaInputStore:
|
|
|
# model.mechanical_workday_salary = dto.mechanical_workday_salary
|
|
|
# model.compilation_mechanical_workday_salary = dto.compilation_mechanical_workday_salary
|
|
|
# model.compiler = dto.compiler
|
|
|
- model.modify_date = dto.modify_date
|
|
|
+ model.modify_date = datetime.now().strftime("%Y/%m/%d %H:%M:%S")
|
|
|
# model.quota_consumption = dto.quota_consumption
|
|
|
# model.basic_quota = dto.basic_quota
|
|
|
# model.quota_comprehensive_unit_price = dto.quota_comprehensive_unit_price
|