update

controller/projectController.js

@@ -378,13 +378,15 @@ async function approvalLixiangByDepartHeader(req, res, next) {
         }
         let ret;
         if (body.approvalResult) {
-            //部门长核准通过，更新项目信息和状态--立项初审
-            ret = await xiangmulixianggengxin(body, "3");
+            
             // 给投管部经办人发消息
             let approvers = await userModule.getTouGuanJbrProjectApprover(req.user.id);
             if (!(approvers && approvers.length > 0)) {
                 return res.sendError({ code: '60001', msg: '项目已保存，请联系管理员添加【投管部经办人】角色人员' });
             }
+            //部门长核准通过，更新项目信息和状态--立项初审
+            ret = await xiangmulixianggengxin(body, "3");
+
             await DB.Message.create({
                 projectId: body.id,
                 creator: req.user.id,
@@ -639,14 +641,14 @@ async function xiangmujuecegengxin(body, projectLzType) {
     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(pns11.map(item => { DB.ProjectZqrz.update(item, { where: { id: item.id } }) }));
+    await Promise.all(pns8.map(item => { DB.ProjectZqrz.update(item, { where: { id: item.id } }) }));
     // 处理决策审批意见 ProjectSpyjjc
     let projectSpyjjcs = body.projectSpyjjcs || [];
-    let pnids12 = [], newprojectSpyjjcs = [];
-    projectSpyjjcs.map(o => { if (!o.id) { if (!_.isEmpty(o)) { o.projectId = projectInfo.id; newprojectSpyjjcs.push(o); } } else { pnids12.push(o.id); pnids12.push(o); } return o });
+    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(pns9.map(item => { DB.ProjectSpyjjc.update(item, { where: { id: item.id } }) }));
+    await Promise.all(pns12.map(item => { DB.ProjectSpyjjc.update(item, { where: { id: item.id } }) }));
 
     // 立项资料
     let lxzl = _.compact(body.lxzl || []);

router/projectRouter.js

@@ -21,8 +21,8 @@ router.post('/saveProjectPreLixiang', projectController.saveProjectPreLixiang);
 
 router.post('/startLixiang', projectController.startLixiang);//发起立项审批----TODO:待完成与能建对接
 
-router.post('/approvalLixiang', projectController.approvalLixiangByDepartHeader); //部门长核准立项审批
-router.post('/approvalLixiang', projectController.approvalLixiangByTouGuanJbr);//投管部经办人审批立项审批
+router.post('/approvalLixiangByDepartHeader', projectController.approvalLixiangByDepartHeader); //部门长核准立项审批
+router.post('/approvalLixiangByTouGuanJbr', projectController.approvalLixiangByTouGuanJbr);//投管部经办人审批立项审批
 router.post('/approvalLixiang', projectController.approvalLixiang);//立项审批---投管部正副职审批
 
 // -----------------------接收能建立项结果信息，更新立项批复信息等字段------------------------------------------