yue 2 долоо хоног өмнө
parent
commit
5514af7ad2

+ 31 - 31
SourceCode/IntelligentRailwayCosting/app/core/dtos/excel_parse.py

@@ -52,17 +52,17 @@ class ExcelParseFileDto:
 
 class ExcelParseDto:
     def __init__(
-            self,
-            task_id: int,
-            version: str,
-            project_id: str,
-            project_name: str,
-            project_stage: str,
-            selected_zgs_id: int,
-            zgs_list: list[ExcelParseZgsDto],
-            hierarchy: list[ExcelParseItemDto],
-            components: list[ExcelParseItemDto],
-            files: list[ExcelParseFileDto],
+        self,
+        task_id: int,
+        version: str,
+        project_id: str,
+        project_name: str,
+        project_stage: str,
+        selected_zgs_id: int,
+        zgs_list: list[ExcelParseZgsDto],
+        hierarchy: list[ExcelParseItemDto],
+        components: list[ExcelParseItemDto],
+        files: list[ExcelParseFileDto],
     ):
         self.task_id = task_id
         self.version = version
@@ -108,21 +108,21 @@ class ExcelParseResultDataDto:
     #     "ex_amount": excel中给出的数量, // number
     # }
     def __init__(
-            self,
-            zgs_id: int,  # 总概算id
-            zgs_code: str,  # 总概算编号
-            item_id: int,  # 条⽬序号
-            item_code: str,  # 条⽬编码
-            entry_name: str,  # ⼯程或费⽤项⽬名称,来⾃于定额表,
-            dinge_code: str,  # 定额编号,
-            units: str,  # 单位,
-            amount: float,  # 数量,
-            target_id: int,  # ⽤户数据库中条⽬的id,-1表示没有,
-            ex_file_id: str,  # excel⽂件id,
-            ex_cell: str,  # 数量单元格位置,例如 "C17",
-            ex_row: str,  # 该⾏内容,由逗号连接多个单元格得到,
-            ex_unit: str,  # excel中给出的单位,
-            ex_amount: float,  # excel中给出的数量,
+        self,
+        zgs_id: int,  # 总概算id
+        zgs_code: str,  # 总概算编号
+        item_id: int,  # 条⽬序号
+        item_code: str,  # 条⽬编码
+        entry_name: str,  # ⼯程或费⽤项⽬名称,来⾃于定额表,
+        dinge_code: str,  # 定额编号,
+        units: str,  # 单位,
+        amount: float,  # 数量,
+        target_id: int,  # ⽤户数据库中条⽬的id,-1表示没有,
+        ex_file_id: str,  # excel⽂件id,
+        ex_cell: str,  # 数量单元格位置,例如 "C17",
+        ex_row: str,  # 该⾏内容,由逗号连接多个单元格得到,
+        ex_unit: str,  # excel中给出的单位,
+        ex_amount: float,  # excel中给出的数量,
     ):
         self.zgs_id = zgs_id
         self.zgs_code = zgs_code
@@ -188,11 +188,11 @@ class ExcelParseResultDataDto:
 
 class ExcelParseResultDto:
     def __init__(
-            self,
-            task_id: int,
-            result: int = -1,
-            reason: str = "",
-            data: list[ExcelParseResultDataDto] = None,
+        self,
+        task_id: int,
+        result: int = -1,
+        reason: str = "",
+        data: list[ExcelParseResultDataDto] = None,
     ):
         self.task_id = task_id
         self.result = result  # -1-失败;0-运行中;1-成功

+ 18 - 18
SourceCode/IntelligentRailwayCosting/app/stores/railway_costing_mysql/log.py

@@ -12,15 +12,15 @@ class LogStore:
         self._database = "iwb_railway_costing_v1"
 
     def query_logs_paginated(
-            self,
-            page: int = 1,
-            page_size: int = 10,
-            username: Optional[str] = None,
-            operation_type: Optional[str] = None,
-            operation_module: Optional[str] = None,
-            operation_result: Optional[int] = None,
-            start_time: Optional[datetime] = None,
-            end_time: Optional[datetime] = None,
+        self,
+        page: int = 1,
+        page_size: int = 10,
+        username: Optional[str] = None,
+        operation_type: Optional[str] = None,
+        operation_module: Optional[str] = None,
+        operation_result: Optional[int] = None,
+        start_time: Optional[datetime] = None,
+        end_time: Optional[datetime] = None,
     ) -> Dict[str, Any]:
         """
         分页查询日志记录
@@ -68,15 +68,15 @@ class LogStore:
             return {"total": total, "data": logs}
 
     def insert_log(
-            self,
-            username: str,
-            operation_type: str,
-            operation_desc: Optional[str] = None,
-            operation_result: Optional[int] = None,
-            operation_module: Optional[str] = None,
-            operation_data: Optional[str] = None,
-            data_changes: Optional[str] = None,
-            operation_ip: Optional[str] = None,
+        self,
+        username: str,
+        operation_type: str,
+        operation_desc: Optional[str] = None,
+        operation_result: Optional[int] = None,
+        operation_module: Optional[str] = None,
+        operation_data: Optional[str] = None,
+        data_changes: Optional[str] = None,
+        operation_ip: Optional[str] = None,
     ) -> LogModel:
         """
         插入单条日志记录

+ 18 - 18
SourceCode/IntelligentRailwayCosting/app/stores/railway_costing_mysql/project_quota.py

@@ -22,14 +22,14 @@ class ProjectQuotaStore:
         return self._current_user
 
     def get_quotas_paginated(
-            self,
-            budget_id: int,
-            project_id: str,
-            item_code: str,
-            page: int = 1,
-            page_size: int = 10,
-            keyword: Optional[str] = None,
-            send_status: Optional[int] = None,
+        self,
+        budget_id: int,
+        project_id: str,
+        item_code: str,
+        page: int = 1,
+        page_size: int = 10,
+        keyword: Optional[str] = None,
+        send_status: Optional[int] = None,
     ):
         """分页查询定额列表
 
@@ -81,15 +81,15 @@ class ProjectQuotaStore:
             return {"total": total_count, "data": quotas}
 
     def get_quotas_by_task_paginated(
-            self,
-            task_id: int,
-            budget_id,
-            project_id,
-            item_code,
-            page: int = 1,
-            page_size: int = 10,
-            keyword: Optional[str] = None,
-            send_status: Optional[int] = None,
+        self,
+        task_id: int,
+        budget_id,
+        project_id,
+        item_code,
+        page: int = 1,
+        page_size: int = 10,
+        keyword: Optional[str] = None,
+        send_status: Optional[int] = None,
     ):
         with db_helper.mysql_query_session(self._database) as db_session:
             query = db_session.query(ProjectQuotaModel).filter(
@@ -176,7 +176,7 @@ class ProjectQuotaStore:
         return ProjectQuotaDto.from_model(quota) if quota else None
 
     def get_quota_by_quota_input(
-            self, project_id: str, budget_id: int, quota_input_id: int
+        self, project_id: str, budget_id: int, quota_input_id: int
     ):
         with db_helper.mysql_query_session(self._database) as db_session:
             quota = (

+ 8 - 8
SourceCode/IntelligentRailwayCosting/app/stores/railway_costing_mysql/project_task.py

@@ -22,14 +22,14 @@ class ProjectTaskStore:
         return self._current_user
 
     def get_tasks_paginated(
-            self,
-            project_id: str,
-            item_code: str,
-            page: int = 1,
-            page_size: int = 10,
-            keyword: Optional[str] = None,
-            process_status: Optional[int] = None,
-            send_status: Optional[int] = None,
+        self,
+        project_id: str,
+        item_code: str,
+        page: int = 1,
+        page_size: int = 10,
+        keyword: Optional[str] = None,
+        process_status: Optional[int] = None,
+        send_status: Optional[int] = None,
     ):
         """分页查询任务列表
 

+ 18 - 18
SourceCode/IntelligentRailwayCosting/app/stores/railway_costing_sqlserver/project_quota.py

@@ -22,14 +22,14 @@ class ProjectQuotaStore:
         return self._current_user
 
     def get_quotas_paginated(
-            self,
-            budget_id: int,
-            project_id: str,
-            item_code: str,
-            page: int = 1,
-            page_size: int = 10,
-            keyword: Optional[str] = None,
-            send_status: Optional[int] = None,
+        self,
+        budget_id: int,
+        project_id: str,
+        item_code: str,
+        page: int = 1,
+        page_size: int = 10,
+        keyword: Optional[str] = None,
+        send_status: Optional[int] = None,
     ):
         """分页查询定额列表
 
@@ -81,15 +81,15 @@ class ProjectQuotaStore:
             return {"total": total_count, "data": quotas}
 
     def get_quotas_by_task_paginated(
-            self,
-            task_id: int,
-            budget_id,
-            project_id,
-            item_code,
-            page: int = 1,
-            page_size: int = 10,
-            keyword: Optional[str] = None,
-            send_status: Optional[int] = None,
+        self,
+        task_id: int,
+        budget_id,
+        project_id,
+        item_code,
+        page: int = 1,
+        page_size: int = 10,
+        keyword: Optional[str] = None,
+        send_status: Optional[int] = None,
     ):
         with db_helper.sqlserver_query_session(self._database) as db_session:
             query = db_session.query(ProjectQuotaModel).filter(
@@ -176,7 +176,7 @@ class ProjectQuotaStore:
         return ProjectQuotaDto.from_model(quota) if quota else None
 
     def get_quota_by_quota_input(
-            self, project_id: str, budget_id: int, quota_input_id: int
+        self, project_id: str, budget_id: int, quota_input_id: int
     ):
         with db_helper.sqlserver_query_session(self._database) as db_session:
             quota = (