明树Git Lab

Commit 7bcae37c authored by zfp1's avatar zfp1

update

parent 2bdb8422
Pipeline #104362 passed with stage
in 3 seconds
...@@ -212,7 +212,7 @@ async function xiangmulixianggengxin(body, projectLzType) { ...@@ -212,7 +212,7 @@ async function xiangmulixianggengxin(body, projectLzType) {
// 处理 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 = projectInfo.id; newprojectCwpjzbs.push(o); } } else { pnids10.push(o.id); pns10.push(o); } return o }); projectCwpjzbs.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = projectInfo.id; newprojectCwpjzbs.push(o); } } else { pnids10.push(o.id); pns10.push(o); } return o });
await DB.ProjectCwpjzb.destroy({ where: { projectId: projectInfo.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 } }) }));
...@@ -395,8 +395,9 @@ async function xiangmujuecegengxin(body, projectLzType) { ...@@ -395,8 +395,9 @@ async function xiangmujuecegengxin(body, projectLzType) {
// 处理 projectCwpjzb // 处理 projectCwpjzb
let projectCwpjzbs = body.projectCwpjzbs || []; let projectCwpjzbs = body.projectCwpjzbs || [];
console.log(body.projectCwpjzbs, "====================================================================")
let pnids10 = [], pns10 = [], newprojectCwpjzbs = []; let pnids10 = [], pns10 = [], newprojectCwpjzbs = [];
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 }); projectCwpjzbs.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = projectInfo.id; newprojectCwpjzbs.push(o); } } else { pnids10.push(o.id); pns10.push(o); } return o });
await DB.ProjectCwpjzb.destroy({ where: { projectId: projectInfo.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 } }) }));
...@@ -610,7 +611,7 @@ async function updateProject(req, res, next) { ...@@ -610,7 +611,7 @@ async function updateProject(req, res, next) {
// // 处理 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)) { o.projectId = project.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: project.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 } }) }));
...@@ -884,6 +885,7 @@ async function listProject(req, res, next) { ...@@ -884,6 +885,7 @@ async function listProject(req, res, next) {
where.projectLzType = { [Op.in]: projectLzTypes } where.projectLzType = { [Op.in]: projectLzTypes }
} }
console.log(projectLzTypes) console.log(projectLzTypes)
search.order = [['createdAt', 'DESC']];
search.where = where; search.where = where;
search.limit = limit; search.limit = limit;
search.offset = offset; search.offset = offset;
......
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