修改增加完整工程json

equipment_calculation/calculator_base.py

@@ -1,11 +1,11 @@
 import os
 from abc import ABC, abstractmethod
 from typing import Dict, List, Any, Optional, Tuple
-from software_types import SoftwareType
-from find_project_nodes import get_project_divisions_list
-from quantity_fee_calculator import calculate_quantity_fees as base_calculate_quantity_fees
-from resource_fee_calculator import calculate_resource_fees as base_calculate_resource_fees
-from calculation_strategy import CalculationStrategy, DefaultCalculationStrategy
+from equipment_calculation.software_types import SoftwareType
+from equipment_calculation.find_project_nodes import get_project_divisions_list
+from equipment_calculation.quantity_fee_calculator import calculate_quantity_fees as base_calculate_quantity_fees
+from equipment_calculation.resource_fee_calculator import calculate_resource_fees as base_calculate_resource_fees
+from equipment_calculation.calculation_strategy import CalculationStrategy, DefaultCalculationStrategy
 import json
 
 
@@ -47,7 +47,7 @@ class CalculatorBase(ABC):
     def calculate_quantity_fee_tables(
         self,
         json_file_path: str,
-        project_name: str = None,
+        project_name: str,
     ) -> None:
         """
         计算工程量取费表
@@ -141,7 +141,7 @@ class CalculatorBase(ABC):
         os.makedirs(self.get_output_dir(), exist_ok=True)
 
         # 初始化BCL计算器，传递软件类型和计算类型
-        from bcl_utils import init_bcl_calculator
+        from equipment_calculation.bcl_utils import init_bcl_calculator
 
         init_bcl_calculator(
             software_category=self.software_type.category.value,
@@ -189,7 +189,7 @@ class CalculatorBase(ABC):
         os.makedirs(self.get_output_dir(), exist_ok=True)
 
         # 初始化BCL计算器，传递软件类型和计算类型
-        from bcl_utils import init_bcl_calculator
+        from equipment_calculation.bcl_utils import init_bcl_calculator
 
         init_bcl_calculator(
             software_category=self.software_type.category.value,