diff --git a/app/controllers/financial.controller.js b/app/controllers/financial.controller.js index bbbee53..07cecbd 100644 --- a/app/controllers/financial.controller.js +++ b/app/controllers/financial.controller.js @@ -381,7 +381,7 @@ exports.FinantialsSummary = async (req, res) => { try { const id = req.query.entityid -Entities.findOne({where : { id } , attributes: [ 'id','losid','process_instance_id' ] }) +Entities.findOne({where : { id } , attributes: [ 'id','losid','process_instance_id' , 'entity_type' ] }) .then(EntitiesData => { const instancesid = EntitiesData.dataValues.process_instance_id; sequelize.query("select a.losid,a.entityid,a.FY,a.st_type as st_type_id, b.statement_name as st_type_name,a.additional_year_type FROM entity_fin_year a LEFT JOIN (SELECT id,statement_name FROM statement_type) b ON a.st_type = b.id WHERE entityid ="+id+" order by a.fy desc") @@ -389,7 +389,7 @@ sequelize.query("select a.losid,a.entityid,a.FY,a.st_type as st_type_id, b.state const data = EntityfinyearData[0]; const year_1 = EntityfinyearData[0][0].FY; const additional_year_type = EntityfinyearData[0][0].additional_year_type; - const years = {losid:EntitiesData.dataValues.losid,entityid:EntitiesData.dataValues.id,additional_year_type:additional_year_type}; + const years = {losid:EntitiesData.dataValues.losid,entityid:EntitiesData.dataValues.id,entity_type:EntitiesData.dataValues.entity_type,additional_year_type:additional_year_type}; // below function call is for calculation of additional new year flag generation add_new_FY_flag = financialControllerHelper.addNewFyFlag(year_1); // below code for constructing query for dynamic financial years @@ -924,4 +924,25 @@ exports.createFinancialYear = async (req, res) => { // }); // end of sync function - // }; \ No newline at end of file + // }; + + + + + + +exports.demoone = (req, res) => { + + + try + { + + + }//try + + catch (error) + { + + } + +} \ No newline at end of file diff --git a/app/routes/routes.js b/app/routes/routes.js index 5d416d5..2af5a08 100644 --- a/app/routes/routes.js +++ b/app/routes/routes.js @@ -7,7 +7,7 @@ module.exports = app => { const { logMsg } = require('../services/logger.js'); var router = require("express").Router(); - + /** * @swagger