diff --git a/index.js b/index.js index dda6f62..7eafdbc 100644 --- a/index.js +++ b/index.js @@ -4,6 +4,7 @@ const fs = require('fs'); const { sleep, saveLargeObject } = require('./util'); const { getAllWorkflows } = require('./workflow'); const { getAllProcesses, getProcessPaths, getProcessPathsSubFlow } = require('./process'); +const { initFunctionData } = require('./initFunctionData'); require(path.join(process.cwd(), "..", "server", "dist", "database.js")); @@ -131,7 +132,6 @@ require(path.join(process.cwd(), "..", "server", "dist", "database.js")); for await (const workflow of Object.keys(allWorkFlowInfo)) { if (workflow == 57) { const data = allWorkFlowInfo[workflow]; - console.log(data); const pathsCollection = data?.root?.validPaths || []; if (pathsCollection?.length == 0) allWorkFlowInfo[key].isValid = false; for await (let pathString of pathsCollection) { @@ -142,7 +142,12 @@ require(path.join(process.cwd(), "..", "server", "dist", "database.js")); for await (let path of pathCollection) { const process = await bpmsDB.bpms_process.findByPk(path,{raw:true}); - console.log(path,process); + const processData = await initFunctionData({ + processId: process.id, + + }) + data = {...data, ...processData}; + return; } } diff --git a/initFunctionData.js b/initFunctionData.js index 12170a8..d1c2b5e 100644 --- a/initFunctionData.js +++ b/initFunctionData.js @@ -32,21 +32,23 @@ initFunctionData = async (data) => { // raw: true, // }); // } - let processChecklist = await bpmsDB.bpms_processChecklist.findAll({ - where: { processId: process.id }, - attributes: ["checklistId"], - order: [["ord", "asc"]], - }); - const checklistIds = - data?.checklists?.length - ? data.checklists.map((item) => +item.id).filter(Boolean).join(",") - : processChecklist - .map((e) => +e.checklistId) - .filter((id) => !isNaN(id) && id !== 0) - .join(","); + // let processChecklist = await bpmsDB.bpms_processChecklist.findAll({ + // where: { processId: process.id }, + // attributes: ["checklistId"], + // order: [["ord", "asc"]], + // }); + + // const checklistIds = + // data?.checklists?.length + // ? data.checklists.map((item) => +item.id).filter(Boolean).join(",") + // : processChecklist + // .map((e) => +e.checklistId) + // .filter((id) => !isNaN(id) && id !== 0) + // .join(","); - const previousTask = data.previousTask; + // const previousTask = data.previousTask; + const network = await db.network.findByPk(processNetwork.id, { raw: true, });