1

controller/projectController.js

@@ -179,35 +179,35 @@ async function xiangmulixianggengxin(body, projectLzType) {
         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: projectInfo.id, id: { [Op.notIn]: pnids1 } } });
         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 => { return DB.ProjectJsgm.update(item, { where: { id: item.id } }) }));
         // 处理 projectGdxxs
         let projectGdxxs = body.projectGdxxs || [];
         let pnids2 = [], pns2 = [], newprojectGdxxs = [];
         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: projectInfo.id, id: { [Op.notIn]: pnids2 } } });
         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 => { return DB.ProjectGdxx.update(item, { where: { id: item.id } }) }));
         // 处理 projectXmtzzes
         let projectXmtzzes = body.projectXmtzzes || [];
         projectXmtzzes = utils.flattenTree(projectXmtzzes, 'xh', 'parentXh');
         let pnids3 = [], pns3 = [], newprojectXmtzzes = [];
         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 Promise.all(pns3.map(item => { DB.ProjectXmtzze.update(item, { where: { id: item.id } }) }));
+        await Promise.all(pns3.map(item => { return DB.ProjectXmtzze.update(item, { where: { id: item.id } }) }));
         // 处理 projectBjtjs
         let projectBjtjs = body.projectBjtjs || [];
         let pnids4 = [], pns4 = [], newprojectBjtjs = [];
         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: projectInfo.id, id: { [Op.notIn]: pnids4 } } });
         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 => { return DB.ProjectBjtj.update(item, { where: { id: item.id } }) }));
         // 处理 projectSpyjs
         let projectSpyjs = body.projectSpyjs || [];
         let pnids9 = [], pns9 = [], newprojectSpyjs = [];
         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: projectInfo.id, id: { [Op.notIn]: pnids9 } } });
         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 => { return DB.ProjectSpyj.update(item, { where: { id: item.id } }) }));
 
         // 处理 projectCwpjzb
         let projectCwpjzbs = body.projectCwpjzbs || [];
@@ -215,14 +215,14 @@ async function xiangmulixianggengxin(body, projectLzType) {
         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.bulkCreate(newprojectCwpjzbs);
-        await Promise.all(pns10.map(item => { DB.ProjectCwpjzb.update(item, { where: { id: item.id } }) }));
+        await Promise.all(pns10.map(item => { return DB.ProjectCwpjzb.update(item, { where: { id: item.id } }) }));
         // 处理 ProjectLcbjd
         let projectLcbjds = body.projectLcbjds || [];
         let pnids11 = [], pns11 = [], newprojectLcbjds = [];
         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: projectInfo.id, id: { [Op.notIn]: pnids11 } } });
         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 => { return DB.ProjectLcbjd.update(item, { where: { id: item.id } }) }));
         // 处理 projectTzzjll-----
 
 
@@ -613,14 +613,14 @@ async function xiangmujuecegengxin(body, projectLzType) {
     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: projectInfo.id, id: { [Op.notIn]: pnids1 } } });
     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 => { return DB.ProjectJsgm.update(item, { where: { id: item.id } }) }));
     // 处理 projectGdxxs
     let projectGdxxs = body.projectGdxxs || [];
     let pnids2 = [], pns2 = [], newprojectGdxxs = [];
     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: projectInfo.id, id: { [Op.notIn]: pnids2 } } });
     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 => { return DB.ProjectGdxx.update(item, { where: { id: item.id } }) }));
     // 处理 projectXmtzzes
     let projectXmtzzes = body.projectXmtzzes || [];
     projectXmtzzes = utils.flattenTree(projectXmtzzes, 'key', 'parentKey');
@@ -628,42 +628,43 @@ async function xiangmujuecegengxin(body, projectLzType) {
     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.destroy({ where: { projectId: projectInfo.id, id: { [Op.notIn]: pnids3 } } });
     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 => { return DB.ProjectXmtzze.update(item, { where: { id: item.id } }) }));
     // 处理 projectBjtjs
     let projectBjtjs = body.projectBjtjs || [];
     let pnids4 = [], pns4 = [], newprojectBjtjs = [];
     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: projectInfo.id, id: { [Op.notIn]: pnids4 } } });
     await DB.ProjectBjtj.bulkCreate(newprojectBjtjs);
-    await Promise.all(pns4.map(item => { DB.ProjectBjtj.update(item, { where: { id: item.id } }) }));
+    console.log(newprojectBjtjs, pnids4, pns4);
+    await Promise.all(pns4.map(item => { return DB.ProjectBjtj.update(item, { where: { id: item.id } }) })).catch(err => {console.log(err)});
     // 处理 projectFxgl
     let projectFxgls = body.projectFxgls || [];
     let pnids5 = [], pns5 = [], newprojectFxgls = [];
     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: projectInfo.id, id: { [Op.notIn]: pnids5 } } });
     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 => { return DB.ProjectFxgl.update(item, { where: { id: item.id } }) }));
     // 处理 ProjectTzzt
     let projectTzzts = body.projectTzzts || [];
     let pnids6 = [], pns6 = [], newprojectTzzts = [];
     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: projectInfo.id, id: { [Op.notIn]: pnids6 } } });
     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 => { return DB.ProjectTzzt.update(item, { where: { id: item.id } }) }));
     // 处理 ProjectJczt
     let projectJczts = body.projectJczts || [];
     let pnids7 = [], pns7 = [], newprojectJczts = [];
     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: projectInfo.id, id: { [Op.notIn]: pnids7 } } });
     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 => { return DB.ProjectJczt.update(item, { where: { id: item.id } }) }));
     // 处理审批意见ProjectSpyj
     let projectSpyjs = body.projectSpyjs || [];
     let pnids9 = [], pns9 = [], newprojectSpyjs = [];
     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: projectInfo.id, id: { [Op.notIn]: pnids9 } } });
     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 => { return DB.ProjectSpyj.update(item, { where: { id: item.id } }) }));
 
     // 处理 projectCwpjzb
     let projectCwpjzbs = body.projectCwpjzbs || [];
@@ -671,28 +672,28 @@ async function xiangmujuecegengxin(body, projectLzType) {
     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.bulkCreate(newprojectCwpjzbs);
-    await Promise.all(pns10.map(item => { DB.ProjectCwpjzb.update(item, { where: { id: item.id } }) }));
+    await Promise.all(pns10.map(item => { return DB.ProjectCwpjzb.update(item, { where: { id: item.id } }) }));
     // 处理 ProjectLcbjd
     let projectLcbjds = body.projectLcbjds || [];
     let pnids11 = [], pns11 = [], newprojectLcbjds = [];
     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: projectInfo.id, id: { [Op.notIn]: pnids11 } } });
     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 => { return DB.ProjectLcbjd.update(item, { where: { id: item.id } }) }));
     // 处理 ProjectZqrz
     let projectZqrzs = body.projectZqrzs || [];
     let pnids8 = [], pns8 = [], newprojectZqrzs = [];
     projectZqrzs.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = projectInfo.id; newprojectZqrzs.push(o); } } else { pnids8.push(o.id); pns8.push(o); } return o });
     await DB.ProjectZqrz.destroy({ where: { projectId: projectInfo.id, id: { [Op.notIn]: pnids8 } } });
     await DB.ProjectZqrz.bulkCreate(newprojectZqrzs);
-    await Promise.all(pns8.map(item => { DB.ProjectZqrz.update(item, { where: { id: item.id } }) }));
+    await Promise.all(pns8.map(item => { return DB.ProjectZqrz.update(item, { where: { id: item.id } }) }));
     // 处理决策审批意见 ProjectSpyjjc
     let projectSpyjjcs = body.projectSpyjjcs || [];
     let pnids12 = [], pns12 = [], newprojectSpyjjcs = [];
     projectSpyjjcs.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = projectInfo.id; newprojectSpyjjcs.push(o); } } else { pnids12.push(o.id); pns12.push(o); } return o });
     await DB.ProjectSpyjjc.destroy({ where: { projectId: projectInfo.id, id: { [Op.notIn]: pnids12 } } });
     await DB.ProjectSpyjjc.bulkCreate(newprojectSpyjjcs);
-    await Promise.all(pns12.map(item => { DB.ProjectSpyjjc.update(item, { where: { id: item.id } }) }));
+    await Promise.all(pns12.map(item => { return DB.ProjectSpyjjc.update(item, { where: { id: item.id } }) }));
 
     // 立项资料
     let lxzl = _.compact(body.lxzl || []);

middleware/request.js

@@ -30,7 +30,7 @@ module.exports = async (req, res, next) => {
     }
 
     /* --------------3. 记录所有进来的日志,是否记录响应的值有待 */
-    if(!['/resource/listResourceAll'].includes(req.path)) {
+    if(!['/resource/listResourceAll', '/project/saveJuece'].includes(req.path)) {
         requestLogModule.createRequestLog({
             url: req.baseUrl + req.path,
             params: JSON.stringify({

server.js

@@ -34,8 +34,8 @@ app.all('*', function (req, res, next) {
 
 
 app.use(compress());
-app.use(express.json());
-app.use(express.urlencoded({ extended: false }));
+app.use(express.json({limit: '500mb'}));
+app.use(express.urlencoded({ extended: false, limit: '500mb' }));
 app.use(express.static('public')); 
 app.use(logger('dev'));
 
@@ -72,6 +72,6 @@ app.use(function (err, req, res, next) {
 
 const server = require('http').createServer(app);
 
-server.listen(process.env.PORT || 3000, function () {
+server.listen(process.env.PORT || 3001, function () {
     console.log(`******  server is listening   : ${process.env.PORT} || 3000`);
 });