update

db/model/jt/project.js

@@ -64,12 +64,12 @@ const Project = sequelize.define('Project', {
 
     //计量币种
     bizhong: { type: DataTypes.STRING, allowNull: true, comment: "币种", zjType: 'danxuan', _mark: "lixiang" },
-    huilv: { type: DataTypes.DECIMAL(3, 2), allowNull: true, comment: "汇率", _mark: "lixiang" },
+    huilv: { type: DataTypes.DECIMAL(4, 4), allowNull: true, comment: "汇率", _mark: "lixiang" },
 
     //实施时间
-    xmjsqy: { type: DataTypes.STRING, allowNull: true, comment: "项目建设期（月）", _mark: "lixiang" },
-    yynxn: { type: DataTypes.STRING, allowNull: true, comment: "运营年限（年）", _mark: "lixiang" },
-    xmhzqn: { type: DataTypes.STRING, allowNull: true, comment: "项目合作期（月）", _mark: "lixiang" },
+    xmjsqy: { type: DataTypes.INTEGER, allowNull: true, comment: "项目建设期（月）", _mark: "lixiang" },
+    yynxn: { type: DataTypes.INTEGER, allowNull: true, comment: "运营年限（年）", _mark: "lixiang" },
+    xmhzqn: { type: DataTypes.INTEGER, allowNull: true, comment: "项目合作期（月）", _mark: "lixiang" },
     xmkgsjyj: { type: DataTypes.DATE, allowNull: true, comment: "项目开工时间（预计）", _mark: "lixiang" },
     xmjgsjyj: { type: DataTypes.DATE, allowNull: true, comment: "项目交工时间（预计）", _mark: "lixiang" },
 
@@ -86,7 +86,7 @@ const Project = sequelize.define('Project', {
     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.STRING, allowNull: true, comment: "投资指南分类概述", _mark: "lixiang" },
-    gmjjhy: { type: DataTypes.STRING, allowNull: true, comment: "国民经济行业", zjType: 'danxuan', _mark: "lixiang" },
+    gmjjhy: { type: DataTypes.JSON, allowNull: true, comment: "国民经济行业", zjType: 'jilian', _mark: "lixiang" },
 
     //特别关注、特别监管类等信息
     sfxbgjfzggwhswbhz: { type: DataTypes.INTEGER, allowNull: true, comment: "是否需报国家发展改革委和商务部核准", zjType: 'danxuan', zjKey: 'sf', _mark: "lixiang" },
@@ -144,7 +144,7 @@ const Project = sequelize.define('Project', {
     tzms: { 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',  },
-    xmzjly: { type: DataTypes.STRING, 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',  }, 
     // gmjjhy: { type: DataTypes.STRING, allowNull: true, comment: "国民经济行业" },
@@ -154,7 +154,7 @@ const Project = sequelize.define('Project', {
     // yynxn: { type: DataTypes.STRING, allowNull: true, comment: "运营年限（年）" },
     // zyfzy: { type: DataTypes.STRING, allowNull: true, comment: "主业/非主业", zjType: 'danxuan',  }, 
     // xmhzqn: { type: DataTypes.STRING, allowNull: true, comment: "项目合作期（月）" },
-    njzgb: { type: DataTypes.DECIMAL(3, 2), allowNull: true, comment: "能建占股比", _mark: 'juece' },
+    njzgb: { type: DataTypes.DECIMAL(5, 2), allowNull: true, comment: "能建占股比", _mark: 'juece' },
     // xmjsqy: { type: DataTypes.STRING, allowNull: true, comment: "项目建设期（月）" },
     // xmkgsjyj: { type: DataTypes.DATE, allowNull: true, comment: "项目开工时间（预计）" },
     // xmjgsjyj: { type: DataTypes.DATE, allowNull: true, comment: "项目交工时间（预计）" },
@@ -167,7 +167,7 @@ const Project = sequelize.define('Project', {
     lxr: { 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', },
-    cblrl: { type: DataTypes.DECIMAL(3, 2), allowNull: true, comment: "成本利润率", _mark: 'juece', },
+    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: "投资属性的一级分类" },
     //     tzsxejfl: { type: DataTypes.STRING, allowNull: true, comment: "投资属性的二级分类" },
@@ -180,7 +180,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.STRING, allowNull: true, comment: "是否纳入补贴目录", _mark: 'juece', zjType: 'danxuan', zjKey: 'sf' },
+    sfnrbtml: { type: DataTypes.INTEGER, 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: "是否境内特别监管类" },
@@ -1833,9 +1833,9 @@ const Project = sequelize.define('Project', {
 
 // 同步模型到数据库（创建表）
 Project.sync({
-    force: false,
+    // force: false,
     // force: true ,//会删除已存在表并重新创建
-    // alter: true
+    alter: true
 })
     .then(() => {
         console.log('Project 表同步成功');

db/model/jt/projectXmtzze.js

@@ -67,9 +67,9 @@ const ProjectXmtzze = sequelize.define('ProjectXmtzze', {
 
 // 同步模型到数据库（创建表）
 ProjectXmtzze.sync({
-    // force: false,
+    force: false,
     // force: true ,//会删除已存在表并重新创建
-    alter: true
+    // alter: true
 })
     .then(() => {
         console.log('ProjectXmtzze 表同步成功');

db/model/system/userDepart.js

@@ -26,8 +26,9 @@ const UserDepart = sequelize.define('UserDepart', {
 
 // 同步模型到数据库（创建表）
 UserDepart.sync({
-    //   force: false, // force: true 会删除已存在表并重新创建
-    alter: true
+      force: false,
+    //  // force: true 会删除已存在表并重新创建
+    // alter: true
 })
     .then(() => {
         console.log('UserDepart 表同步成功');