明树Git Lab

Skip to content

J
jt_backend
Commit 838f8c9c authored by zfp1's avatar zfp1
Browse files
Options

update

parent e0b0afd8
Pipeline #104371 passed with stage
    in 3 seconds
    Show whitespace changes
    Inline Side-by-side
    Showing with 30 additions and 30 deletions
    db/model/jt/project.js
    View file @ 838f8c9c
    ...@@ -45,25 +45,25 @@ const Project = sequelize.define('Project', { ...@@ -45,25 +45,25 @@ const Project = sequelize.define('Project', {
    sfzjc: { type: DataTypes.INTEGER, allowNull: true, comment: "是否再决策", zjType: 'danxuan', zjKey: 'sf', _mark: "lixiang" }, // 1是 2 否 sfzjc: { type: DataTypes.INTEGER, allowNull: true, comment: "是否再决策", zjType: 'danxuan', zjKey: 'sf', _mark: "lixiang" }, // 1是 2 否
    projectForeignName: { type: DataTypes.STRING, allowNull: true, comment: "项目外文名称", _mark: "lixiang" }, projectForeignName: { type: DataTypes.STRING, allowNull: true, comment: "项目外文名称", _mark: "lixiang" },
    sfnjlhtxm: { type: DataTypes.INTEGER, allowNull: true, comment: "是否能建联合体项目", zjType: 'danxuan', zjKey: 'sf', _mark: "lixiang" }, // 1是 2 否 sfnjlhtxm: { type: DataTypes.INTEGER, allowNull: true, comment: "是否能建联合体项目", zjType: 'danxuan', zjKey: 'sf', _mark: "lixiang" }, // 1是 2 否
    tzzt: { type: DataTypes.STRING, allowNull: true, comment: "投资主体", zjType: 'danxuan', _mark: "lixiang" }, tzzt: { type: DataTypes.INTEGER, allowNull: true, comment: "投资主体", zjType: 'danxuan', _mark: "lixiang" },
    zyfzy: { type: DataTypes.STRING, allowNull: true, comment: "主业/非主业", zjType: 'danxuan', _mark: "lixiang" }, zyfzy: { type: DataTypes.INTEGER, allowNull: true, comment: "主业/非主业", zjType: 'danxuan', _mark: "lixiang" },
    zsqy: { type: DataTypes.STRING, allowNull: true, comment: "直属企业", zjType: 'danxuan', _mark: "lixiang" }, zsqy: { type: DataTypes.INTEGER, allowNull: true, comment: "直属企业", zjType: 'danxuan', _mark: "lixiang" },
    sfnjzdhzytz: { type: DataTypes.INTEGER, allowNull: true, comment: "是否能建重大或重要投资", zjType: 'danxuan', zjKey: 'sf', _mark: "lixiang" }, sfnjzdhzytz: { type: DataTypes.INTEGER, allowNull: true, comment: "是否能建重大或重要投资", zjType: 'danxuan', zjKey: 'sf', _mark: "lixiang" },
    sfzzjc: { type: DataTypes.INTEGER, allowNull: true, comment: "是否自主决策", zjType: 'danxuan', zjKey: 'sf', _mark: "lixiang" }, sfzzjc: { type: DataTypes.INTEGER, allowNull: true, comment: "是否自主决策", zjType: 'danxuan', zjKey: 'sf', _mark: "lixiang" },
    cwbblx: { type: DataTypes.STRING, allowNull: true, comment: "财务报表类型", zjType: 'danxuan', _mark: "lixiang" }, cwbblx: { type: DataTypes.INTEGER, allowNull: true, comment: "财务报表类型", zjType: 'danxuan', _mark: "lixiang" },
    zfsphzbajb: { type: DataTypes.STRING, allowNull: true, comment: "政府审批（核准、备案）级别", zjType: 'danxuan', _mark: "lixiang" }, zfsphzbajb: { type: DataTypes.INTEGER, allowNull: true, comment: "政府审批（核准、备案）级别", zjType: 'danxuan', _mark: "lixiang" },
    sflxbqyscx: { type: DataTypes.INTEGER, allowNull: true, comment: "是否履行标前预审程序", zjType: 'danxuan', zjKey: 'sf', _mark: "lixiang" }, sflxbqyscx: { type: DataTypes.INTEGER, allowNull: true, comment: "是否履行标前预审程序", zjType: 'danxuan', zjKey: 'sf', _mark: "lixiang" },
    //项目所在地 //项目所在地
    jnw: { type: DataTypes.STRING, allowNull: true, comment: "境内/外", zjType: 'danxuan', _mark: "lixiang" }, jnw: { type: DataTypes.INTEGER, allowNull: true, comment: "境内/外", zjType: 'danxuan', _mark: "lixiang" },
    sjnzjjw: { type: DataTypes.STRING, allowNull: true, comment: "省(境内)/洲际(境外)", zjType: 'danxuan', _mark: "lixiang" }, sjnzjjw: { type: DataTypes.INTEGER, allowNull: true, comment: "省(境内)/洲际(境外)", zjType: 'danxuan', _mark: "lixiang" },
    dsjngjjw: { type: DataTypes.STRING, allowNull: true, comment: "地市（境内）/国家（境外）", zjType: 'danxuan', _mark: "lixiang" }, dsjngjjw: { type: DataTypes.INTEGER, allowNull: true, comment: "地市（境内）/国家（境外）", zjType: 'danxuan', _mark: "lixiang" },
    qxjngjjw: { type: DataTypes.STRING, allowNull: true, comment: "区县(境内)/国家(境外)", zjType: 'danxuan', _mark: "lixiang" }, qxjngjjw: { type: DataTypes.INTEGER, allowNull: true, comment: "区县(境内)/国家(境外)", zjType: 'danxuan', _mark: "lixiang" },
    xmqy: { type: DataTypes.STRING, allowNull: true, comment: "项目区域", zjType: 'danxuan', _mark: "lixiang" }, xmqy: { type: DataTypes.INTEGER, allowNull: true, comment: "项目区域", zjType: 'danxuan', _mark: "lixiang" },
    sfydylyxgj: { type: DataTypes.INTEGER, allowNull: true, comment: "是否一带一路沿线国家", zjType: 'danxuan', zjKey: 'sf', _mark: "lixiang" }, sfydylyxgj: { type: DataTypes.INTEGER, allowNull: true, comment: "是否一带一路沿线国家", zjType: 'danxuan', zjKey: 'sf', _mark: "lixiang" },
    //计量币种 //计量币种
    bizhong: { type: DataTypes.STRING, allowNull: true, comment: "币种", zjType: 'danxuan', _mark: "lixiang" }, bizhong: { type: DataTypes.INTEGER, allowNull: true, comment: "币种", zjType: 'danxuan', _mark: "lixiang" },
    huilv: { type: DataTypes.DECIMAL(5, 2), allowNull: true, comment: "汇率", _mark: "lixiang" }, huilv: { type: DataTypes.DECIMAL(5, 2), allowNull: true, comment: "汇率", _mark: "lixiang" },
    //实施时间 //实施时间
    ...@@ -74,19 +74,19 @@ const Project = sequelize.define('Project', { ...@@ -74,19 +74,19 @@ const Project = sequelize.define('Project', {
    xmjgsjyj: { type: DataTypes.DATE, allowNull: true, comment: "项目交工时间（预计）", _mark: "lixiang" }, xmjgsjyj: { type: DataTypes.DATE, allowNull: true, comment: "项目交工时间（预计）", _mark: "lixiang" },
    //投资分类---投资属性 //投资分类---投资属性
    tzsxyjfl: { type: DataTypes.STRING, allowNull: true, comment: "投资属性的一级分类", zjType: 'danxuan', _mark: "lixiang" }, tzsxyjfl: { type: DataTypes.INTEGER, allowNull: true, comment: "投资属性的一级分类", zjType: 'danxuan', _mark: "lixiang" },
    tzsxejfl: { type: DataTypes.STRING, allowNull: true, comment: "投资属性的二级分类", zjType: 'danxuan', _mark: "lixiang" }, tzsxejfl: { type: DataTypes.INTEGER, allowNull: true, comment: "投资属性的二级分类", zjType: 'danxuan', _mark: "lixiang" },
    tzbk: { type: DataTypes.STRING, allowNull: true, comment: "投资板块", zjType: 'danxuan', _mark: "lixiang" }, tzbk: { type: DataTypes.INTEGER, allowNull: true, comment: "投资板块", zjType: 'danxuan', _mark: "lixiang" },
    subsector: { type: DataTypes.STRING, allowNull: true, comment: "细分板块", zjType: 'danxuan', _mark: "lixiang" }, subsector: { type: DataTypes.INTEGER, allowNull: true, comment: "细分板块", zjType: 'danxuan', _mark: "lixiang" },
    //投资分类---投资目的 //投资分类---投资目的
    tzmdyjfl: { type: DataTypes.STRING, allowNull: true, comment: "投资目的一级分类", zjType: 'danxuan', _mark: "lixiang" }, tzmdyjfl: { type: DataTypes.INTEGER, allowNull: true, comment: "投资目的一级分类", zjType: 'danxuan', _mark: "lixiang" },
    tzmdejfl: { type: DataTypes.STRING, allowNull: true, comment: "投资目的二级分类", zjType: 'danxuan', _mark: "lixiang" }, tzmdejfl: { type: DataTypes.INTEGER, allowNull: true, comment: "投资目的二级分类", zjType: 'danxuan', _mark: "lixiang" },
    sxfl: { type: DataTypes.STRING, allowNull: true, comment: "四新分类", zjType: 'danxuan', _mark: "lixiang" }, sxfl: { type: DataTypes.INTEGER, allowNull: true, comment: "四新分类", zjType: 'danxuan', _mark: "lixiang" },
    //投资分类---投资指南 //投资分类---投资指南
    tzznyjfl: { type: DataTypes.STRING, allowNull: true, comment: "投资指南一级分类", zjType: 'danxuan', _mark: "lixiang" }, tzznyjfl: { type: DataTypes.INTEGER, allowNull: true, comment: "投资指南一级分类", zjType: 'danxuan', _mark: "lixiang" },
    tzznejfl: { type: DataTypes.STRING, allowNull: true, comment: "投资指南二级分类", zjType: 'danxuan', _mark: "lixiang" }, tzznejfl: { type: DataTypes.INTEGER, allowNull: true, comment: "投资指南二级分类", zjType: 'danxuan', _mark: "lixiang" },
    tzznflgs: { type: DataTypes.STRING, allowNull: true, comment: "投资指南分类概述", _mark: "lixiang" }, tzznflgs: { type: DataTypes.TEXT, allowNull: true, comment: "投资指南分类概述", _mark: "lixiang" },
    gmjjhy: { type: DataTypes.JSON, allowNull: true, comment: "国民经济行业", zjType: 'jilian', _mark: "lixiang" }, gmjjhy: { type: DataTypes.JSON, allowNull: true, comment: "国民经济行业", zjType: 'duoxuan', _mark: "lixiang" },
    //特别关注、特别监管类等信息 //特别关注、特别监管类等信息
    sfxbgjfzggwhswbhz: { type: DataTypes.INTEGER, allowNull: true, comment: "是否需报国家发展改革委和商务部核准", zjType: 'danxuan', zjKey: 'sf', _mark: "lixiang" }, sfxbgjfzggwhswbhz: { type: DataTypes.INTEGER, allowNull: true, comment: "是否需报国家发展改革委和商务部核准", zjType: 'danxuan', zjKey: 'sf', _mark: "lixiang" },
    ...@@ -112,7 +112,7 @@ const Project = sequelize.define('Project', { ...@@ -112,7 +112,7 @@ const Project = sequelize.define('Project', {
    //项目立项信息 //项目立项信息
    qthysyqk: { type: DataTypes.TEXT, allowNull: true, comment: "其他会议审议情况", _mark: "lixiang" }, qthysyqk: { type: DataTypes.TEXT, allowNull: true, comment: "其他会议审议情况", _mark: "lixiang" },
    lxzzpfyj: { type: DataTypes.STRING, allowNull: true, comment: "立项最终批复意见", zjType: 'danxuan', _mark: "lixiang" }, lxzzpfyj: { type: DataTypes.INTEGER, allowNull: true, comment: "立项最终批复意见", zjType: 'danxuan', _mark: "lixiang" },
    lxxmpfsj: { type: DataTypes.DATE, allowNull: true, comment: "立项项目批复时间", _mark: "lixiang" }, lxxmpfsj: { type: DataTypes.DATE, allowNull: true, comment: "立项项目批复时间", _mark: "lixiang" },
    lxxmpfwh: { type: DataTypes.STRING, allowNull: true, comment: "立项项目批复文号", _mark: "lixiang" }, lxxmpfwh: { type: DataTypes.STRING, allowNull: true, comment: "立项项目批复文号", _mark: "lixiang" },
    wtgzyyyyyq: { type: DataTypes.TEXT, allowNull: true, comment: "未通过主要原因与要求", _mark: "lixiang" }, wtgzyyyyyq: { type: DataTypes.TEXT, allowNull: true, comment: "未通过主要原因与要求", _mark: "lixiang" },
    ...@@ -129,10 +129,10 @@ const Project = sequelize.define('Project', { ...@@ -129,10 +129,10 @@ const Project = sequelize.define('Project', {
    cym: { type: DataTypes.STRING, allowNull: true, comment: "曾用名", _mark: 'juece' }, cym: { type: DataTypes.STRING, allowNull: true, comment: "曾用名", _mark: 'juece' },
    // projectCode: { type: DataTypes.STRING, allowNull: true, comment: "项目编号", }, // projectCode: { type: DataTypes.STRING, allowNull: true, comment: "项目编号", },
    sbdw: { type: DataTypes.STRING, allowNull: true, comment: "申报单位", _mark: 'juece' }, //TODO:下拉选择公司名称，这个需要公司管理的数据 sbdw: { type: DataTypes.STRING, allowNull: true, comment: "申报单位", _mark: 'juece' }, //TODO:下拉选择公司名称，这个需要公司管理的数据
    sbdwqygg: { type: DataTypes.STRING, allowNull: true, comment: "申报单位企业规格", _mark: 'juece', zjType: 'danxuan' }, sbdwqygg: { type: DataTypes.INTEGER, allowNull: true, comment: "申报单位企业规格", _mark: 'juece', zjType: 'danxuan' },
    xmztz: { type: DataTypes.DECIMAL(19, 8), allowNull: true, comment: "项目总投资", _mark: 'juece' }, xmztz: { type: DataTypes.DECIMAL(19, 8), allowNull: true, comment: "项目总投资", _mark: 'juece' },
    // zsqy: { type: DataTypes.STRING, allowNull: true, comment: "直属企业", }, // zsqy: { type: DataTypes.STRING, allowNull: true, comment: "直属企业", },
    glzt: { type: DataTypes.STRING, allowNull: true, comment: "管理主体", _mark: 'juece', zjType: 'danxuan' }, glzt: { type: DataTypes.INTEGER, allowNull: true, comment: "管理主体", _mark: 'juece', zjType: 'danxuan' },
    // xmqy: { type: DataTypes.STRING, allowNull: true, comment: "项目区域", zjType: 'danxuan' }, // xmqy: { type: DataTypes.STRING, allowNull: true, comment: "项目区域", zjType: 'danxuan' },
    // jnw: { type: DataTypes.STRING, allowNull: true, comment: "境内/外", zjType: 'danxuan' }, // jnw: { type: DataTypes.STRING, allowNull: true, comment: "境内/外", zjType: 'danxuan' },
    // sjnzjjw: { type: DataTypes.STRING, allowNull: true, comment: "省(境内)/洲际(境外)", zjType: 'danxuan' }, // sjnzjjw: { type: DataTypes.STRING, allowNull: true, comment: "省(境内)/洲际(境外)", zjType: 'danxuan' },
    ...@@ -144,7 +144,7 @@ const Project = sequelize.define('Project', { ...@@ -144,7 +144,7 @@ const Project = sequelize.define('Project', {
    tzms: { type: DataTypes.STRING, allowNull: true, comment: "投资模式", _mark: 'juece' }, tzms: { type: DataTypes.STRING, allowNull: true, comment: "投资模式", _mark: 'juece' },
    dwqypp: { type: DataTypes.STRING, allowNull: true, comment: "对外签约品牌", _mark: 'juece' }, dwqypp: { type: DataTypes.STRING, allowNull: true, comment: "对外签约品牌", _mark: 'juece' },
    // sfnjzdhzytz: { type: DataTypes.INTEGER, allowNull: true, comment: "是否能建重大或重要投资", zjType: 'danxuan', zjKey: 'sf', }, // sfnjzdhzytz: { type: DataTypes.INTEGER, allowNull: true, comment: "是否能建重大或重要投资", zjType: 'danxuan', zjKey: 'sf', },
    xmzjly: { type: DataTypes.JSON, allowNull: true, comment: "项目资金来源", _mark: 'juece', zjType: 'duoxuan' }, xmzjly: { type: DataTypes.JSON, allowNull: true, comment: "项目资金来源", _mark: 'juece', zjType: 'duoxuan' }, // []
    // swbxmlx: { type: DataTypes.STRING, allowNull: true, comment: "商务部项目类型", zjType: 'danxuan', }, // swbxmlx: { type: DataTypes.STRING, allowNull: true, comment: "商务部项目类型", zjType: 'danxuan', },
    // gmjjhy: { type: DataTypes.STRING, allowNull: true, comment: "国民经济行业" }, // gmjjhy: { type: DataTypes.STRING, allowNull: true, comment: "国民经济行业" },
    ...@@ -161,12 +161,12 @@ const Project = sequelize.define('Project', { ...@@ -161,12 +161,12 @@ const Project = sequelize.define('Project', {
    // sfnjlhtxm: { type: DataTypes.INTEGER, allowNull: true, comment: "是否能建联合体项目", zjType: 'danxuan', zjKey: 'sf', }, // 1是 2 否 // sfnjlhtxm: { type: DataTypes.INTEGER, allowNull: true, comment: "是否能建联合体项目", zjType: 'danxuan', zjKey: 'sf', }, // 1是 2 否
    sfyjlx: { type: DataTypes.INTEGER, allowNull: true, comment: "是否已经立项", _mark: 'juece', zjType: 'danxuan', zjKey: 'sf', }, sfyjlx: { type: DataTypes.INTEGER, allowNull: true, comment: "是否已经立项", _mark: 'juece', zjType: 'danxuan', zjKey: 'sf', },
    sfzdqy: { type: DataTypes.INTEGER, allowNull: true, comment: "是否重点区域", _mark: 'juece', zjType: 'danxuan', zjKey: 'sf' }, //1是 2否 sfzdqy: { type: DataTypes.INTEGER, allowNull: true, comment: "是否重点区域", _mark: 'juece', zjType: 'danxuan', zjKey: 'sf' }, //1是 2否
    zdqy: { type: DataTypes.STRING, allowNull: true, comment: "重点区域", _mark: 'juece', zjType: 'danxuan', },//下拉 zdqy: { type: DataTypes.INTEGER, allowNull: true, comment: "重点区域", _mark: 'juece', zjType: 'danxuan', },//下拉
    // jsnrjgm: { type: DataTypes.TEXT, allowNull: true, comment: "建设内容及规模" }, // jsnrjgm: { type: DataTypes.TEXT, allowNull: true, comment: "建设内容及规模" },
    glxm: { type: DataTypes.STRING, allowNull: true, comment: "关联项目", _mark: 'juece', },//TODO:关联项目 关联关系 glxm: { type: DataTypes.STRING, allowNull: true, comment: "关联项目", _mark: 'juece', },//TODO:关联项目 关联关系
    lxr: { type: DataTypes.STRING, allowNull: true, comment: "联系人", _mark: 'juece', }, lxr: { type: DataTypes.STRING, allowNull: true, comment: "联系人", _mark: 'juece', },
    lxrdh: { type: DataTypes.STRING, allowNull: true, comment: "联系人电话", _mark: 'juece', }, lxrdh: { type: DataTypes.STRING, allowNull: true, comment: "联系人电话", _mark: 'juece', },
    tzhsfs: { type: DataTypes.STRING, allowNull: true, comment: "投资回收方式", _mark: 'juece', zjType: 'danxuan', }, tzhsfs: { type: DataTypes.INTEGER, allowNull: true, comment: "投资回收方式", _mark: 'juece', zjType: 'danxuan', },
    cblrl: { type: DataTypes.DECIMAL(5, 2), allowNull: true, comment: "成本利润率", _mark: 'juece', }, cblrl: { type: DataTypes.DECIMAL(5, 2), allowNull: true, comment: "成本利润率", _mark: 'juece', },
    // wtgzyyyyyq: { type: DataTypes.TEXT, allowNull: true, comment: "未通过主要原因与要求" }, // wtgzyyyyyq: { type: DataTypes.TEXT, allowNull: true, comment: "未通过主要原因与要求" },
    // tzsxyjfl: { type: DataTypes.STRING, allowNull: true, comment: "投资属性的一级分类" }, // tzsxyjfl: { type: DataTypes.STRING, allowNull: true, comment: "投资属性的一级分类" },
    ...@@ -1870,7 +1870,7 @@ const Project = sequelize.define('Project', { ...@@ -1870,7 +1870,7 @@ const Project = sequelize.define('Project', {
    Project.sync({ Project.sync({
    // force: false, // force: false,
    // force: true ,//会删除已存在表并重新创建 // force: true ,//会删除已存在表并重新创建
    // alter: true alter: true
    }) })
    .then(() => { .then(() => {
    console.log('Project 表同步成功'); console.log('Project 表同步成功');
    ......
    db/model/jt/projectCwpjzb.js
    View file @ 838f8c9c
    ...@@ -57,7 +57,7 @@ const projectCwpjzb = sequelize.define('projectCwpjzb', { ...@@ -57,7 +57,7 @@ const projectCwpjzb = sequelize.define('projectCwpjzb', {
    projectCwpjzb.sync({ projectCwpjzb.sync({
    // force: false, // force: false,
    // force: true ,//会删除已存在表并重新创建 // force: true ,//会删除已存在表并重新创建
    alter: true // alter: true
    }) })
    .then(() => { .then(() => {
    console.log('projectCwpjzb 表同步成功'); console.log('projectCwpjzb 表同步成功');
    ......
    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