From cb5814decf58e7f03b43a5c4b5240f26429e2799 Mon Sep 17 00:00:00 2001 From: Chika Date: Thu, 28 Jan 2021 11:52:13 +0300 Subject: [PATCH] fill clientRisk when loadkp --- .../lib/fetchData/queries/optionsQuery.ts | 1 + .../lib/fetchData/queries/ownerQuery.ts | 1 + .../Effects/reactions/loadKpReaction/index.ts | 22 +++++++++++++++++++ .../reactions/loadKpReaction/mapKpToValues.ts | 1 - .../reactions/loadKpReaction/quoteQuery.js | 1 + 5 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/client/Containers/Calculation/lib/fetchData/queries/optionsQuery.ts b/src/client/Containers/Calculation/lib/fetchData/queries/optionsQuery.ts index 55fb0ff..5cba121 100644 --- a/src/client/Containers/Calculation/lib/fetchData/queries/optionsQuery.ts +++ b/src/client/Containers/Calculation/lib/fetchData/queries/optionsQuery.ts @@ -34,6 +34,7 @@ const query = gql` selectClientRisk: evo_client_risks(statecode: $statecode) { evo_name evo_client_riskid + evo_id } selectClientType: evo_client_types(statecode: $statecode) { evo_name diff --git a/src/client/Containers/Calculation/lib/fetchData/queries/ownerQuery.ts b/src/client/Containers/Calculation/lib/fetchData/queries/ownerQuery.ts index 082f17a..3571b19 100644 --- a/src/client/Containers/Calculation/lib/fetchData/queries/ownerQuery.ts +++ b/src/client/Containers/Calculation/lib/fetchData/queries/ownerQuery.ts @@ -23,6 +23,7 @@ const query = gql` evo_leadid evo_client_riskid parentaccountid + evo_programsolution } } `; diff --git a/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/index.ts b/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/index.ts index c438d9e..ee58d6b 100644 --- a/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/index.ts +++ b/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/index.ts @@ -217,6 +217,27 @@ const loadKpReaction: IReactionEffect = calculationStore => ({ const rate = calculationStore.getOptions('selectRate'); const target_rate = rate.find(x => x.evo_rateid === quote.evo_rateid); + let clientRisk = quote.evo_client_riskid; + if (opportunity) { + const { + evo_programsolution, + evo_client_riskid, + } = calculationStore.options.selectOpportunity?.find( + x => x.value === opportunity, + ); + + if (evo_programsolution === 100000000) { + const midClientRisk = calculationStore.options.selectClientRisk?.find( + x => x.evo_id === 2, + ); + if (midClientRisk) { + clientRisk = midClientRisk.evo_client_riskid; + } + } else if (evo_programsolution !== 100000000 && evo_client_riskid) { + clientRisk = evo_client_riskid; + } + } + calculationStore.setValues({ ...initialValues, ...newValues, @@ -228,6 +249,7 @@ const loadKpReaction: IReactionEffect = calculationStore => ({ quote: quoteId, recalcWithRevision, leaseObjectCount, + clientRisk, }); message.success({ diff --git a/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/mapKpToValues.ts b/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/mapKpToValues.ts index 83daef4..8fcd15f 100644 --- a/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/mapKpToValues.ts +++ b/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/mapKpToValues.ts @@ -3,7 +3,6 @@ import { TValues } from 'core/types/Calculation/Store/values'; const mapKPtoValues: TValues = { product: 'evo_baseproductid', - clientRisk: 'evo_client_riskid', clientType: 'evo_client_typeid', leaseObjectPrice: 'evo_supplier_currency_price', supplierCurrency: 'evo_transactioncurrencyid', diff --git a/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/quoteQuery.js b/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/quoteQuery.js index 963ce66..3955525 100644 --- a/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/quoteQuery.js +++ b/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/quoteQuery.js @@ -28,6 +28,7 @@ export default gql` evo_last_payment_perc evo_quotename evo_rateid + evo_client_riskid } } `;