From 97527caefb82c362aed9a3eb31e3a73c4ece791f Mon Sep 17 00:00:00 2001 From: Chika Date: Mon, 14 Dec 2020 17:37:09 +0300 Subject: [PATCH] evo_coefficient extend find --- .../Calculation/lib/fetchData/queries/optionsQuery.ts | 1 + .../lib/fetchData/queries/staticDataQuery.ts | 5 +++++ .../Effects/actions/calculate/prepareData.ts | 10 ++++++++-- src/core/types/Entities/crmEntities.ts | 10 ++++++++++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/client/Containers/Calculation/lib/fetchData/queries/optionsQuery.ts b/src/client/Containers/Calculation/lib/fetchData/queries/optionsQuery.ts index 6bdf7f2..7444222 100644 --- a/src/client/Containers/Calculation/lib/fetchData/queries/optionsQuery.ts +++ b/src/client/Containers/Calculation/lib/fetchData/queries/optionsQuery.ts @@ -194,6 +194,7 @@ const query = gql` evo_max_period evo_min_period evo_controls_program + evo_helpcard_type } selectTarif: evo_tarifs( statecode: $statecode diff --git a/src/client/Containers/Calculation/lib/fetchData/queries/staticDataQuery.ts b/src/client/Containers/Calculation/lib/fetchData/queries/staticDataQuery.ts index 85a4b76..b492454 100644 --- a/src/client/Containers/Calculation/lib/fetchData/queries/staticDataQuery.ts +++ b/src/client/Containers/Calculation/lib/fetchData/queries/staticDataQuery.ts @@ -40,6 +40,11 @@ const query = gql` evo_id evo_leasingobject_typeid } + evo_businessunits { + evo_name + evo_businessunitid + evo_sale_businessunitid + } } evo_sot_coefficient_type: evo_sot_coefficient_types(statecode: $statecode) { evo_id diff --git a/src/client/stores/CalculationStore/Effects/actions/calculate/prepareData.ts b/src/client/stores/CalculationStore/Effects/actions/calculate/prepareData.ts index e1c383e..8734ee1 100644 --- a/src/client/stores/CalculationStore/Effects/actions/calculate/prepareData.ts +++ b/src/client/stores/CalculationStore/Effects/actions/calculate/prepareData.ts @@ -350,7 +350,10 @@ export default ({ const evo_coefficient = evo_coefficient_bonuses.find( x => x.evo_sot_coefficient_typeid === - evo_sot_coefficient_type?.evo_sot_coefficient_typeid, + evo_sot_coefficient_type?.evo_sot_coefficient_typeid && + x.evo_businessunits?.find( + x => x.evo_sale_businessunitid === systemuser.businessunitid, + ), ); if (evo_coefficient) { @@ -370,7 +373,10 @@ export default ({ const evo_coefficient = evo_coefficient_bonuses.find( x => x.evo_sot_coefficient_typeid === - evo_sot_coefficient_type?.evo_sot_coefficient_typeid, + evo_sot_coefficient_type?.evo_sot_coefficient_typeid && + x.evo_businessunits?.find( + x => x.evo_sale_businessunitid === systemuser.businessunitid, + ), ); if (evo_coefficient) { diff --git a/src/core/types/Entities/crmEntities.ts b/src/core/types/Entities/crmEntities.ts index ed88da4..98299a8 100644 --- a/src/core/types/Entities/crmEntities.ts +++ b/src/core/types/Entities/crmEntities.ts @@ -231,6 +231,12 @@ export interface IEvoStatusCode { statecode?: number; } +export interface IEvoBusinessunit { + evo_name?: string; + evo_businessunitid?: string; + evo_sale_businessunitid?: string; +} + export interface IEvoCoefficient { evo_coefficientid?: string; evo_corfficient_type?: number; @@ -249,6 +255,7 @@ export interface IEvoCoefficient { evo_risk_delta?: number; evo_leasingobject_types?: IEvoLeasingObjectType[]; evo_job_titleid?: string; + evo_businessunits?: IEvoBusinessunit[]; } export interface IEvoAddproductType { @@ -275,6 +282,7 @@ export interface IEvoAddproductType { evo_cost_price_telematics?: number; evo_cost_equipment?: number; evo_controls_program?: number[]; + evo_helpcard_type?: number; } export interface IEvoTarif { @@ -342,6 +350,7 @@ export interface ISystemUser { firstname?: string; lastname?: string; fullname?: string; + businessunitid?: string; } export interface IEvoSotCoefficientType { @@ -385,6 +394,7 @@ export type TCRMEntity = BaseEntity & IEvoImpairmentGroup & IEvoCurrencyChange & IEvoStatusCode & + IEvoBusinessunit & IEvoCoefficient & IEvoAddproductType & IEvoTarif &