明树Git Lab

Skip to content

J
jt_backend
Commit 7f68d362 authored by zfp1's avatar zfp1
Browse files
Options

1

parent 8e509e7a
Pipeline #111228 passed with stage
    in 4 seconds
    Show whitespace changes
    Inline Side-by-side
    Showing with 9 additions and 7 deletions
    controller/projectController.js
    View file @ 7f68d362
    ...@@ -406,6 +406,7 @@ async function approvalLixiangByDepartHeader(req, res, next) { ...@@ -406,6 +406,7 @@ async function approvalLixiangByDepartHeader(req, res, next) {
    projectId: req.body.id, projectId: req.body.id,
    projectName: req.body.projectName, projectName: req.body.projectName,
    projectCode: req.body.projectCode, projectCode: req.body.projectCode,
    approvalMessage: req.body.approvalMessage || ""
    }); });
    } }
    else { else {
    ...@@ -419,7 +420,7 @@ async function approvalLixiangByDepartHeader(req, res, next) { ...@@ -419,7 +420,7 @@ async function approvalLixiangByDepartHeader(req, res, next) {
    projectId: body.id, projectId: body.id,
    projectName: body.projectName, projectName: body.projectName,
    projectCode: body.projectCode, projectCode: body.projectCode,
    content: body.approvalMessage, approvalMessage: req.body.approvalMessage || ""
    }); });
    await DB.Message.create({ await DB.Message.create({
    projectId: body.id, projectId: body.id,
    ...@@ -473,7 +474,7 @@ async function approvalLixiangByTouGuanJbr(req, res, next) { ...@@ -473,7 +474,7 @@ async function approvalLixiangByTouGuanJbr(req, res, next) {
    projectId: req.body.id, projectId: req.body.id,
    projectName: req.body.projectName, projectName: req.body.projectName,
    projectCode: req.body.projectCode, projectCode: req.body.projectCode,
    content: req.body.approvalMessage, approvalMessage: req.body.approvalMessage || ""
    }); });
    } }
    else { else {
    ...@@ -496,7 +497,7 @@ async function approvalLixiangByTouGuanJbr(req, res, next) { ...@@ -496,7 +497,7 @@ async function approvalLixiangByTouGuanJbr(req, res, next) {
    projectId: req.body.id, projectId: req.body.id,
    projectName: req.body.projectName, projectName: req.body.projectName,
    projectCode: req.body.projectCode, projectCode: req.body.projectCode,
    content: body.approvalMessage, approvalMessage: req.body.approvalMessage || ""
    }); });
    } }
    return res.sendData(ret); return res.sendData(ret);
    ...@@ -534,7 +535,7 @@ async function approvalLixiang(req, res, next) { ...@@ -534,7 +535,7 @@ async function approvalLixiang(req, res, next) {
    projectId: proInfo.id, projectId: proInfo.id,
    projectName: proInfo.projectName, projectName: proInfo.projectName,
    projectCode: proInfo.projectCode, projectCode: proInfo.projectCode,
    content: req.body.approvalMessage, approvalMessage: req.body.approvalMessage || ""
    }); });
    } else { } else {
    //立项终审 未通过 则回到投管部经办人，项目状态变为立项审批中， //立项终审 未通过 则回到投管部经办人，项目状态变为立项审批中，
    ...@@ -553,7 +554,7 @@ async function approvalLixiang(req, res, next) { ...@@ -553,7 +554,7 @@ async function approvalLixiang(req, res, next) {
    projectId: proInfo.id, projectId: proInfo.id,
    projectName: proInfo.projectName, projectName: proInfo.projectName,
    projectCode: proInfo.projectCode, projectCode: proInfo.projectCode,
    content: req.body.approvalMessage, approvalMessage: req.body.approvalMessage || ""
    }); });
    } }
    return res.sendData(proInfo); return res.sendData(proInfo);
    ...@@ -779,7 +780,7 @@ async function approvalJuece(req, res, next) { ...@@ -779,7 +780,7 @@ async function approvalJuece(req, res, next) {
    projectId: proInfo.id, projectId: proInfo.id,
    projectName: proInfo.projectName, projectName: proInfo.projectName,
    projectCode: proInfo.projectCode, projectCode: proInfo.projectCode,
    content: req.body.approvalMessage, approvalMessage: req.body.approvalMessage || ""
    }); });
    await DB.Message.create({ await DB.Message.create({
    projectId: proInfo.id, projectId: proInfo.id,
    ...@@ -798,7 +799,7 @@ async function approvalJuece(req, res, next) { ...@@ -798,7 +799,7 @@ async function approvalJuece(req, res, next) {
    projectId: proInfo.id, projectId: proInfo.id,
    projectName: proInfo.projectName, projectName: proInfo.projectName,
    projectCode: proInfo.projectCode, projectCode: proInfo.projectCode,
    content: req.body.approvalMessage, approvalMessage: req.body.approvalMessage || ""
    }); });
    await DB.Message.create({ await DB.Message.create({
    projectId: proInfo.id, projectId: proInfo.id,
    ......
    db/model/system/flowRecord.js
    View file @ 7f68d362
    ...@@ -27,6 +27,7 @@ const flowRecord = sequelize.define('flowRecord', { ...@@ -27,6 +27,7 @@ const flowRecord = sequelize.define('flowRecord', {
    }, },
    projectName: { type: DataTypes.STRING,}, projectName: { type: DataTypes.STRING,},
    projectCode: { type: DataTypes.STRING,}, projectCode: { type: DataTypes.STRING,},
    approvalMessage: { type: DataTypes.TEXT,},
    projectId: { projectId: {
    type: DataTypes.INTEGER, type: DataTypes.INTEGER,
    ......
    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