merge:GWM
This commit is contained in:
parent
0c8597395d
commit
fbf52a0d6d
@ -324,7 +324,7 @@ Pro42Data.forEach((Pro42Datavalue, key)=>{
|
||||
{
|
||||
Entities.create({ "losid":Pro42Datavalue.losid,"pan":Pro42Datavalue.pan,"cin":Pro42Datavalue.cin,"bizname":Pro42Datavalue.bizname,"entity_type":Pro42Datavalue.entity_type,"activity_group":Pro42Datavalue.activity_group,"biz_act_desc":Pro42Datavalue.biz_act_desc,"createdby":Pro42Datavalue.createdby})
|
||||
.then(Entitydata => {
|
||||
|
||||
console.log(Entitydata.dataValues.id)
|
||||
//create Entityfinyears data
|
||||
const Y1 = new Date().getFullYear();
|
||||
const Y2 = Y1-1;
|
||||
@ -645,7 +645,7 @@ const Pro42Data = [
|
||||
{
|
||||
Entities.create({ "losid":Pro42Datavalue.losid,"pan":Pro42Datavalue.pan,"cin":Pro42Datavalue.cin,"bizname":Pro42Datavalue.bizname,"entity_type":Pro42Datavalue.entity_type,"activity_group":Pro42Datavalue.activity_group,"biz_act_desc":Pro42Datavalue.biz_act_desc,"createdby":Pro42Datavalue.createdby})
|
||||
.then(Entitydata => {
|
||||
|
||||
|
||||
//create Entityfinyears data
|
||||
const Y1 = new Date().getFullYear();
|
||||
const Y2 = Y1-1;
|
||||
|
||||
@ -8,7 +8,7 @@ module.exports = app => {
|
||||
var router = require("express").Router();
|
||||
|
||||
|
||||
|
||||
router.get("/camunda", financials.camunda);
|
||||
|
||||
/**
|
||||
* @swagger
|
||||
@ -877,12 +877,6 @@ module.exports = app => {
|
||||
*/
|
||||
|
||||
router.get("/TaskComplete", master.TaskComplete);
|
||||
|
||||
router.get("/ReInitiate", master.ReInitiate);
|
||||
|
||||
router.get("/Reassign", master.Reassign);
|
||||
|
||||
|
||||
//router.post("/doWorkPromise", master.doWorkPromise);
|
||||
//router.get("/test", master.test);
|
||||
|
||||
|
||||
@ -49,9 +49,10 @@ const URL = process.env.CAMUNDA_URL
|
||||
body: myJSONObject
|
||||
}, function (error, response, body){
|
||||
let data = body;
|
||||
task_id = data[0].id;
|
||||
if(task_id)
|
||||
|
||||
if(data.length)
|
||||
{
|
||||
task_id = data[0].id;
|
||||
resolve(task_id);
|
||||
}
|
||||
else{ resolve(false); }
|
||||
|
||||
Loading…
Reference in New Issue
Block a user