明树Git Lab

Skip to content

J
jt_backend
Commit 85cb5853 authored by zfp1's avatar zfp1
Browse files
Options

update

parent df316ea8
Pipeline #111997 passed with stage
    in 3 seconds
    Show whitespace changes
    Inline Side-by-side
    Showing with 23 additions and 10 deletions
    db/model/jt/projectBjtj.js
    View file @ 85cb5853
    ...@@ -198,7 +198,7 @@ const projectBjtj = sequelize.define('projectBjtj', { ...@@ -198,7 +198,7 @@ const projectBjtj = sequelize.define('projectBjtj', {
    projectBjtj.sync({ projectBjtj.sync({
    // force: false, // force: false,
    // force: true ,//会删除已存在表并重新创建 // force: true ,//会删除已存在表并重新创建
    alter: true // alter: true
    }) })
    .then(() => { .then(() => {
    console.log('projectBjtj 表同步成功'); console.log('projectBjtj 表同步成功');
    ......
    db/model/jt/projectTzzt.js
    View file @ 85cb5853
    ...@@ -13,7 +13,7 @@ const ProjectTzzt = sequelize.define('ProjectTzzt', { ...@@ -13,7 +13,7 @@ const ProjectTzzt = sequelize.define('ProjectTzzt', {
    hylx: { type: DataTypes.STRING, allowNull: true, comment: "会议类型" }, hylx: { type: DataTypes.STRING, allowNull: true, comment: "会议类型" },
    hymc: { type: DataTypes.STRING, allowNull: true, comment: "会议名称" }, hymc: { type: DataTypes.STRING, allowNull: true, comment: "会议名称" },
    shsj: { type: DataTypes.DATE, allowNull: true, comment: "审核时间" }, shsj: { type: DataTypes.DATE, allowNull: true, comment: "审核时间" },
    jl: { type: DataTypes.STRING, allowNull: true, comment: "结论" }, jl: { type: DataTypes.TEXT, allowNull: true, comment: "结论" },
    fj: {type: DataTypes.JSON, allowNull: true, comment: "附件"}, fj: {type: DataTypes.JSON, allowNull: true, comment: "附件"},
    // fj: {type: DataTypes.INTEGER, references: { // fj: {type: DataTypes.INTEGER, references: {
    // model: File, // model: File,
    ...@@ -22,7 +22,7 @@ const ProjectTzzt = sequelize.define('ProjectTzzt', { ...@@ -22,7 +22,7 @@ const ProjectTzzt = sequelize.define('ProjectTzzt', {
    qtsm: { type: DataTypes.TEXT, allowNull: true, comment: "其他说明" }, qtsm: { type: DataTypes.TEXT, allowNull: true, comment: "其他说明" },
    projectId: { projectId: {
    type: DataTypes.INTEGER, type: DataTypes.INTEGER,
    comment: "所属项目ID", comment: "所属项目ID",TEXT
    }, },
    del: { del: {
    type: DataTypes.INTEGER, type: DataTypes.INTEGER,
    ...@@ -52,9 +52,9 @@ const ProjectTzzt = sequelize.define('ProjectTzzt', { ...@@ -52,9 +52,9 @@ const ProjectTzzt = sequelize.define('ProjectTzzt', {
    // 同步模型到数据库（创建表） // 同步模型到数据库（创建表）
    ProjectTzzt.sync({ ProjectTzzt.sync({
    force: false, // force: false,
    // force: true ,//会删除已存在表并重新创建 // force: true ,//会删除已存在表并重新创建
    // alter: true alter: true
    }) })
    .then(() => { .then(() => {
    console.log('ProjectTzzt 表同步成功'); console.log('ProjectTzzt 表同步成功');
    ......
    db/model/jt/rcTzjh.js
    View file @ 85cb5853
    ...@@ -15,13 +15,15 @@ const RcTzjh = sequelize.define('RcTzjh', { ...@@ -15,13 +15,15 @@ const RcTzjh = sequelize.define('RcTzjh', {
    projectForeignName: { type: DataTypes.STRING, allowNull: true, comment: "项目外文名称", _mark: "lixiang" }, projectForeignName: { type: DataTypes.STRING, allowNull: true, comment: "项目外文名称", _mark: "lixiang" },
    sbdw: { type: DataTypes.STRING, allowNull: true, comment: "申报单位" }, sbdw: { type: DataTypes.STRING, allowNull: true, comment: "申报单位" },
    xmgsmc: { type: DataTypes.STRING, allowNull: true, comment: "项目公司名称/被投资企业名称" }, xmgsmc: { type: DataTypes.STRING, allowNull: true, comment: "项目公司名称/被投资企业名称" },
    xmkgsjyj: { type: DataTypes.DATE, allowNull: true, comment: "项目开工时间（预计） 项目预计起始时间", _mark: "lixiang", xmkgsjyj: {
    type: DataTypes.DATE, allowNull: true, comment: "项目开工时间（预计） 项目预计起始时间", _mark: "lixiang",
    get() { get() {
    const rawValue = this.getDataValue('xmkgsjyj'); const rawValue = this.getDataValue('xmkgsjyj');
    return rawValue ? moment(rawValue).format('YYYY-MM-DD') : ''; return rawValue ? moment(rawValue).format('YYYY-MM-DD') : '';
    } }
    }, },
    xmjgsjyj: { type: DataTypes.DATE, allowNull: true, comment: "项目交工时间（预计） 项目预计完成时间", _mark: "lixiang", xmjgsjyj: {
    type: DataTypes.DATE, allowNull: true, comment: "项目交工时间（预计） 项目预计完成时间", _mark: "lixiang",
    get() { get() {
    const rawValue = this.getDataValue('xmjgsjyj'); const rawValue = this.getDataValue('xmjgsjyj');
    return rawValue ? moment(rawValue).format('YYYY-MM-DD') : ''; return rawValue ? moment(rawValue).format('YYYY-MM-DD') : '';
    ...@@ -37,6 +39,17 @@ const RcTzjh = sequelize.define('RcTzjh', { ...@@ -37,6 +39,17 @@ const RcTzjh = sequelize.define('RcTzjh', {
    comment: "项目流转状态: 1待立项 3立项审批中 5 已立项 7决策填报中 8 决策审批中 9 已决策 ( 待定 11 再决策填报中 12 再决策审批中 13 再决策审批通过 15再决策审批不通过)", comment: "项目流转状态: 1待立项 3立项审批中 5 已立项 7决策填报中 8 决策审批中 9 已决策 ( 待定 11 再决策填报中 12 再决策审批中 13 再决策审批通过 15再决策审批不通过)",
    }, },
    xmjsqy: { type: DataTypes.INTEGER, allowNull: true, comment: "项目建设期（月）", _mark: "lixiang" }, xmjsqy: { type: DataTypes.INTEGER, allowNull: true, comment: "项目建设期（月）", _mark: "lixiang" },
    //20260526
    cwbblx: { type: DataTypes.STRING(10), allowNull: true, comment: "财务报表类型", zjType: 'danxuan', _mark: "lixiang" },
    zyfzy: { type: DataTypes.STRING(10), allowNull: true, comment: "主业/非主业", zjType: 'danxuan', _mark: "lixiang" },
    sbdw: { type: DataTypes.STRING, allowNull: true, comment: "申报单位", _mark: 'juece' }, //TODO:下拉选择公司名称，这个需要公司管理的数据
    cgqk: { type: DataTypes.JSON, comment: "参股情况（json）" },
    tzsxyjfl: { type: DataTypes.STRING(10), allowNull: true, comment: "投资属性的一级分类", zjType: 'danxuan', _mark: "lixiang" },
    tzsxejfl: { type: DataTypes.STRING(10), allowNull: true, comment: "投资属性的二级分类", zjType: 'danxuan', _mark: "lixiang" },
    tzmdyjfl: { type: DataTypes.STRING(10), allowNull: true, comment: "投资目的一级分类", zjType: 'danxuan', _mark: "lixiang" },
    tzmdejfl: { type: DataTypes.STRING(10), allowNull: true, comment: "投资目的二级分类", zjType: 'danxuan', _mark: "lixiang" },
    tzznyjfl: { type: DataTypes.STRING(10), allowNull: true, comment: "投资指南一级分类", zjType: 'danxuan', _mark: "lixiang" },
    tzznejfl: { type: DataTypes.STRING(10), allowNull: true, comment: "投资指南二级分类", zjType: 'danxuan', _mark: "lixiang" },
    //找不到的， 新字段 //找不到的， 新字段
    ssejqy: { type: DataTypes.STRING, allowNull: true, comment: "所属二级企业" }, ssejqy: { type: DataTypes.STRING, allowNull: true, comment: "所属二级企业" },
    ......
    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