明树Git Lab

Skip to content

J
jt_backend
Commit 2c8bedbc authored by zfp1's avatar zfp1
Browse files
Options

Merge branch 'master' into dev

parents d7880b9d e74086fa
Show whitespace changes
Inline Side-by-side
Showing with 55 additions and 55 deletions
controller/projectController.js
View file @ 2c8bedbc
...@@ -167,7 +167,7 @@ async function createProject(req, res, next) { ...@@ -167,7 +167,7 @@ async function createProject(req, res, next) {
} }
async function xiangmulixianggengxin(project, projectLzType) { async function xiangmulixianggengxin(body, projectLzType) {
try { try {
// 1. 处理项目 // 1. 处理项目
// let project = body; // let project = body;
...@@ -177,51 +177,51 @@ async function xiangmulixianggengxin(project, projectLzType) { ...@@ -177,51 +177,51 @@ async function xiangmulixianggengxin(project, projectLzType) {
// 处理 projectJsgms // 处理 projectJsgms
let projectJsgms = body.projectJsgms || []; let projectJsgms = body.projectJsgms || [];
let pnids1 = [], pns1 = [], newprojectJsgms = []; let pnids1 = [], pns1 = [], newprojectJsgms = [];
projectJsgms.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = project.id; newprojectJsgms.push(o); } } else { pnids1.push(o.id); pns1.push(o); } return o }); projectJsgms.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = projectInfo.id; newprojectJsgms.push(o); } } else { pnids1.push(o.id); pns1.push(o); } return o });
await DB.ProjectJsgm.destroy({ where: { projectId: project.id, id: { [Op.notIn]: pnids1 } } }); await DB.ProjectJsgm.destroy({ where: { projectId: projectInfo.id, id: { [Op.notIn]: pnids1 } } });
await DB.ProjectJsgm.bulkCreate(newprojectJsgms); await DB.ProjectJsgm.bulkCreate(newprojectJsgms);
await Promise.all(pns1.map(item => { DB.ProjectJsgm.update(item, { where: { id: item.id } }) })); await Promise.all(pns1.map(item => { DB.ProjectJsgm.update(item, { where: { id: item.id } }) }));
// 处理 projectGdxxs // 处理 projectGdxxs
let projectGdxxs = body.projectGdxxs || []; let projectGdxxs = body.projectGdxxs || [];
let pnids2 = [], pns2 = [], newprojectGdxxs = []; let pnids2 = [], pns2 = [], newprojectGdxxs = [];
projectGdxxs.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = project.id; newprojectGdxxs.push(o); } } else { pnids2.push(o.id); pns2.push(o); } return o }); projectGdxxs.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = projectInfo.id; newprojectGdxxs.push(o); } } else { pnids2.push(o.id); pns2.push(o); } return o });
await DB.ProjectGdxx.destroy({ where: { projectId: project.id, id: { [Op.notIn]: pnids2 } } }); await DB.ProjectGdxx.destroy({ where: { projectId: projectInfo.id, id: { [Op.notIn]: pnids2 } } });
await DB.ProjectGdxx.bulkCreate(newprojectGdxxs); await DB.ProjectGdxx.bulkCreate(newprojectGdxxs);
await Promise.all(pns2.map(item => { DB.ProjectGdxx.update(item, { where: { id: item.id } }) })); await Promise.all(pns2.map(item => { DB.ProjectGdxx.update(item, { where: { id: item.id } }) }));
// 处理 projectXmtzzes // 处理 projectXmtzzes
let projectXmtzzes = body.projectXmtzzes || []; let projectXmtzzes = body.projectXmtzzes || [];
projectXmtzzes = utils.flattenTree(projectXmtzzes, 'xh', 'parentXh'); projectXmtzzes = utils.flattenTree(projectXmtzzes, 'xh', 'parentXh');
let pnids3 = [], pns3 = [], newprojectXmtzzes = []; let pnids3 = [], pns3 = [], newprojectXmtzzes = [];
projectXmtzzes.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = project.id; newprojectXmtzzes.push(o); } } else { pnids3.push(o.id); pns3.push(o); } return o }); projectXmtzzes.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = projectInfo.id; newprojectXmtzzes.push(o); } } else { pnids3.push(o.id); pns3.push(o); } return o });
await DB.ProjectXmtzze.bulkCreate(newprojectXmtzzes); await DB.ProjectXmtzze.bulkCreate(newprojectXmtzzes);
await Promise.all(pns3.map(item => { DB.ProjectXmtzze.update(item, { where: { id: item.id } }) })); await Promise.all(pns3.map(item => { DB.ProjectXmtzze.update(item, { where: { id: item.id } }) }));
// 处理 projectBjtjs // 处理 projectBjtjs
let projectBjtjs = body.projectBjtjs || []; let projectBjtjs = body.projectBjtjs || [];
let pnids4 = [], pns4 = [], newprojectBjtjs = []; let pnids4 = [], pns4 = [], newprojectBjtjs = [];
projectBjtjs.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = project.id; newprojectBjtjs.push(o); } } else { pnids4.push(o.id); pns4.push(o); } return o }); projectBjtjs.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = projectInfo.id; newprojectBjtjs.push(o); } } else { pnids4.push(o.id); pns4.push(o); } return o });
await DB.ProjectBjtj.destroy({ where: { projectId: project.id, id: { [Op.notIn]: pnids4 } } }); await DB.ProjectBjtj.destroy({ where: { projectId: projectInfo.id, id: { [Op.notIn]: pnids4 } } });
await DB.ProjectBjtj.bulkCreate(newprojectBjtjs); await DB.ProjectBjtj.bulkCreate(newprojectBjtjs);
await Promise.all(pns4.map(item => { DB.ProjectBjtj.update(item, { where: { id: item.id } }) })); await Promise.all(pns4.map(item => { DB.ProjectBjtj.update(item, { where: { id: item.id } }) }));
// 处理 projectSpyjs // 处理 projectSpyjs
let projectSpyjs = body.projectSpyjs || []; let projectSpyjs = body.projectSpyjs || [];
let pnids9 = [], pns9 = [], newprojectSpyjs = []; let pnids9 = [], pns9 = [], newprojectSpyjs = [];
projectSpyjs.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = project.id; newprojectSpyjs.push(o); } } else { pnids9.push(o.id); pns9.push(o); } return o }); projectSpyjs.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = projectInfo.id; newprojectSpyjs.push(o); } } else { pnids9.push(o.id); pns9.push(o); } return o });
await DB.ProjectSpyj.destroy({ where: { projectId: project.id, id: { [Op.notIn]: pnids9 } } }); await DB.ProjectSpyj.destroy({ where: { projectId: projectInfo.id, id: { [Op.notIn]: pnids9 } } });
await DB.ProjectSpyj.bulkCreate(newprojectSpyjs); await DB.ProjectSpyj.bulkCreate(newprojectSpyjs);
await Promise.all(pns9.map(item => { DB.ProjectSpyj.update(item, { where: { id: item.id } }) })); await Promise.all(pns9.map(item => { DB.ProjectSpyj.update(item, { where: { id: item.id } }) }));
// 处理 projectCwpjzb // 处理 projectCwpjzb
let projectCwpjzbs = body.projectCwpjzbs || []; let projectCwpjzbs = body.projectCwpjzbs || [];
let pnids10 = [], pns10 = [], newprojectCwpjzbs = []; let pnids10 = [], pns10 = [], newprojectCwpjzbs = [];
projectCwpjzbs.map(o => { if (!o.id) { if (!_.isEmpty()) { o.projectId = project.id; newprojectCwpjzbs.push(o); } } else { pnids10.push(o.id); pns10.push(o); } return o }); projectCwpjzbs.map(o => { if (!o.id) { if (!_.isEmpty()) { o.projectId = projectInfo.id; newprojectCwpjzbs.push(o); } } else { pnids10.push(o.id); pns10.push(o); } return o });
await DB.ProjectCwpjzb.destroy({ where: { projectId: project.id, id: { [Op.notIn]: pnids10 } } }); await DB.ProjectCwpjzb.destroy({ where: { projectId: projectInfo.id, id: { [Op.notIn]: pnids10 } } });
await DB.ProjectCwpjzb.bulkCreate(newprojectCwpjzbs); await DB.ProjectCwpjzb.bulkCreate(newprojectCwpjzbs);
await Promise.all(pns10.map(item => { DB.ProjectCwpjzb.update(item, { where: { id: item.id } }) })); await Promise.all(pns10.map(item => { DB.ProjectCwpjzb.update(item, { where: { id: item.id } }) }));
// 处理 ProjectLcbjd // 处理 ProjectLcbjd
let projectLcbjds = body.projectLcbjds || []; let projectLcbjds = body.projectLcbjds || [];
let pnids11 = [], pns11 = [], newprojectLcbjds = []; let pnids11 = [], pns11 = [], newprojectLcbjds = [];
projectLcbjds.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = project.id; newprojectLcbjds.push(o); } } else { pnids11.push(o.id); pns11.push(o); } return o }); projectLcbjds.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = projectInfo.id; newprojectLcbjds.push(o); } } else { pnids11.push(o.id); pns11.push(o); } return o });
await DB.ProjectLcbjd.destroy({ where: { projectId: project.id, id: { [Op.notIn]: pnids11 } } }); await DB.ProjectLcbjd.destroy({ where: { projectId: projectInfo.id, id: { [Op.notIn]: pnids11 } } });
await DB.ProjectLcbjd.bulkCreate(newprojectLcbjds); await DB.ProjectLcbjd.bulkCreate(newprojectLcbjds);
await Promise.all(pns11.map(item => { DB.ProjectLcbjd.update(item, { where: { id: item.id } }) })); await Promise.all(pns11.map(item => { DB.ProjectLcbjd.update(item, { where: { id: item.id } }) }));
// 处理 projectTzzjll----- // 处理 projectTzzjll-----
...@@ -230,30 +230,30 @@ async function xiangmulixianggengxin(project, projectLzType) { ...@@ -230,30 +230,30 @@ async function xiangmulixianggengxin(project, projectLzType) {
// 立项资料 // 立项资料
let lxzl = body.lxzl || []; let lxzl = body.lxzl || [];
let needIds = []; let createIds = []; let needIds = []; let createIds = [];
lxzl.map(o => { if (!o.proFieldKey) { createIds.push({ id: o.id, proFieldKey: 'lxzl' }) } else { needIds.push(o.id) }; return { fileId: o.id, projectId: project.id, proFieldKey: 'lxzl' } }); lxzl.map(o => { if (!o.proFieldKey) { createIds.push({ id: o.id, proFieldKey: 'lxzl' }) } else { needIds.push(o.id) }; return { fileId: o.id, projectId: projectInfo.id, proFieldKey: 'lxzl' } });
// 立项批复文件 // 立项批复文件
let lxpfwj = body.lxpfwj || []; let lxpfwj = body.lxpfwj || [];
lxpfwj.map(o => { if (!o.proFieldKey) { createIds.push({ id: o.id, proFieldKey: 'lxpfwj' }) } else { needIds.push(o.id) }; return { fileId: o.id, projectId: project.id, proFieldKey: 'lxpfwj' } }); lxpfwj.map(o => { if (!o.proFieldKey) { createIds.push({ id: o.id, proFieldKey: 'lxpfwj' }) } else { needIds.push(o.id) }; return { fileId: o.id, projectId: projectInfo.id, proFieldKey: 'lxpfwj' } });
// 相关上会材料 // 相关上会材料
let xgshcl = body.xgshcl || []; let xgshcl = body.xgshcl || [];
xgshcl.map(o => { if (!o.proFieldKey) { createIds.push({ id: o.id, proFieldKey: 'xgshcl' }) } else { needIds.push(o.id) }; return { fileId: o.id, projectId: project.id, proFieldKey: 'xgshcl' } }); xgshcl.map(o => { if (!o.proFieldKey) { createIds.push({ id: o.id, proFieldKey: 'xgshcl' }) } else { needIds.push(o.id) }; return { fileId: o.id, projectId: projectInfo.id, proFieldKey: 'xgshcl' } });
// 处理文件 // 处理文件
//1. 删除 //1. 删除
await DB.ProjectFile.destroy({ await DB.ProjectFile.destroy({
where: { where: {
projectId: project.id, projectId: projectInfo.id,
fileId: { [Op.notIn]: needIds } fileId: { [Op.notIn]: needIds }
} }
}); });
//2. 创建 //2. 创建
if (createIds.length) { if (createIds.length) {
let creProFiles = createIds.map(o => { return { projectId: project.id, fileId: o.id, proFieldKey: o.proFieldKey } }); let creProFiles = createIds.map(o => { return { projectId: projectInfo.id, fileId: o.id, proFieldKey: o.proFieldKey } });
await DB.ProjectFile.bulkCreate(creProFiles); await DB.ProjectFile.bulkCreate(creProFiles);
} }
if (projectLzType) { if (projectLzType) {
projectInfo.projectLzType = projectLzType; projectInfo.projectLzType = projectLzType;
} }
const ret = await DB.Project.update(projectInfo, { where: { id: body.id } }); const ret = await DB.Project.update(projectInfo, { where: { id: projectInfo.id } });
return ret; return ret;
} catch (error) { } catch (error) {
throw error; throw error;
...@@ -272,7 +272,7 @@ async function saveProjectPreLixiang(req, res, next) { ...@@ -272,7 +272,7 @@ async function saveProjectPreLixiang(req, res, next) {
let ret = await xiangmulixianggengxin(body); let ret = await xiangmulixianggengxin(body);
return res.sendData(ret); return res.sendData(ret);
} catch (error) { } catch (error) {
next(error);
} }
} }
...@@ -330,7 +330,7 @@ async function startLixiang(req, res, next) { ...@@ -330,7 +330,7 @@ async function startLixiang(req, res, next) {
async function xiangmujuecegengxin(project, projectLzType) { async function xiangmujuecegengxin(body, projectLzType) {
// 1. 处理项目 // 1. 处理项目
let projectInfo = _.omit(body, ['projectJsgms', 'projectGdxxs', 'projectXmtzzes', 'projectBjtjs', let projectInfo = _.omit(body, ['projectJsgms', 'projectGdxxs', 'projectXmtzzes', 'projectBjtjs',
'projectSpyjs', 'projectFxgls', 'projectTzzts', 'projectJczts', 'projectZqrzs', 'projectCwpjzbs', 'projectLcbjds', 'projectSpyjs', 'projectFxgls', 'projectTzzts', 'projectJczts', 'projectZqrzs', 'projectCwpjzbs', 'projectLcbjds',
...@@ -338,71 +338,71 @@ async function xiangmujuecegengxin(project, projectLzType) { ...@@ -338,71 +338,71 @@ async function xiangmujuecegengxin(project, projectLzType) {
// 处理 projectJsgms // 处理 projectJsgms
let projectJsgms = body.projectJsgms || []; let projectJsgms = body.projectJsgms || [];
let pnids1 = [], pns1 = [], newprojectJsgms = []; let pnids1 = [], pns1 = [], newprojectJsgms = [];
projectJsgms.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = project.id; newprojectJsgms.push(o); } } else { pnids1.push(o.id); pns1.push(o); } return o }); projectJsgms.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = projectInfo.id; newprojectJsgms.push(o); } } else { pnids1.push(o.id); pns1.push(o); } return o });
await DB.ProjectJsgm.destroy({ where: { projectId: project.id, id: { [Op.notIn]: pnids1 } } }); await DB.ProjectJsgm.destroy({ where: { projectId: projectInfo.id, id: { [Op.notIn]: pnids1 } } });
await DB.ProjectJsgm.bulkCreate(newprojectJsgms); await DB.ProjectJsgm.bulkCreate(newprojectJsgms);
await Promise.all(pns1.map(item => { DB.ProjectJsgm.update(item, { where: { id: item.id } }) })); await Promise.all(pns1.map(item => { DB.ProjectJsgm.update(item, { where: { id: item.id } }) }));
// 处理 projectGdxxs // 处理 projectGdxxs
let projectGdxxs = body.projectGdxxs || []; let projectGdxxs = body.projectGdxxs || [];
let pnids2 = [], pns2 = [], newprojectGdxxs = []; let pnids2 = [], pns2 = [], newprojectGdxxs = [];
projectGdxxs.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = project.id; newprojectGdxxs.push(o); } } else { pnids2.push(o.id); pns2.push(o); } return o }); projectGdxxs.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = projectInfo.id; newprojectGdxxs.push(o); } } else { pnids2.push(o.id); pns2.push(o); } return o });
await DB.ProjectGdxx.destroy({ where: { projectId: project.id, id: { [Op.notIn]: pnids2 } } }); await DB.ProjectGdxx.destroy({ where: { projectId: projectInfo.id, id: { [Op.notIn]: pnids2 } } });
await DB.ProjectGdxx.bulkCreate(newprojectGdxxs); await DB.ProjectGdxx.bulkCreate(newprojectGdxxs);
await Promise.all(pns2.map(item => { DB.ProjectGdxx.update(item, { where: { id: item.id } }) })); await Promise.all(pns2.map(item => { DB.ProjectGdxx.update(item, { where: { id: item.id } }) }));
// 处理 projectXmtzzes // 处理 projectXmtzzes
let projectXmtzzes = body.projectXmtzzes || []; let projectXmtzzes = body.projectXmtzzes || [];
projectXmtzzes = utils.flattenTree(projectXmtzzes, 'xh', 'parentXh'); projectXmtzzes = utils.flattenTree(projectXmtzzes, 'xh', 'parentXh');
let pnids3 = [], pns3 = [], newprojectXmtzzes = []; let pnids3 = [], pns3 = [], newprojectXmtzzes = [];
projectXmtzzes.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = project.id; newprojectXmtzzes.push(o); } } else { pnids3.push(o.id); pns3.push(o); } return o }); projectXmtzzes.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = projectInfo.id; newprojectXmtzzes.push(o); } } else { pnids3.push(o.id); pns3.push(o); } return o });
await DB.ProjectXmtzze.bulkCreate(newprojectXmtzzes); await DB.ProjectXmtzze.bulkCreate(newprojectXmtzzes);
await Promise.all(pns3.map(item => { DB.ProjectXmtzze.update(item, { where: { id: item.id } }) })); await Promise.all(pns3.map(item => { DB.ProjectXmtzze.update(item, { where: { id: item.id } }) }));
// 处理 projectBjtjs // 处理 projectBjtjs
let projectBjtjs = body.projectBjtjs || []; let projectBjtjs = body.projectBjtjs || [];
let pnids4 = [], pns4 = [], newprojectBjtjs = []; let pnids4 = [], pns4 = [], newprojectBjtjs = [];
projectBjtjs.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = project.id; newprojectBjtjs.push(o); } } else { pnids4.push(o.id); pns4.push(o); } return o }); projectBjtjs.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = projectInfo.id; newprojectBjtjs.push(o); } } else { pnids4.push(o.id); pns4.push(o); } return o });
await DB.ProjectBjtj.destroy({ where: { projectId: project.id, id: { [Op.notIn]: pnids4 } } }); await DB.ProjectBjtj.destroy({ where: { projectId: projectInfo.id, id: { [Op.notIn]: pnids4 } } });
await DB.ProjectBjtj.bulkCreate(newprojectBjtjs); await DB.ProjectBjtj.bulkCreate(newprojectBjtjs);
await Promise.all(pns4.map(item => { DB.ProjectBjtj.update(item, { where: { id: item.id } }) })); await Promise.all(pns4.map(item => { DB.ProjectBjtj.update(item, { where: { id: item.id } }) }));
// 处理 projectFxgl // 处理 projectFxgl
let projectFxgls = body.projectFxgls || []; let projectFxgls = body.projectFxgls || [];
let pnids5 = [], pns5 = [], newprojectFxgls = []; let pnids5 = [], pns5 = [], newprojectFxgls = [];
projectFxgls.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = project.id; newprojectFxgls.push(o); } } else { pnids5.push(o.id); pns5.push(o); } return o }); projectFxgls.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = projectInfo.id; newprojectFxgls.push(o); } } else { pnids5.push(o.id); pns5.push(o); } return o });
await DB.ProjectFxgl.destroy({ where: { projectId: project.id, id: { [Op.notIn]: pnids5 } } }); await DB.ProjectFxgl.destroy({ where: { projectId: projectInfo.id, id: { [Op.notIn]: pnids5 } } });
await DB.ProjectFxgl.bulkCreate(newprojectFxgls); await DB.ProjectFxgl.bulkCreate(newprojectFxgls);
await Promise.all(pns5.map(item => { DB.ProjectFxgl.update(item, { where: { id: item.id } }) })); await Promise.all(pns5.map(item => { DB.ProjectFxgl.update(item, { where: { id: item.id } }) }));
// 处理 ProjectTzzt // 处理 ProjectTzzt
let projectTzzts = body.projectTzzts || []; let projectTzzts = body.projectTzzts || [];
let pnids6 = [], pns6 = [], newprojectTzzts = []; let pnids6 = [], pns6 = [], newprojectTzzts = [];
projectTzzts.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = project.id; newprojectTzzts.push(o); } } else { pnids6.push(o.id); pns6.push(o); } return o }); projectTzzts.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = projectInfo.id; newprojectTzzts.push(o); } } else { pnids6.push(o.id); pns6.push(o); } return o });
await DB.ProjectTzzt.destroy({ where: { projectId: project.id, id: { [Op.notIn]: pnids6 } } }); await DB.ProjectTzzt.destroy({ where: { projectId: projectInfo.id, id: { [Op.notIn]: pnids6 } } });
await DB.ProjectTzzt.bulkCreate(newprojectTzzts); await DB.ProjectTzzt.bulkCreate(newprojectTzzts);
await Promise.all(pns6.map(item => { DB.ProjectTzzt.update(item, { where: { id: item.id } }) })); await Promise.all(pns6.map(item => { DB.ProjectTzzt.update(item, { where: { id: item.id } }) }));
// 处理 ProjectJczt // 处理 ProjectJczt
let projectJczts = body.projectJczts || []; let projectJczts = body.projectJczts || [];
let pnids7 = [], pns7 = [], newprojectJczts = []; let pnids7 = [], pns7 = [], newprojectJczts = [];
projectJczts.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = project.id; newprojectJczts.push(o); } } else { pnids7.push(o.id); pns7.push(o); } return o }); projectJczts.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = projectInfo.id; newprojectJczts.push(o); } } else { pnids7.push(o.id); pns7.push(o); } return o });
await DB.ProjectJczt.destroy({ where: { projectId: project.id, id: { [Op.notIn]: pnids7 } } }); await DB.ProjectJczt.destroy({ where: { projectId: projectInfo.id, id: { [Op.notIn]: pnids7 } } });
await DB.ProjectJczt.bulkCreate(newprojectJczts); await DB.ProjectJczt.bulkCreate(newprojectJczts);
await Promise.all(pns7.map(item => { DB.ProjectJczt.update(item, { where: { id: item.id } }) })); await Promise.all(pns7.map(item => { DB.ProjectJczt.update(item, { where: { id: item.id } }) }));
let projectSpyjs = body.projectSpyjs || []; let projectSpyjs = body.projectSpyjs || [];
let pnids9 = [], pns9 = [], newprojectSpyjs = []; let pnids9 = [], pns9 = [], newprojectSpyjs = [];
projectSpyjs.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = project.id; newprojectSpyjs.push(o); } } else { pnids9.push(o.id); pns9.push(o); } return o }); projectSpyjs.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = projectInfo.id; newprojectSpyjs.push(o); } } else { pnids9.push(o.id); pns9.push(o); } return o });
await DB.ProjectSpyj.destroy({ where: { projectId: project.id, id: { [Op.notIn]: pnids9 } } }); await DB.ProjectSpyj.destroy({ where: { projectId: projectInfo.id, id: { [Op.notIn]: pnids9 } } });
await DB.ProjectSpyj.bulkCreate(newprojectSpyjs); await DB.ProjectSpyj.bulkCreate(newprojectSpyjs);
await Promise.all(pns9.map(item => { DB.ProjectSpyj.update(item, { where: { id: item.id } }) })); await Promise.all(pns9.map(item => { DB.ProjectSpyj.update(item, { where: { id: item.id } }) }));
// 处理 projectCwpjzb // 处理 projectCwpjzb
let projectCwpjzbs = body.projectCwpjzbs || []; let projectCwpjzbs = body.projectCwpjzbs || [];
let pnids10 = [], pns10 = [], newprojectCwpjzbs = []; let pnids10 = [], pns10 = [], newprojectCwpjzbs = [];
projectCwpjzbs.map(o => { if (!o.id) { if (!_.isEmpty()) { o.projectId = project.id; newprojectCwpjzbs.push(o); } } else { pnids10.push(o.id); pns10.push(o); } return o }); projectCwpjzbs.map(o => { if (!o.id) { if (!_.isEmpty()) { o.projectId = projectInfo.id; newprojectCwpjzbs.push(o); } } else { pnids10.push(o.id); pns10.push(o); } return o });
await DB.ProjectCwpjzb.destroy({ where: { projectId: project.id, id: { [Op.notIn]: pnids10 } } }); await DB.ProjectCwpjzb.destroy({ where: { projectId: projectInfo.id, id: { [Op.notIn]: pnids10 } } });
await DB.ProjectCwpjzb.bulkCreate(newprojectCwpjzbs); await DB.ProjectCwpjzb.bulkCreate(newprojectCwpjzbs);
await Promise.all(pns10.map(item => { DB.ProjectCwpjzb.update(item, { where: { id: item.id } }) })); await Promise.all(pns10.map(item => { DB.ProjectCwpjzb.update(item, { where: { id: item.id } }) }));
// 处理 ProjectLcbjd // 处理 ProjectLcbjd
let projectLcbjds = body.projectLcbjds || []; let projectLcbjds = body.projectLcbjds || [];
let pnids11 = [], pns11 = [], newprojectLcbjds = []; let pnids11 = [], pns11 = [], newprojectLcbjds = [];
projectLcbjds.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = project.id; newprojectLcbjds.push(o); } } else { pnids11.push(o.id); pns11.push(o); } return o }); projectLcbjds.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = projectInfo.id; newprojectLcbjds.push(o); } } else { pnids11.push(o.id); pns11.push(o); } return o });
await DB.ProjectLcbjd.destroy({ where: { projectId: project.id, id: { [Op.notIn]: pnids11 } } }); await DB.ProjectLcbjd.destroy({ where: { projectId: projectInfo.id, id: { [Op.notIn]: pnids11 } } });
await DB.ProjectLcbjd.bulkCreate(newprojectLcbjds); await DB.ProjectLcbjd.bulkCreate(newprojectLcbjds);
await Promise.all(pns11.map(item => { DB.ProjectLcbjd.update(item, { where: { id: item.id } }) })); await Promise.all(pns11.map(item => { DB.ProjectLcbjd.update(item, { where: { id: item.id } }) }));
...@@ -411,39 +411,39 @@ async function xiangmujuecegengxin(project, projectLzType) { ...@@ -411,39 +411,39 @@ async function xiangmujuecegengxin(project, projectLzType) {
// 立项资料 // 立项资料
let lxzl = body.lxzl || []; let lxzl = body.lxzl || [];
let needIds = []; let createIds = []; let needIds = []; let createIds = [];
lxzl.map(o => { if (!o.proFieldKey) { createIds.push({ id: o.id, proFieldKey: 'lxzl' }) } else { needIds.push(o.id) }; return { fileId: o.id, projectId: project.id, proFieldKey: 'lxzl' } }); lxzl.map(o => { if (!o.proFieldKey) { createIds.push({ id: o.id, proFieldKey: 'lxzl' }) } else { needIds.push(o.id) }; return { fileId: o.id, projectId: projectInfo.id, proFieldKey: 'lxzl' } });
// 立项批复文件 // 立项批复文件
let lxpfwj = body.lxpfwj || []; let lxpfwj = body.lxpfwj || [];
lxpfwj.map(o => { if (!o.proFieldKey) { createIds.push({ id: o.id, proFieldKey: 'lxpfwj' }) } else { needIds.push(o.id) }; return { fileId: o.id, projectId: project.id, proFieldKey: 'lxpfwj' } }); lxpfwj.map(o => { if (!o.proFieldKey) { createIds.push({ id: o.id, proFieldKey: 'lxpfwj' }) } else { needIds.push(o.id) }; return { fileId: o.id, projectId: projectInfo.id, proFieldKey: 'lxpfwj' } });
// 相关上会材料 // 相关上会材料
let xgshcl = body.xgshcl || []; let xgshcl = body.xgshcl || [];
xgshcl.map(o => { if (!o.proFieldKey) { createIds.push({ id: o.id, proFieldKey: 'xgshcl' }) } else { needIds.push(o.id) }; return { fileId: o.id, projectId: project.id, proFieldKey: 'xgshcl' } }); xgshcl.map(o => { if (!o.proFieldKey) { createIds.push({ id: o.id, proFieldKey: 'xgshcl' }) } else { needIds.push(o.id) }; return { fileId: o.id, projectId: projectInfo.id, proFieldKey: 'xgshcl' } });
// 可研材料 // 可研材料
let kycl = body.kycl || []; let kycl = body.kycl || [];
kycl.map(o => { if (!o.proFieldKey) { createIds.push({ id: o.id, proFieldKey: 'kycl' }) } else { needIds.push(o.id) }; return { fileId: o.id, projectId: project.id, proFieldKey: 'kycl' } }); kycl.map(o => { if (!o.proFieldKey) { createIds.push({ id: o.id, proFieldKey: 'kycl' }) } else { needIds.push(o.id) }; return { fileId: o.id, projectId: projectInfo.id, proFieldKey: 'kycl' } });
// 经济指标初步测算材料 // 经济指标初步测算材料
let jjzbcbcscl = body.jjzbcbcscl || []; let jjzbcbcscl = body.jjzbcbcscl || [];
jjzbcbcscl.map(o => { if (!o.proFieldKey) { createIds.push({ id: o.id, proFieldKey: 'jjzbcbcscl' }) } else { needIds.push(o.id) }; return { fileId: o.id, projectId: project.id, proFieldKey: 'jjzbcbcscl' } }); jjzbcbcscl.map(o => { if (!o.proFieldKey) { createIds.push({ id: o.id, proFieldKey: 'jjzbcbcscl' }) } else { needIds.push(o.id) }; return { fileId: o.id, projectId: projectInfo.id, proFieldKey: 'jjzbcbcscl' } });
// 补充相关支撑材料 // 补充相关支撑材料
let bcxgzccl = body.bcxgzccl || []; let bcxgzccl = body.bcxgzccl || [];
bcxgzccl.map(o => { if (!o.proFieldKey) { createIds.push({ id: o.id, proFieldKey: 'bcxgzccl' }) } else { needIds.push(o.id) }; return { fileId: o.id, projectId: project.id, proFieldKey: 'bcxgzccl' } }); bcxgzccl.map(o => { if (!o.proFieldKey) { createIds.push({ id: o.id, proFieldKey: 'bcxgzccl' }) } else { needIds.push(o.id) }; return { fileId: o.id, projectId: projectInfo.id, proFieldKey: 'bcxgzccl' } });
// 其他相关支撑材料 // 其他相关支撑材料
let qtxgzccl = body.qtxgzccl || []; let qtxgzccl = body.qtxgzccl || [];
qtxgzccl.map(o => { if (!o.proFieldKey) { createIds.push({ id: o.id, proFieldKey: 'qtxgzccl' }) } else { needIds.push(o.id) }; return { fileId: o.id, projectId: project.id, proFieldKey: 'qtxgzccl' } }); qtxgzccl.map(o => { if (!o.proFieldKey) { createIds.push({ id: o.id, proFieldKey: 'qtxgzccl' }) } else { needIds.push(o.id) }; return { fileId: o.id, projectId: projectInfo.id, proFieldKey: 'qtxgzccl' } });
// 上会议案 // 上会议案
let shya = body.shya || []; let shya = body.shya || [];
shya.map(o => { if (!o.proFieldKey) { createIds.push({ id: o.id, proFieldKey: 'shya' }) } else { needIds.push(o.id) }; return { fileId: o.id, projectId: project.id, proFieldKey: 'shya' } }); shya.map(o => { if (!o.proFieldKey) { createIds.push({ id: o.id, proFieldKey: 'shya' }) } else { needIds.push(o.id) }; return { fileId: o.id, projectId: projectInfo.id, proFieldKey: 'shya' } });
// 处理文件 // 处理文件
//1. 删除 //1. 删除
await DB.ProjectFile.destroy({ await DB.ProjectFile.destroy({
where: { where: {
projectId: project.id, projectId: projectInfo.id,
fileId: { [Op.notIn]: needIds } fileId: { [Op.notIn]: needIds }
} }
}); });
//2. 创建 //2. 创建
if (createIds.length) { if (createIds.length) {
let creProFiles = createIds.map(o => { return { projectId: project.id, fileId: o.id, proFieldKey: o.proFieldKey } }); let creProFiles = createIds.map(o => { return { projectId: projectInfo.id, fileId: o.id, proFieldKey: o.proFieldKey } });
await DB.ProjectFile.bulkCreate(creProFiles); await DB.ProjectFile.bulkCreate(creProFiles);
} }
...@@ -451,7 +451,7 @@ async function xiangmujuecegengxin(project, projectLzType) { ...@@ -451,7 +451,7 @@ async function xiangmujuecegengxin(project, projectLzType) {
projectInfo.projectLzType = projectLzType; projectInfo.projectLzType = projectLzType;
} }
const ret = await DB.Project.update(projectInfo, { where: { id: body.id } }); const ret = await DB.Project.update(projectInfo, { where: { id: projectInfo.id } });
return ret; return ret;
} }
...@@ -929,8 +929,8 @@ async function getOwnProjects(req, res, next) { ...@@ -929,8 +929,8 @@ async function getOwnProjects(req, res, next) {
search.raw = true; search.raw = true;
console.log(JSON.stringify(search), "-==") console.log(JSON.stringify(search), "-==")
let ret = await DB.Project.findAndCountAll(search); let ret = await DB.Project.findAndCountAll(search);
let lastRet = await projectModule.handleProjectData(ret, search.attributes); // let lastRet = await projectModule.handleProjectData(ret, search.attributes);
return res.sendData(lastRet); return res.sendData(ret);
} catch (error) { } catch (error) {
next(error); next(error);
} }
......
controller/roleController.js
View file @ 2c8bedbc
...@@ -41,7 +41,7 @@ async function updateRole(req, res, next) { ...@@ -41,7 +41,7 @@ async function updateRole(req, res, next) {
return res.sendError(errorMessage.resourceNotFound); return res.sendError(errorMessage.resourceNotFound);
} }
if(body.menus) { if(body.menus) {
body.menus = utils.disTree(body.menus); // body.menus = utils.disTree(body.menus);
await userModule.setRoleMenu(role.id, body.menus, role.menus || []); await userModule.setRoleMenu(role.id, body.menus, role.menus || []);
delete body.menus; delete body.menus;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment