From b26cd2138a336f3582fd807a618a40c99f308623 Mon Sep 17 00:00:00 2001 From: sriramv Date: Tue, 28 Dec 2021 12:09:47 +0530 Subject: [PATCH] temp:GWM --- app/controllers/financial.controller.js | 40 +++++++++++++++---------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/app/controllers/financial.controller.js b/app/controllers/financial.controller.js index ff8519a..57688ad 100644 --- a/app/controllers/financial.controller.js +++ b/app/controllers/financial.controller.js @@ -43,6 +43,13 @@ exports.MasterDatas = async (req, res) => { + + + + + + + exports.MenuList = (req, res) => { Sync(function() { @@ -161,24 +168,25 @@ var EntityInsert = new Promise((resolve, reject) => { .then(MasterData => { Entities.findAll({where : { losid } , attributes: [ 'id', 'losid' , 'pan' , 'cin' , 'bizname' , 'entity_type' , 'activity_group' , 'biz_act_desc' , 'process_instance_id' ] }) .then(EntitiesData => { - let Time = 2000; + + let Time = 2000; let data = []; EntitiesData.forEach((value, key)=>{ - Time = Time + 500; - instancesid = value.dataValues.process_instance_id; - taskid = camundaHelper.financialsListOfProcessInstances(instancesid); - taskid.then(function(result){ - Time = Time + 500; - formVariable = camundaHelper.financialsFormVariables(result); - formVariable.then(function(form_result){ - formVariableResult = JSON.parse(form_result); - if(formVariableResult.type){ camunda_status = {"process_status":"NULL"}; } else { camunda_status =JSON.parse(form_result); } - obj_data = { ...value.dataValues ,status:camunda_status , statementsmasterrData:MasterData } - data.push(obj_data); - }); - }); - // obj_data = { ...value.dataValues , statementsmasterrData:MasterData } - // data.push(obj_data); + Time = Time + 500; + instancesid = value.dataValues.process_instance_id; + taskid = camundaHelper.financialsListOfProcessInstances(instancesid); + taskid.then(function(result){ + Time = Time + 500; + formVariable = camundaHelper.financialsFormVariables(result); + formVariable.then(function(form_result){ + formVariableResult = JSON.parse(form_result); + if(formVariableResult.type){ camunda_status = {"process_status":"NULL"}; } else { camunda_status =JSON.parse(form_result); } + obj_data = { ...value.dataValues ,status:camunda_status , statementsmasterrData:MasterData } + data.push(obj_data); + }); + }); + // obj_data = { ...value.dataValues , statementsmasterrData:MasterData } + // data.push(obj_data); }); // end of EntitiesData foreach