From b2df77b3dff89e3f2c5539f5cb23ba33729409ff Mon Sep 17 00:00:00 2001 From: suseendhiran17 <58357088+suseendhiran17@users.noreply.github.com> Date: Wed, 26 Jul 2023 17:53:30 +0530 Subject: [PATCH] susee --- app/controllers/creditpd.controller.js | 43 ++++++++++++++----- app/models/BusinessAsset.js | 3 +- .../CreditBorrowerAndGuarantorDetails.js | 1 + ...CreditBusinessAndPersonalBankingDetails.js | 3 +- app/models/CreditExistingLoanOblogation.js | 3 +- app/models/CreditFinancialInformation.js | 3 +- .../CreditKeyProductBusinessContribution.js | 1 + app/models/CreditKeyShareholder.js | 1 + app/models/StockDetail.js | 3 +- 9 files changed, 46 insertions(+), 15 deletions(-) diff --git a/app/controllers/creditpd.controller.js b/app/controllers/creditpd.controller.js index e2a8602..21abde7 100644 --- a/app/controllers/creditpd.controller.js +++ b/app/controllers/creditpd.controller.js @@ -91,9 +91,10 @@ exports.PullCreditPdData = async (req, res) => { if (temp_array.length > 0) { - temp_array.forEach(async(element) => { + temp_array.forEach(async(element,i) => { if (OverallKey == "Borrower & Guarantor Details" && element.entity_type.toLowerCase() != "individual") { console.log(element.borrower_type.toLowerCase()); Object.assign(element,{borrower_age : element.numbers_of_years_business_running}); delete element.numbers_of_years_business_running; } - Object.assign(element , {pd_id : PDID.dataValues.pd_id , ref_no : req.body.pdid} ); Object.assign(element ,obj ); + await Object.assign(element , {pd_id : PDID.dataValues.pd_id , ref_no : req.body.pdid , display_order : i+1} ); + await Object.assign(element ,obj ); var index = table_name[0].table_name; var tableName = arr[index]; console.log(tableName); @@ -259,22 +260,22 @@ exports.GetCreditPdData = async (req, res) => CreditGeneralInformation.findAll({ where : { applicant_id : req.query.losid,is_active : 1}, include : [ {model: CreditAddressDetail }, - {model : CreditBorrowerAndGuarantorDetails }, - {model: CreditKeyShareholder }, + {model : CreditBorrowerAndGuarantorDetails ,separate: true, order: [['display_order', 'ASC']] }, + {model: CreditKeyShareholder ,separate: true, order: [['display_order', 'ASC']] }, {model: FamilyMemberInvolvedInBusiness }, {model: CreditGeneralBusinessInformation }, {model: EmployeeStrength }, - {model: CreditFinancialInformation }, + {model: CreditFinancialInformation ,separate: true, order: [['display_order', 'ASC']] }, {model: SupplierDetail }, {model: ClientDetail }, - {model: StockDetail }, + {model: StockDetail ,separate: true, order: [['display_order', 'ASC']]}, {model: CreditFuturePlans }, - {model: CreditBusinessAndPersonalBankingDetails }, - {model: CreditExistingLoanObligation }, + {model: CreditBusinessAndPersonalBankingDetails,separate: true, order: [['display_order', 'ASC']] }, + {model: CreditExistingLoanObligation ,separate: true, order: [['display_order', 'ASC']] }, {model : CreditManager }, {model: CreditFinalRemarks }, - {model: BusinessAsset }, - {model: CreditKeyProductBusinessContribution }, + {model: BusinessAsset ,separate: true, order: [['display_order', 'ASC']] }, + {model: CreditKeyProductBusinessContribution ,separate: true, order: [['display_order', 'ASC']] }, {model: Photograph }, {model: CreditLoanDetail }, ] @@ -543,4 +544,26 @@ exports.deleteLogFile = async (req , res) => }; +exports.callSineedgeApi = (req, res) => +{ + try + { + request('http://www.google.com', function (error, response, body) { + res = this.PullSalesPdData(body); + if(res.status == 200){ + res.send({'status':200 , message:"Success." ,'data': Msg}); + } + else{ + res.send({'status':404 , message:"Failed." ,'data': "No data"}); + } + }); + + } catch(err) { + res.status(500).send({'status':404, + message: err.message || "Some error occurred while inserting statements." ,'data': "No data" + }); } //end of try catch + +}; + + diff --git a/app/models/BusinessAsset.js b/app/models/BusinessAsset.js index d3b917d..ecae337 100644 --- a/app/models/BusinessAsset.js +++ b/app/models/BusinessAsset.js @@ -36,7 +36,8 @@ module.exports = (sequelize, DataTypes) => { business_owner_name_master: { type: DataTypes.STRING }, business_years_master: { type: DataTypes.STRING }, createdby: { type: DataTypes.INTEGER }, - updatedby: { type: DataTypes.INTEGER } + updatedby: { type: DataTypes.INTEGER }, + display_order: { type: DataTypes.INTEGER } }, { diff --git a/app/models/CreditBorrowerAndGuarantorDetails.js b/app/models/CreditBorrowerAndGuarantorDetails.js index ddb0522..2b22ee5 100644 --- a/app/models/CreditBorrowerAndGuarantorDetails.js +++ b/app/models/CreditBorrowerAndGuarantorDetails.js @@ -18,6 +18,7 @@ module.exports = (sequelize, DataTypes) => { relationship_to: { type: DataTypes.STRING }, relationship: { type: DataTypes.STRING }, common_remarks: { type: DataTypes.STRING }, + display_order: { type: DataTypes.INTEGER }, createdby: { type: DataTypes.INTEGER }, updatedby: { type: DataTypes.INTEGER } diff --git a/app/models/CreditBusinessAndPersonalBankingDetails.js b/app/models/CreditBusinessAndPersonalBankingDetails.js index 156896a..1c68490 100644 --- a/app/models/CreditBusinessAndPersonalBankingDetails.js +++ b/app/models/CreditBusinessAndPersonalBankingDetails.js @@ -13,7 +13,8 @@ module.exports = (sequelize, DataTypes) => { cc_limit: { type: DataTypes.STRING }, common_remarks: { type: DataTypes.STRING }, createdby: { type: DataTypes.INTEGER }, - updatedby: { type: DataTypes.INTEGER } + updatedby: { type: DataTypes.INTEGER }, + display_order: { type: DataTypes.INTEGER } }, { diff --git a/app/models/CreditExistingLoanOblogation.js b/app/models/CreditExistingLoanOblogation.js index 96cfd11..738ec6e 100644 --- a/app/models/CreditExistingLoanOblogation.js +++ b/app/models/CreditExistingLoanOblogation.js @@ -18,7 +18,8 @@ module.exports = (sequelize, DataTypes) => { elapsed_tenure_months: { type: DataTypes.STRING }, common_remarks: { type: DataTypes.STRING }, createdby: { type: DataTypes.INTEGER }, - updatedby: { type: DataTypes.INTEGER } + updatedby: { type: DataTypes.INTEGER }, + display_order: { type: DataTypes.INTEGER } }, { diff --git a/app/models/CreditFinancialInformation.js b/app/models/CreditFinancialInformation.js index fc2c95c..43bfca3 100644 --- a/app/models/CreditFinancialInformation.js +++ b/app/models/CreditFinancialInformation.js @@ -38,7 +38,8 @@ module.exports = (sequelize, DataTypes) => { no_of_financial_years: { type: DataTypes.INTEGER }, common_remarks: { type: DataTypes.STRING }, createdby: { type: DataTypes.INTEGER }, - updatedby: { type: DataTypes.INTEGER } + updatedby: { type: DataTypes.INTEGER }, + display_order: { type: DataTypes.INTEGER } }, { diff --git a/app/models/CreditKeyProductBusinessContribution.js b/app/models/CreditKeyProductBusinessContribution.js index 1323df4..3e40e72 100644 --- a/app/models/CreditKeyProductBusinessContribution.js +++ b/app/models/CreditKeyProductBusinessContribution.js @@ -16,6 +16,7 @@ module.exports = (sequelize, DataTypes) => { createdby: { type: DataTypes.INTEGER }, updatedby: { type: DataTypes.INTEGER }, name_of_the_company: { type: DataTypes.STRING }, // new + display_order: { type: DataTypes.INTEGER } }, diff --git a/app/models/CreditKeyShareholder.js b/app/models/CreditKeyShareholder.js index 825f1bf..e4f3e4f 100644 --- a/app/models/CreditKeyShareholder.js +++ b/app/models/CreditKeyShareholder.js @@ -19,6 +19,7 @@ module.exports = (sequelize, DataTypes) => { createdby: { type: DataTypes.INTEGER }, updatedby: { type: DataTypes.INTEGER }, name_of_the_company: { type: DataTypes.STRING }, // new + display_order: { type: DataTypes.INTEGER } }, diff --git a/app/models/StockDetail.js b/app/models/StockDetail.js index 9eee240..f61d1c1 100644 --- a/app/models/StockDetail.js +++ b/app/models/StockDetail.js @@ -21,7 +21,8 @@ module.exports = (sequelize, DataTypes) => { estimated_uom_master: { type: DataTypes.STRING }, name_of_the_company: { type: DataTypes.STRING }, // new createdby: { type: DataTypes.INTEGER }, - updatedby: { type: DataTypes.INTEGER } + updatedby: { type: DataTypes.INTEGER }, + display_order: { type: DataTypes.INTEGER } }, {