diff --git a/Controllers/SummaryInvest.Controller.cs b/Controllers/SummaryInvest.Controller.cs index 04b355a..7dde42d 100644 --- a/Controllers/SummaryInvest.Controller.cs +++ b/Controllers/SummaryInvest.Controller.cs @@ -70,23 +70,36 @@ foreach (var summaryInvestYear in summaryInvest.years) if (assetList.amount > 1) { assetList.total = assetList.unit_price * assetList.amount; + + } + // if ((assetList.unit_price ?? 0) == 0 && (assetList.amount ?? 1) == 1) + // { + // assetList.total = 0; + // } + // else if ((assetList.unit_price ?? 0) > 0 && (assetList.amount ?? 1) > 1) + // { + // assetList.total = assetList.unit_price * assetList.amount; + // } + // else if (assetList.total == null) + // { + // assetList.total = assetList.unit_price; + // } + } + foreach (var constructList in faculty.construct_lists) + { + if (constructList.total != constructList.unit_price) + { + constructList.total = constructList.unit_price; + } + if (constructList.total == null && constructList.amount == 1) + { + constructList.total = constructList.unit_price; + } + if (constructList.amount > 1) + { + constructList.total = constructList.unit_price * constructList.amount; } } - // foreach (var constructList in faculty.construct_lists) - // { - // if (constructList.total != constructList.unit_price) - // { - // constructList.total = constructList.unit_price; - // } - // if (constructList.total == null && constructList.amount == 1) - // { - // constructList.total = constructList.unit_price; - // } - // if (constructList.amount > 1) - // { - // constructList.total = constructList.unit_price * constructList.amount; - // } - // } } } }