update

controller/projectController.js

@@ -289,8 +289,11 @@ async function startLixiang(req, res, next) {
          * 此处需要判断当前项目是从哪一个节点回来的，依次往下
          * 1. 初审退回
          * 2. 核准退回
-         * 3. 首次提交
+         * 3. 终审核退回
+         * 4. 首次提交
+         * 
          */
+        req.body.projectLxTjUser = req.user.id;//立项提交人
         if (req.body.projectLxjbrUser) {
             //更新信息和状态
             req.body.daibanUsers = [req.body.projectLxjbrUser];
@@ -333,15 +336,47 @@ async function startLixiang(req, res, next) {
                 projectCode: req.body.projectCode,
             });
             return res.sendData(ret);
-        } else {
+        } else if(req.body.projectLxzsUser) {
+            // 如果没有走初审、核准但是又有终审用户，则是终审退回
+            req.body.daibanUsers = [req.body.projectLxzsUser];
+
+            let ret = await xiangmulixianggengxin(req.body, "4"); //状态 2 -- 立项核准中
+            
+            // 记录流程节点操作
+            await DB.FlowRecord.create({
+                userId: req.user.id,
+                actionName: '发起项目立项终审',
+                projectId: req.body.id,
+                projectName: req.body.projectName,
+                projectCode: req.body.projectCode,
+            });
+            await DB.Message.create({
+                projectId: req.body.id,
+                creator: req.user.id,
+                receivers: approvers.map(o => o.id),
+                type: 2,
+                title: `项目【${req.body.projectName}】已发起立项终审，请尽快处理！`,
+                content: `项目【${req.body.projectName}】已发起立项终审，请尽快处理！`
+            });
+
+            return res.sendData(ret);
+        }
+        else {
             // 项目公司所属单位员工发起，发送消息给项目单位部门长核准
-            let approvers = await userModule.getCompanyProjectApprover(req.user.id);
-            if (!(approvers && approvers.length > 0)) {
+            let rett = await userModule.getCompanyProjectApprover(req.user.id);
+            if (!(_.isEmpty(rett))) {
                 return res.sendError({ code: '60001', message: '项目已保存，请联系管理员为本公司添加【项目立项核准】角色人员' });
             }
             //更新信息和状态
             req.body.daibanUsers = approvers.map(o => o.id);
-            let ret = await xiangmulixianggengxin(req.body, "2"); //状态 2 -- 立项核准中
+            let ret;
+            if(rett.type == 1) {
+                //投管
+                ret = await xiangmulixianggengxin(req.body, "4"); //状态 2 -- 立项核准中
+            } else {
+                //部门长
+                ret = await xiangmulixianggengxin(req.body, "2"); //状态 2 -- 立项核准中
+            }
             // 记录流程节点操作
             await DB.FlowRecord.create({
                 userId: req.user.id,
@@ -411,7 +446,7 @@ async function approvalLixiangByDepartHeader(req, res, next) {
         }
         else {
             //部门长核准不通过，更新项目信息和状态--退回到草稿
-            req.body.daibanUsers = [body.projectCreator];
+            req.body.daibanUsers = [body.projectLxTjUser];
             ret = await xiangmulixianggengxin(body, "1");
             //记录操作
             await DB.FlowRecord.create({
@@ -425,7 +460,7 @@ async function approvalLixiangByDepartHeader(req, res, next) {
             await DB.Message.create({
                 projectId: body.id,
                 creator: req.user.id,
-                receivers: [body.projectCreator],
+                receivers: [body.projectLxTjUser],
                 type: 6,
                 title: `项目【${body.projectName}】未通过部门长核准，请检查后重新提交！`,
                 content: req.body.approvalMessage || `项目【${body.projectName}】未通过部门长核准，请检查后重新提交！`
@@ -479,13 +514,13 @@ async function approvalLixiangByTouGuanJbr(req, res, next) {
         }
         else {
             //投管部经办人审批不通过，更新项目信息和状态--直接回到项目提交人
-            req.body.daibanUsers = [body.projectCreator];
+            req.body.daibanUsers = [body.projectLxTjUser];
             ret = await xiangmulixianggengxin(body, "1");
             // 给项目提交人发消息
             await DB.Message.create({
                 projectId: body.id,
                 creator: req.user.id,
-                receivers: [body.projectCreator],
+                receivers: [body.projectLxTjUser],
                 type: 8,    //  初审不通过消息
                 title: `项目【${body.projectName}】未通过投管部经办人审批，请检查后重新提交！`,
                 content: req.body.approvalMessage || `项目【${body.projectName}】未通过投管部经办人审批，请检查后重新提交！`
@@ -1501,6 +1536,11 @@ async function approvalZaiJuece(req, res, next) {
     }
 }
 
+async function getCompanyProjectApprover(req, res, next) {
+    let ret = await userModule.getCompanyProjectApprover(46);
+    return res.sendData(ret);
+}
+
 module.exports = {
     getProjectFields,
     createProject,
@@ -1526,4 +1566,5 @@ module.exports = {
     saveZaiJuece,
     startZaiJuece,
     approvalZaiJuece,
+    getCompanyProjectApprover,
 }
\ No newline at end of file

db/model/jt/project.js

@@ -36,6 +36,10 @@ const Project = sequelize.define('Project', {
         defaultValue: 0,
         comment1: "0 正常 1 删除",
     },
+    projectLxTjUser: {
+        type: DataTypes.INTEGER,
+        comment: "立项提交人",
+    },
     projectHzUser: {
         type: DataTypes.INTEGER,
         comment: "项目核准人ID",
@@ -330,7 +334,7 @@ const Project = sequelize.define('Project', {
 
 
     //再决策
-    jcspdw: {type: DataTypes.STRING, allowNull: true, comment: "决策审批单位", _mark: 'juece',zjType: 'danxuan',},
+    jcspdw: { type: DataTypes.STRING, allowNull: true, comment: "决策审批单位", _mark: 'juece', zjType: 'danxuan', },
     yykssj: { type: DataTypes.DATE, allowNull: true, comment: "运营开始时间", _mark: "juece" },
     yyjssj: { type: DataTypes.DATE, allowNull: true, comment: "运营结束时间", _mark: "juece" },
     tzwcqk: { type: DataTypes.TEXT, allowNull: true, comment: "投资完成情况", _mark: "juece" },

module/userModule.js

@@ -105,7 +105,7 @@ async function setUserPosition(userId, positionIds, positions) {
  * @param {*} rolemenus 角色已有的菜单
  */
 async function setRoleMenu(roleId, menuIds, rolemenus) {
-    menuIds = menuIds.map(o => {return o && o.id || o});
+    menuIds = menuIds.map(o => { return o && o.id || o });
     let needAddIds = [], needDelIds = [], dbMenuIds = [];
     for (let index = 0; index < rolemenus.length; index++) {
         const element = rolemenus[index];
@@ -133,43 +133,86 @@ async function setRoleMenu(roleId, menuIds, rolemenus) {
 
 async function getCompanyProjectApprover(userId, roleCode) {
     roleCode = roleCode || "xmssdwbmz"; //暂时
+    let users = [];
     // 获取投管部正副职tgbzfz的用户列表
-    let role = await DB.Role.findOne({where: {key: roleCode}, raw: true});
-    if(!(role && role.id)) {
-        return [];
-    }
-    let userIds = await DB.UserRole.findAll({where: {roleId: role.id}, raw: true});
-    userIds = (userIds || []).map(o => {return o.userId});
+    let userDepart = await DB.UserDepart.findOne({ where: { userId }, raw: true });
+    if (!(userDepart && userDepart.departId)) {
+        return {};
+    }
+    let departId = userDepart.departId;
+    let curentDepart = await DB.Depart.findOne({ where: { id: departId }, raw: true });
+    console.log("curentDepart", curentDepart) //部门信息
+    if (!(curentDepart && curentDepart.id)) {
+        return {};
+    }
+    let parentIds = curentDepart.parentIds ? curentDepart.parentIds.split(",") : [];
+    console.log("parentIds", parentIds) //部门父级信息
+    if (departId == 41 || parentIds.includes(41) || parentIds.includes('41')) { //写死 投管部
+        users = await getTouGuanZfzProjectApprover(userId);
+        return {users, type: 1};
+    } else if (parentIds.includes(86) || parentIds.includes('86')) { //项目公司
+        let pidStr = "";
+        if (curentDepart.parentId == 86) { //项目公司
+            pidStr = curentDepart.parentIds + curentDepart.id;// 为了查询currentDepart.id所有部门
+        } else {
+            // 项目公司下属部门
+            const index = parentIds.indexOf(86);
 
-    let users =  await DB.User.findAll({ where: { id: {[Op.in]: userIds} } }); 
-    return users;
+            const result = index !== -1
+                ? parentIds.slice(0, index + 1)
+                : parentIds;
+            pidStr = result.join(",");
+        }
+        console.log("pidStr", pidStr) //项目公司部门id字符串
+        let departs = await DB.Depart.findAll({ 
+            where: { parentIds: { [Op.like]: `%${pidStr}%` } 
+        }, raw: true });
+        departs.push(curentDepart); //加上当前部门
+        console.log("departs", departs) //项目公司下属部门信息
+        let departIds = departs.map(o => { return o.id });
+        let userDeparts = await DB.UserDepart.findAll({ where: { departId: { [Op.in]: departIds } }, raw: true });
+        let userIds = userDeparts.map(o => { return o.userId });
+        console.log("userIds", userIds) //部门用户信息
+        users = await DB.User.findAll({
+            where: {
+                id: { [Op.in]: userIds }
+            },
+            include: [{
+                model: DB.Role,
+                as: 'roles',
+                where: { del: 0 ,key: roleCode},
+                attributes: ["id", "name"],
+            },]
+        });
+        return {users, type: 1};
+    }
 }
 
 async function getTouGuanJbrProjectApprover(userId, roleCode) {
     roleCode = roleCode || "tgbjbr";
     // 获取投管部正副职tgbzfz的用户列表
-    let role = await DB.Role.findOne({where: {key: roleCode}, raw: true});
-    if(!(role && role.id)) {
+    let role = await DB.Role.findOne({ where: { key: roleCode }, raw: true });
+    if (!(role && role.id)) {
         return [];
     }
-    let userIds = await DB.UserRole.findAll({where: {roleId: role.id}, raw: true});
-    userIds = (userIds || []).map(o => {return o.userId});
+    let userIds = await DB.UserRole.findAll({ where: { roleId: role.id }, raw: true });
+    userIds = (userIds || []).map(o => { return o.userId });
 
-    let users =  await DB.User.findAll({ where: { id: {[Op.in]: userIds} } }); 
+    let users = await DB.User.findAll({ where: { id: { [Op.in]: userIds } } });
     return users;
 }
 
 async function getTouGuanZfzProjectApprover(userId, roleCode) {
     roleCode = roleCode || "tgbzfz";
     // 获取投管部正副职tgbzfz的用户列表
-    let role = await DB.Role.findOne({where: {key: roleCode}, raw: true});
-    if(!(role && role.id)) {
+    let role = await DB.Role.findOne({ where: { key: roleCode }, raw: true });
+    if (!(role && role.id)) {
         return [];
     }
-    let userIds = await DB.UserRole.findAll({where: {roleId: role.id}, raw: true});
-    userIds = (userIds || []).map(o => {return o.userId});
+    let userIds = await DB.UserRole.findAll({ where: { roleId: role.id }, raw: true });
+    userIds = (userIds || []).map(o => { return o.userId });
 
-    let users =  await DB.User.findAll({ where: { id: {[Op.in]: userIds} } }); 
+    let users = await DB.User.findAll({ where: { id: { [Op.in]: userIds } } });
     return users;
 }
 

router/projectRouter.js

@@ -47,7 +47,7 @@ router.post('/listProject', projectController.listProject);
 // router.post('/preJugProject', projectController.preJugProject); //初审
 // router.post('/finalJugProject', projectController.finalJugProject); //终审 --暂时没有
 
-// router.post('/getOwnProjects', projectController.getOwnProjects);
+router.post('/getCompanyProjectApprover', projectController.getCompanyProjectApprover);
 
 router.post('/getProFlowRecord', projectController.getProFlowRecord)