update 代码优化

SourceCode/IntelligentRailwayCosting/.script/init_mysql.sql

@@ -4,6 +4,7 @@ USE iwb_railway_costing_v1;
 -- 创建项目任务表
 CREATE TABLE IF NOT EXISTS project_task (
     id INT AUTO_INCREMENT PRIMARY KEY,
+    parent_id INT NOT NULL COMMENT '父任务编号',
     task_name VARCHAR(255) NOT NULL COMMENT '任务名称',
     task_sort INT DEFAULT 0 COMMENT '任务排序',
     task_desc VARCHAR(1000) COMMENT '任务描述',
@@ -37,7 +38,6 @@ CREATE TABLE IF NOT EXISTS project_task (
 CREATE TABLE IF NOT EXISTS project_quota (
     id INT AUTO_INCREMENT PRIMARY KEY,
     task_id INT NOT NULL COMMENT '任务编号',
-    parent_id INT NOT NULL COMMENT '父任务编号',
     project_id VARCHAR(50) NOT NULL COMMENT '项目编号',
     budget_id INT NOT NULL COMMENT '概算序号',
     budget_code VARCHAR(50) COMMENT '概算编号',

SourceCode/IntelligentRailwayCosting/.script/init_sqlserver.sql

@@ -24,6 +24,7 @@ IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[pr
 BEGIN
 CREATE TABLE [dbo].[project_task] (
     [id] INT IDENTITY(1,1) PRIMARY KEY,
+    [parent_id] INT DEFAULT 0,
     [task_name] NVARCHAR(255) NOT NULL,
     [task_sort] INT DEFAULT 0,
     [task_desc] NVARCHAR(1000) NULL,

SourceCode/IntelligentRailwayCosting/app/routes/project_quota.py

@@ -34,7 +34,7 @@ def get_page_list(budget_id: int, project_id: str, item_code: str):
 )
 @Permission.authorize
 def get_quotas_by_task_paginated(
-        task_id: int, budget_id: int, project_id: str, item_code: str
+    task_id: int, budget_id: int, project_id: str, item_code: str
 ):
     try:
         data = request.get_json()

SourceCode/IntelligentRailwayCosting/app/services/project_quota.py

@@ -19,14 +19,14 @@ class ProjectQuotaService:
         self._quota_sequence_num = {}
 
     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,
     ):
         """获取项目定额列表
 
@@ -63,15 +63,15 @@ class ProjectQuotaService:
             raise
 
     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,
     ):
         try:
             data = self.store.get_quotas_by_task_paginated(
@@ -472,11 +472,11 @@ class ProjectQuotaService:
             raise
 
     def start_send(
-            self,
-            _id: int,
-            is_cover: bool = False,
-            is_log: bool = True,
-            clear_num: bool = False,
+        self,
+        _id: int,
+        is_cover: bool = False,
+        is_log: bool = True,
+        clear_num: bool = False,
     ) -> Optional[str]:
         """启动推送"""
         if clear_num:

SourceCode/IntelligentRailwayCosting/app/stores/quota_input.py

@@ -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,
     ):
         """分页查询定额输入列表
 
@@ -148,7 +148,7 @@ class QuotaInputStore:
             return QuotaInputDto.from_model(model)
 
     def query_quota_sequence_number(
-            self, project_id: str, budget_id: int, item_id: int
+        self, project_id: str, budget_id: int, item_id: int
     ):
         self._database = project_id
         with db_helper.sqlserver_session(self._database) as db_session:
@@ -166,7 +166,7 @@ class QuotaInputStore:
             return num[0] + 1 if num and num[0] else 1
 
     def update_quota(
-            self, project_id: str, dto: QuotaInputDto
+        self, project_id: str, dto: QuotaInputDto
     ) -> Optional[QuotaInputDto]:
         """更新定额输入
 

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 = (
@@ -296,7 +296,7 @@ class ProjectQuotaStore:
             return ProjectQuotaDto.from_model(quota)
 
     def update_quota_chapter(
-            self, quota_id: int, item_id: int, item_code: str
+        self, quota_id: int, item_id: int, item_code: str
     ) -> Optional[ProjectQuotaDto]:
         quota = self.get_quota(quota_id)
         if not quota:

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 = (
@@ -286,7 +286,7 @@ class ProjectQuotaStore:
             return ProjectQuotaDto.from_model(quota)
 
     def update_quota_chapter(
-            self, quota_id: int, item_id: int, item_code: str
+        self, quota_id: int, item_id: int, item_code: str
     ) -> Optional[ProjectQuotaDto]:
         quota = self.get_quota(quota_id)
         if not quota: