update

controller/projectController.js

@@ -137,6 +137,8 @@ async function createProject(req, res, next) {
             userId: req.user.id,
             actionName: '创建项目',
             projectId: project.id,
+            projectName: project.projectName,
+            projectCode: project.projectCode,
         });
         // if (req.body.buttonType === 'submit') {
         //     await DB.FlowRecord.create({
@@ -287,6 +289,8 @@ async function startLixiang(req, res, next) {
             userId: req.user.id,
             actionName: '发起项目立项审批',
             projectId: req.body.id,
+            projectName: req.body.projectName,
+            projectCode: req.body.projectCode,
         });
 
         //更新信息和状态
@@ -296,6 +300,8 @@ async function startLixiang(req, res, next) {
             userId: req.user.id,
             actionName: '发起项目立项',
             projectId: req.body.id,
+            projectName: req.body.projectName,
+            projectCode: req.body.projectCode,
         });
         let approvers = await userModule.getProjectApprover(req.user.id, 'xmlx_sp');
         if (!(approvers && approvers.length > 0)) {
@@ -362,6 +368,8 @@ async function approvalLixiang(req, res, next) {
                 userId: req.user.id,
                 actionName: '立项审批通过',
                 projectId: proInfo.id,
+                projectName: proInfo.projectName,
+                projectCode: proInfo.projectCode,
                 content: req.body.approvalMessage,
             });
         } else {
@@ -371,6 +379,8 @@ async function approvalLixiang(req, res, next) {
                 userId: req.user.id,
                 actionName: '立项审批未通过',
                 projectId: proInfo.id,
+                projectName: proInfo.projectName,
+                projectCode: proInfo.projectCode,
                 content: req.body.approvalMessage,
             });
         }
@@ -553,6 +563,8 @@ async function startJuece(req, res, next) {
             userId: req.user.id,
             actionName: '发起项目决策审批',
             projectId: req.body.id,
+            projectName: req.body.projectName,
+            projectCode: req.body.projectCode,
         });
         let approvers = await userModule.getProjectApprover(req.user.id, 'xmjc_sp');
         if (!(approvers && approvers.length > 0)) {
@@ -613,6 +625,8 @@ async function approvalJuece(req, res, next) {
                 userId: req.user.id,
                 actionName: '决策审批通过',
                 projectId: proInfo.id,
+                projectName: proInfo.projectName,
+                projectCode: proInfo.projectCode,
                 content: req.body.approvalMessage,
             });
         } else {
@@ -622,6 +636,8 @@ async function approvalJuece(req, res, next) {
                 userId: req.user.id,
                 actionName: '决策审批未通过',
                 projectId: proInfo.id,
+                projectName: proInfo.projectName,
+                projectCode: proInfo.projectCode,
                 content: req.body.approvalMessage,
             });
         }
@@ -1167,7 +1183,16 @@ async function getOwnProjects(req, res, next) {
 
 async function getProFlowRecord(req, res, next) {
     try {
-        let rcs = await DB.FlowRecord.findAll({ where: { projectId: req.body.projectId } });
+        let rcs = await DB.FlowRecord.findAll({
+            where: { projectId: req.body.projectId || req.body.id },
+            include: [
+                {
+                    model: DB.User,
+                    as: 'creator',
+                    attributes: ["id", "name"]
+                }
+            ]
+        });
         return res.sendData(rcs);
     } catch (error) {
         next(error);
@@ -1199,6 +1224,8 @@ async function startZaiJuece(req, res, next) {
             userId: req.user.id,
             actionName: '发起项目再决策审批',
             projectId: req.body.id,
+            projectName: req.body.projectName,
+            projectCode: req.body.projectCode,
         });
         let approvers = await userModule.getProjectApprover(req.user.id, 'xmjc_sp');
         if (!(approvers && approvers.length > 0)) {
@@ -1231,7 +1258,9 @@ async function approvalZaiJuece(req, res, next) {
             await DB.FlowRecord.create({
                 userId: req.user.id,
                 actionName: '再决策审批通过',
-                projectId: project.id,
+                projectId: proInfo.id,
+                projectName: proInfo.projectName,
+                projectCode: proInfo.projectCode,
             });
         } else {
             //TODO:不确定

db/index.js

@@ -248,6 +248,10 @@ Position.belongsToMany(User, {
   as: 'users'
 });
 
+/**用户-项目 1：n */
+User.hasMany(FlowRecord, { foreignKey: 'userId', as: 'records' });
+FlowRecord.belongsTo(User, { foreignKey: 'userId', as: 'creator' });
+
 /**用户-项目 1：n */
 User.hasMany(Project, { foreignKey: 'projectCreator', as: 'createdProjects' });
 Project.belongsTo(User, { foreignKey: 'projectCreator', as: 'creator' });

db/model/system/flowRecord.js

@@ -25,6 +25,9 @@ const flowRecord = sequelize.define('flowRecord', {
         type: DataTypes.STRING(100),
         comment: "动作名称 发起项目复核 项目复核通过  项目复核退回 项目终审退回 项目终审通过 项目立项审批通过  项目立项审批不通过等"
     },
+    projectName: { type: DataTypes.STRING,},
+    projectCode: { type: DataTypes.STRING,},
+
     projectId: {
         type: DataTypes.INTEGER,
         comment: "项目ID"
@@ -41,9 +44,9 @@ const flowRecord = sequelize.define('flowRecord', {
 
 // 同步模型到数据库（创建表）
 flowRecord.sync({
-    force: false, 
+    // force: false, 
     // force: true ,//会删除已存在表并重新创建
-    // alter: true
+    alter: true
 })
     .then(() => {
         console.log('flowRecord 表同步成功');