multiple entity props map

src/client/services/CrmService/propsMap.ts

@@ -2,7 +2,7 @@ import { TCRMEntity } from 'core/types/Entities/crmEntities';
 import { TEntities } from 'core/types/Entities/crmEntityNames';
 
 const propsMap: TEntities<{
-  name: keyof TCRMEntity;
+  name: keyof TCRMEntity | (keyof TCRMEntity)[];
   value: keyof TCRMEntity;
 }> = {
   account: {
@@ -54,7 +54,7 @@ const propsMap: TEntities<{
     value: 'evo_modelid',
   },
   evo_equipment: {
-    name: 'evo_name',
+    name: ['evo_name', 'evo_start_production_year'],
     value: 'evo_equipmentid',
   },
   evo_reward_condition: {

src/client/services/CrmService/tools/entity.ts

@@ -18,10 +18,19 @@ export function convertEntityToOption(
   const entityPropsMap = propsMap[entityName];
   if (entityPropsMap) {
     const { name: propName, value: propValue } = entityPropsMap;
+
+    let name,
+      value = entity[propValue];
+    if (!Array.isArray(propName)) {
+      name = entity[propName];
+    } else {
+      name = propName.map(field => entity[field]).join(' ');
+    }
+
     const optionatedObject = {
       ...entity,
-      name: entity[propName],
-      value: entity[propValue],
+      name,
+      value,
     };
     return optionatedObject;
   }

src/client/stores/CalculationStore/Effects/reaction.ts

@@ -1824,6 +1824,7 @@ const reactionEffects: IReactionEffect[] = [
                   evo_name
                   evo_impairment_groupid
                   evo_leasingobject_risk
+                  evo_start_production_year
                 }
               }
             `,

src/core/types/Entities/crmEntities.ts

@@ -123,6 +123,7 @@ export interface IEvoEquipment {
   evo_modelid?: string;
   evo_impairment_groupid?: string;
   evo_leasingobject_risk?: number;
+  evo_start_production_year: number;
   statecode?: number;
 }