diff --git a/web/calculators/__init__.py b/web/calculators/__init__.py index d1cf4b1..b105b52 100644 --- a/web/calculators/__init__.py +++ b/web/calculators/__init__.py @@ -1,4 +1,4 @@ -from decimal import Decimal +from decimal import Decimal, ROUND_HALF_UP from commons.models.data_fujian import DataFujian from commons.models.data_network import DataNetwork @@ -37,7 +37,8 @@ class Helper: class RoundMethod: @staticmethod def normal(n, round_bit): - result = round(n, round_bit) + q_ext = Decimal('0.' + '0' * round_bit) + result = Decimal(n).quantize(q_ext, rounding=ROUND_HALF_UP) return result if round_bit != 0 else int(result) @staticmethod diff --git a/web/tasks/once/calculate.py b/web/tasks/once/calculate.py index 14f1a38..19da17d 100644 --- a/web/tasks/once/calculate.py +++ b/web/tasks/once/calculate.py @@ -39,7 +39,7 @@ if __name__ == '__main__': from core.factory import ClientApp with ClientApp().app_context(): - calculate(2025, 3) + calculate(2025, 5) # for i in range(2, 12): # calculate(2022, i+1)