update

db/model/jt/project.js

@@ -42,28 +42,28 @@ const Project = sequelize.define('Project', {
     //项目基本信息
     projectName: { type: DataTypes.STRING, allowNull: true, comment: "项目名称", _mark: "lixiang" },
     projectCode: { type: DataTypes.STRING, allowNull: true, comment: "项目编号", _mark: "lixiang" },
-    sfzjc: { type: DataTypes.INTEGER, allowNull: true, comment: "是否再决策", zjType: 'danxuan', zjKey: 'sf', _mark: "lixiang" }, // 1是 2 否
+    sfzjc: { type: DataTypes.STRING, allowNull: true, comment: "是否再决策", zjType: 'danxuan', zjKey: 'sf', _mark: "lixiang" }, // 1是 2 否
     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.STRING, allowNull: true, comment: "是否能建联合体项目", zjType: 'danxuan', zjKey: 'sf', _mark: "lixiang" }, // 1是 2 否
     tzzt: { type: DataTypes.STRING, allowNull: true, comment: "投资主体", zjType: 'danxuan', _mark: "lixiang" },
-    zyfzy: { type: DataTypes.INTEGER, allowNull: true, comment: "主业/非主业", zjType: 'danxuan', _mark: "lixiang" },
+    zyfzy: { type: DataTypes.STRING, allowNull: true, comment: "主业/非主业", zjType: 'danxuan', _mark: "lixiang" },
     zsqy: { type: DataTypes.STRING, allowNull: true, comment: "直属企业", zjType: 'danxuan', _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" },
-    cwbblx: { type: DataTypes.INTEGER, 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" },
+    sfnjzdhzytz: { type: DataTypes.STRING, allowNull: true, comment: "是否能建重大或重要投资", zjType: 'danxuan', zjKey: 'sf', _mark: "lixiang" },
+    sfzzjc: { type: DataTypes.STRING, allowNull: true, comment: "是否自主决策", zjType: 'danxuan', zjKey: 'sf', _mark: "lixiang" },
+    cwbblx: { type: DataTypes.STRING, allowNull: true, comment: "财务报表类型", zjType: 'danxuan', _mark: "lixiang" },
+    zfsphzbajb: { type: DataTypes.STRING, allowNull: true, comment: "政府审批（核准、备案）级别", zjType: 'danxuan', _mark: "lixiang" },
+    sflxbqyscx: { type: DataTypes.STRING, allowNull: true, comment: "是否履行标前预审程序", zjType: 'danxuan', zjKey: 'sf', _mark: "lixiang" },
 
     //项目所在地
-    jnw: { type: DataTypes.INTEGER, allowNull: true, comment: "境内/外", zjType: 'danxuan', _mark: "lixiang" },
-    sjnzjjw: { type: DataTypes.INTEGER, allowNull: true, comment: "省(境内)/洲际(境外)", zjType: 'danxuan', _mark: "lixiang" },
-    dsjngjjw: { type: DataTypes.INTEGER, allowNull: true, comment: "地市（境内）/国家（境外）", zjType: 'danxuan', _mark: "lixiang" },
-    qxjngjjw: { type: DataTypes.INTEGER, 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" },
+    jnw: { type: DataTypes.STRING, allowNull: true, comment: "境内/外", zjType: 'danxuan', _mark: "lixiang" },
+    sjnzjjw: { type: DataTypes.STRING, allowNull: true, comment: "省(境内)/洲际(境外)", zjType: 'danxuan', _mark: "lixiang" },
+    dsjngjjw: { type: DataTypes.STRING, allowNull: true, comment: "地市（境内）/国家（境外）", zjType: 'danxuan', _mark: "lixiang" },
+    qxjngjjw: { type: DataTypes.STRING, allowNull: true, comment: "区县(境内)/国家(境外)", zjType: 'danxuan', _mark: "lixiang" },
+    xmqy: { type: DataTypes.STRING, allowNull: true, comment: "项目区域", zjType: 'danxuan', _mark: "lixiang" },
+    sfydylyxgj: { type: DataTypes.STRING, allowNull: true, comment: "是否一带一路沿线国家", zjType: 'danxuan', zjKey: 'sf', _mark: "lixiang" },
 
     //计量币种
-    bizhong: { type: DataTypes.INTEGER, allowNull: true, comment: "币种", zjType: 'danxuan', _mark: "lixiang" },
+    bizhong: { type: DataTypes.STRING, allowNull: true, comment: "币种", zjType: 'danxuan', _mark: "lixiang" },
     huilv: { type: DataTypes.DECIMAL(5, 2), allowNull: true, comment: "汇率", _mark: "lixiang" },
 
     //实施时间
@@ -74,24 +74,24 @@ const Project = sequelize.define('Project', {
     xmjgsjyj: { type: DataTypes.DATE, allowNull: true, comment: "项目交工时间（预计）", _mark: "lixiang" },
 
     //投资分类---投资属性
-    tzsxyjfl: { type: DataTypes.INTEGER, allowNull: true, comment: "投资属性的一级分类", zjType: 'danxuan', _mark: "lixiang" },
-    tzsxejfl: { type: DataTypes.INTEGER, allowNull: true, comment: "投资属性的二级分类", zjType: 'danxuan', _mark: "lixiang" },
-    tzbk: { type: DataTypes.INTEGER, allowNull: true, comment: "投资板块", zjType: 'danxuan', _mark: "lixiang" },
-    subsector: { type: DataTypes.INTEGER, allowNull: true, comment: "细分板块", zjType: 'danxuan', _mark: "lixiang" },
+    tzsxyjfl: { type: DataTypes.STRING, allowNull: true, comment: "投资属性的一级分类", zjType: 'danxuan', _mark: "lixiang" },
+    tzsxejfl: { type: DataTypes.STRING, allowNull: true, comment: "投资属性的二级分类", zjType: 'danxuan', _mark: "lixiang" },
+    tzbk: { type: DataTypes.STRING, allowNull: true, comment: "投资板块", zjType: 'danxuan', _mark: "lixiang" },
+    subsector: { type: DataTypes.STRING, allowNull: true, comment: "细分板块", zjType: 'danxuan', _mark: "lixiang" },
     //投资分类---投资目的
-    tzmdyjfl: { type: DataTypes.INTEGER, allowNull: true, comment: "投资目的一级分类", zjType: 'danxuan', _mark: "lixiang" },
-    tzmdejfl: { type: DataTypes.INTEGER, allowNull: true, comment: "投资目的二级分类", zjType: 'danxuan', _mark: "lixiang" },
-    sxfl: { type: DataTypes.INTEGER, allowNull: true, comment: "四新分类", zjType: 'danxuan', _mark: "lixiang" },
+    tzmdyjfl: { type: DataTypes.STRING, allowNull: true, comment: "投资目的一级分类", zjType: 'danxuan', _mark: "lixiang" },
+    tzmdejfl: { type: DataTypes.STRING, allowNull: true, comment: "投资目的二级分类", zjType: 'danxuan', _mark: "lixiang" },
+    sxfl: { type: DataTypes.STRING, allowNull: true, comment: "四新分类", zjType: 'danxuan', _mark: "lixiang" },
     //投资分类---投资指南
-    tzznyjfl: { type: DataTypes.INTEGER, allowNull: true, comment: "投资指南一级分类", zjType: 'danxuan', _mark: "lixiang" },
-    tzznejfl: { type: DataTypes.INTEGER, allowNull: true, comment: "投资指南二级分类", zjType: 'danxuan', _mark: "lixiang" },
+    tzznyjfl: { type: DataTypes.STRING, allowNull: true, comment: "投资指南一级分类", zjType: 'danxuan', _mark: "lixiang" },
+    tzznejfl: { type: DataTypes.STRING, allowNull: true, comment: "投资指南二级分类", zjType: 'danxuan', _mark: "lixiang" },
     tzznflgs: { type: DataTypes.TEXT, allowNull: true, comment: "投资指南分类概述", _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" },
-    sfgjldjq: { type: DataTypes.INTEGER, allowNull: true, comment: "是否国家领导见签", zjType: 'danxuan', zjKey: 'sf', _mark: "lixiang" },
-    sfjntbjgl: { type: DataTypes.INTEGER, allowNull: true, comment: "是否境内特别监管类", zjType: 'danxuan', zjKey: 'sf', _mark: "lixiang" },
+    sfxbgjfzggwhswbhz: { type: DataTypes.STRING, allowNull: true, comment: "是否需报国家发展改革委和商务部核准", zjType: 'danxuan', zjKey: 'sf', _mark: "lixiang" },
+    sfgjldjq: { type: DataTypes.STRING, allowNull: true, comment: "是否国家领导见签", zjType: 'danxuan', zjKey: 'sf', _mark: "lixiang" },
+    sfjntbjgl: { type: DataTypes.STRING, allowNull: true, comment: "是否境内特别监管类", zjType: 'danxuan', zjKey: 'sf', _mark: "lixiang" },
 
     //建设规模（实物量指标）(表)
 
@@ -112,7 +112,7 @@ const Project = sequelize.define('Project', {
 
     //项目立项信息
     qthysyqk: { type: DataTypes.TEXT, allowNull: true, comment: "其他会议审议情况", _mark: "lixiang" },
-    lxzzpfyj: { type: DataTypes.INTEGER, allowNull: true, comment: "立项最终批复意见", zjType: 'danxuan', _mark: "lixiang" },
+    lxzzpfyj: { type: DataTypes.STRING, allowNull: true, comment: "立项最终批复意见", zjType: 'danxuan', _mark: "lixiang" },
     lxxmpfsj: { type: DataTypes.DATE, allowNull: true, comment: "立项项目批复时间", _mark: "lixiang" },
     lxxmpfwh: { type: DataTypes.STRING, allowNull: true, comment: "立项项目批复文号", _mark: "lixiang" },
     wtgzyyyyyq: { type: DataTypes.TEXT, allowNull: true, comment: "未通过主要原因与要求", _mark: "lixiang" },
@@ -129,7 +129,7 @@ const Project = sequelize.define('Project', {
     cym: { type: DataTypes.STRING, allowNull: true, comment: "曾用名", _mark: 'juece' },
     // projectCode: { type: DataTypes.STRING, allowNull: true, comment: "项目编号",  },
     sbdw: { type: DataTypes.STRING, allowNull: true, comment: "申报单位", _mark: 'juece' }, //TODO:下拉选择公司名称，这个需要公司管理的数据
-    sbdwqygg: { type: DataTypes.INTEGER, allowNull: true, comment: "申报单位企业规格", _mark: 'juece', zjType: 'danxuan' },
+    sbdwqygg: { type: DataTypes.STRING, allowNull: true, comment: "申报单位企业规格", _mark: 'juece', zjType: 'danxuan' },
     xmztz: { type: DataTypes.DECIMAL(20, 8), allowNull: true, comment: "项目总投资", _mark: 'juece' },
     // zsqy: { type: DataTypes.STRING, allowNull: true, comment: "直属企业",  },
     glzt: { type: DataTypes.STRING, allowNull: true, comment: "管理主体", _mark: 'juece', zjType: 'danxuan' },
@@ -145,8 +145,8 @@ const Project = sequelize.define('Project', {
     dwqypp: { type: DataTypes.STRING, allowNull: true, comment: "对外签约品牌", _mark: 'juece' },
     // sfnjzdhzytz: { type: DataTypes.INTEGER, allowNull: true, comment: "是否能建重大或重要投资", zjType: 'danxuan', zjKey: 'sf',  },
     xmzjly: { type: DataTypes.JSON, allowNull: true, comment: "项目资金来源", _mark: 'juece', zjType: 'duoxuan' }, // []
-    sfpppxm: { type: DataTypes.INTEGER, allowNull: true, comment: "是否PPP项目", _mark: 'juece', zjType: 'danxuan', zjKey: 'sf', },
-    njsfqtf: { type: DataTypes.INTEGER, allowNull: true, comment: "能建是否牵头方", _mark: 'juece', zjType: 'danxuan', zjKey: 'sf', },
+    sfpppxm: { type: DataTypes.STRING, allowNull: true, comment: "是否PPP项目", _mark: 'juece', zjType: 'danxuan', zjKey: 'sf', },
+    njsfqtf: { type: DataTypes.STRING, allowNull: true, comment: "能建是否牵头方", _mark: 'juece', zjType: 'danxuan', zjKey: 'sf', },
     // swbxmlx: { type: DataTypes.STRING, allowNull: true, comment: "商务部项目类型", zjType: 'danxuan',  }, 
     // gmjjhy: { type: DataTypes.STRING, allowNull: true, comment: "国民经济行业" },
     // sfzzjc: { type: DataTypes.INTEGER, allowNull: true, comment: "是否自主决策",  },
@@ -160,14 +160,14 @@ const Project = sequelize.define('Project', {
     // xmkgsjyj: { type: DataTypes.DATE, allowNull: true, comment: "项目开工时间（预计）" },
     // xmjgsjyj: { type: DataTypes.DATE, allowNull: true, comment: "项目交工时间（预计）" },
     // 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', },
-    sfzdqy: { type: DataTypes.INTEGER, allowNull: true, comment: "是否重点区域", _mark: 'juece', zjType: 'danxuan', zjKey: 'sf' }, //1是 2否    
-    zdqy: { type: DataTypes.INTEGER, allowNull: true, comment: "重点区域", _mark: 'juece', zjType: 'danxuan', },//下拉
+    sfyjlx: { type: DataTypes.STRING, allowNull: true, comment: "是否已经立项", _mark: 'juece', zjType: 'danxuan', zjKey: 'sf', },
+    sfzdqy: { type: DataTypes.STRING, allowNull: true, comment: "是否重点区域", _mark: 'juece', zjType: 'danxuan', zjKey: 'sf' }, //1是 2否    
+    zdqy: { type: DataTypes.STRING, allowNull: true, comment: "重点区域", _mark: 'juece', zjType: 'danxuan', },//下拉
     // jsnrjgm: { type: DataTypes.TEXT, allowNull: true, comment: "建设内容及规模" },
     glxm: { type: DataTypes.STRING, allowNull: true, comment: "关联项目", _mark: 'juece', },//TODO:关联项目 关联关系
     lxr: { type: DataTypes.STRING, allowNull: true, comment: "联系人", _mark: 'juece', },
     lxrdh: { type: DataTypes.STRING, allowNull: true, comment: "联系人电话", _mark: 'juece', },
-    tzhsfs: { type: DataTypes.INTEGER, allowNull: true, comment: "投资回收方式", _mark: 'juece', zjType: 'danxuan', },
+    tzhsfs: { type: DataTypes.STRING, allowNull: true, comment: "投资回收方式", _mark: 'juece', zjType: 'danxuan', },
     cblrl: { type: DataTypes.DECIMAL(5, 2), allowNull: true, comment: "成本利润率", _mark: 'juece', },
     // wtgzyyyyyq: { type: DataTypes.TEXT, allowNull: true, comment: "未通过主要原因与要求" },
     // tzsxyjfl: { type: DataTypes.STRING, allowNull: true, comment: "投资属性的一级分类" },
@@ -181,7 +181,7 @@ const Project = sequelize.define('Project', {
     //     tzznejfl: { type: DataTypes.STRING, allowNull: true, comment: "投资指南二级分类" },
     //     tzznflgs: { type: DataTypes.STRING, allowNull: true, comment: "投资指南分类概述" },
     // sfzjc: { type: DataTypes.INTEGER, allowNull: true, comment: "是否再决策", zjType: 'danxuan', zjKey: 'sf',  }, // 1是 2 否
-    sfnrbtml: { type: DataTypes.INTEGER, allowNull: true, comment: "是否纳入补贴目录", _mark: 'juece', zjType: 'danxuan', zjKey: 'sf' },
+    sfnrbtml: { type: DataTypes.STRING, allowNull: true, comment: "是否纳入补贴目录", _mark: 'juece', zjType: 'danxuan', zjKey: 'sf' },
     // sfxbgjfzggwhswbhz: { type: DataTypes.INTEGER, allowNull: true, comment: "是否需报国家发展改革委和商务部核准" },
     // sfgjldjq: { type: DataTypes.INTEGER, allowNull: true, comment: "是否国家领导见签" },
     // sfjntbjgl: { type: DataTypes.INTEGER, allowNull: true, comment: "是否境内特别监管类" },
@@ -190,7 +190,7 @@ const Project = sequelize.define('Project', {
     gsgllc: { type: DataTypes.DECIMAL(20, 8), allowNull: true, comment: "高速公路里程", _mark: 'juece' },
     qtsfgllc: { type: DataTypes.DECIMAL(20, 8), allowNull: true, comment: "其他收费公路里程", _mark: 'juece' },
     //政府审批（核准、备案）文件
-    sfyjzfsp: { type: DataTypes.INTEGER, allowNull: true, comment: "是否已经政府审批", _mark: 'juece', zjType: 'danxuan', zjKey: 'sf' }, //1是 2否
+    sfyjzfsp: { type: DataTypes.STRING, allowNull: true, comment: "是否已经政府审批", _mark: 'juece', zjType: 'danxuan', zjKey: 'sf' }, //1是 2否
     spdwmc: { type: DataTypes.STRING, allowNull: true, comment: "审批单位名称（全称）", _mark: 'juece', },
     pwwh: { type: DataTypes.STRING, allowNull: true, comment: "批文文号", _mark: 'juece', },
     // spjb: { type: DataTypes.STRING, allowNull: true, comment: "审批级别" }, //TODO:下拉
@@ -286,7 +286,7 @@ const Project = sequelize.define('Project', {
     sbdwjlr: { type: DataTypes.DECIMAL(20, 8), allowNull: true, comment: "申报单位净利润" },
     sbdwhbzj: { type: DataTypes.DECIMAL(20, 8), allowNull: true, comment: "申报单位货币资金" },
     dxfzgm: { type: DataTypes.STRING, allowNull: true, comment: "带息负债规模" },
-    jlnsflxks: { type: DataTypes.INTEGER, allowNull: true, comment: "近两年是否连续亏损", _mark: 'juece', zjType: 'danxuan', zjKey: 'sf' },
+    jlnsflxks: { type: DataTypes.STRING, allowNull: true, comment: "近两年是否连续亏损", _mark: 'juece', zjType: 'danxuan', zjKey: 'sf' },
     // 项目可行性：项目投资现金流量表  项目资本金现金流量表  能建方现金流量表  利润表  投评报告及测算表
 
 

db/model/jt/projectBjtj.js

@@ -10,7 +10,7 @@ const projectBjtj = sequelize.define('projectBjtj', {
         autoIncrement: true
     },
     type: {
-        type: DataTypes.INTEGER,
+        type: DataTypes.STRING,
         comment: "业务类型"
     },
     dwgczjSz: {

db/model/jt/projectGdxx.js

@@ -9,7 +9,7 @@ const ProjectGdxx = sequelize.define('ProjectGdxx', {
         autoIncrement: true
     },
     gdlx: {
-        type: DataTypes.INTEGER,
+        type: DataTypes.STRING,
         comment: "股东类型"
     },
     gdmc: {

db/model/jt/projectJczt.js

@@ -10,7 +10,7 @@ const ProjectJczt = sequelize.define('ProjectJczt', {
         primaryKey: true,
         autoIncrement: true
     },
-    hylx: { type: DataTypes.INTEGER, allowNull: true, comment: "会议类型" },
+    hylx: { type: DataTypes.STRING, allowNull: true, comment: "会议类型" },
     hymc: { type: DataTypes.STRING, allowNull: true, comment: "会议名称" },
     jcsj: { type: DataTypes.DATE, allowNull: true, comment: "决策时间" },
     jcjl: { type: DataTypes.STRING, allowNull: true, comment: "决策结论" },

db/model/jt/projectSpyjjc.js

@@ -10,8 +10,8 @@ const ProjectSpyjjc = sequelize.define('ProjectSpyjjc', {
         autoIncrement: true
     },
     lx: {
-        type: DataTypes.INTEGER,
-        comment: "指标名称"
+        type: DataTypes.STRING,
+        comment: "类型"
     },
     pfyj: {
         type: DataTypes.TEXT,

db/model/jt/projectTzzt.js

@@ -10,7 +10,7 @@ const ProjectTzzt = sequelize.define('ProjectTzzt', {
         primaryKey: true,
         autoIncrement: true
     },
-    hylx: { type: DataTypes.INTEGER, allowNull: true, comment: "会议类型" },
+    hylx: { type: DataTypes.STRING, allowNull: true, comment: "会议类型" },
     hymc: { type: DataTypes.STRING, allowNull: true, comment: "会议名称" },
     shsj: { type: DataTypes.DATE, allowNull: true, comment: "审核时间" },
     jl: { type: DataTypes.STRING, allowNull: true, comment: "结论" },