修改增加完整工程json
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
from calculator_base import CalculatorBase
|
||||
from software_types import (
|
||||
from equipment_calculation.calculator_base import CalculatorBase
|
||||
from equipment_calculation.software_types import (
|
||||
SoftwareType,
|
||||
MAIN_GRID_BUDGET,
|
||||
MAIN_GRID_BILL,
|
||||
@@ -8,7 +8,7 @@ from software_types import (
|
||||
TECHNICAL_RENOVATION_BUDGET,
|
||||
TECHNICAL_RENOVATION_BILL,
|
||||
)
|
||||
from calculation_strategy import CalculationStrategy, DefaultCalculationStrategy
|
||||
from equipment_calculation.calculation_strategy import CalculationStrategy, DefaultCalculationStrategy
|
||||
import json
|
||||
import os
|
||||
from typing import Any, Dict, Optional, Set
|
||||
@@ -86,7 +86,7 @@ class MainGridBillCalculationStrategy(DefaultCalculationStrategy):
|
||||
def calculate_external_variable(self, var_name: str, context: Any) -> float:
|
||||
"""计算表外变量,并乘以父级清单的数量"""
|
||||
# 使用默认实现计算表外变量
|
||||
from bcl_utils import calculator
|
||||
from equipment_calculation.bcl_utils import calculator
|
||||
|
||||
result = calculator.calculate(var_name, context)
|
||||
|
||||
@@ -277,7 +277,7 @@ class TechnicalRenovationBillCalculationStrategy(DefaultCalculationStrategy):
|
||||
def calculate_external_variable(self, var_name: str, context: Any) -> float:
|
||||
"""计算表外变量,并乘以父级清单的数量"""
|
||||
# 使用默认实现计算表外变量
|
||||
from bcl_utils import calculator
|
||||
from equipment_calculation.bcl_utils import calculator
|
||||
|
||||
result = calculator.calculate(var_name, context)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user