update

db/index.js

@@ -34,7 +34,8 @@ const ProjectTzzt = require("./model/jt/projectTzzt");
 const ProjectXmtzze = require("./model/jt/projectXmtzze");
 const ProjectLixiang = require("./model/jt/projectLixiang");
 const ProjectExcelData = require("./model/jt/projectExcelData");
-
+const ProjectZqrz = require('./model/jt/projectZqrz')
+const ProjectSpyjjc = require('./model/jt/projectSpyjjc')
 
 /**
  * 业务表
@@ -74,6 +75,8 @@ global.DB = {
   FlowRecord,
   ProjectLixiang,
   ProjectExcelData,
+  ProjectZqrz,
+  ProjectSpyjjc,
 }
 
 

db/model/jt/projectJczt.js

@@ -11,15 +11,18 @@ const ProjectJczt = sequelize.define('ProjectJczt', {
         autoIncrement: true
     },
     hylx: { type: DataTypes.STRING, 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: "决策结论" },
     hyjy: {
-        type: DataTypes.INTEGER, references: {
-            model: File,
-            key: 'id'
-        }, allowNull: true, comment: "hyjy"
+        type: DataTypes.JSON, allowNull: true, comment: "会议纪要"
     },
+    // hyjy: {
+    //     type: DataTypes.INTEGER, references: {
+    //         model: File,
+    //         key: 'id'
+    //     }, allowNull: true, comment: "会议纪要"
+    // },
     qtsm: { type: DataTypes.TEXT, allowNull: true, comment: "其他说明" },
     projectId: {
         type: DataTypes.INTEGER,
@@ -53,9 +56,9 @@ const ProjectJczt = sequelize.define('ProjectJczt', {
 
 // 同步模型到数据库（创建表）
 ProjectJczt.sync({
-    force: false,
+    // force: false,
     // force: true ,//会删除已存在表并重新创建
-    // alter: true
+    alter: true
 })
     .then(() => {
         console.log('ProjectJczt 表同步成功');

db/model/jt/projectLcbjd.js

 const { DataTypes } = require('sequelize');
 const sequelize = require('../index');
 const moment = require('moment');
-const File = require('../system/file');
+
 //里程碑节点
 const ProjectLcbjd = sequelize.define('ProjectLcbjd', {
     id: {

db/model/jt/projectSpyj.js

@@ -24,11 +24,14 @@ const ProjectSpyj = sequelize.define('ProjectSpyj', {
     },
     zxhf: { type: DataTypes.TEXT, allowNull: true, comment: "执行回复" },
     zxhfsj: { type: DataTypes.DATE, allowNull: true, comment: "执行回复时间" },
+    // zxhffj: {
+    //     type: DataTypes.INTEGER, references: {
+    //         model: File,
+    //         key: 'id'
+    //     }, allowNull: true, comment: "执行回复附件"
+    // },
     zxhffj: {
-        type: DataTypes.INTEGER, references: {
-            model: File,
-            key: 'id'
-        }, allowNull: true, comment: "执行回复附件"
+        type: DataTypes.JSON, allowNull: true, comment: "执行回复附件"
     },
     wlsqksm: { type: DataTypes.TEXT, allowNull: true, comment: "未落实情况说明" },
 

db/model/jt/projectSpyjjc.js

@@ -24,11 +24,14 @@ const ProjectSpyjjc = sequelize.define('ProjectSpyjjc', {
     zxhf: { type: DataTypes.TEXT, allowNull: true, comment: "执行回复" },
     zxhfsj: { type: DataTypes.DATE, allowNull: true, comment: "执行回复时间" },
     zxhffj: {
-        type: DataTypes.INTEGER, references: {
-            model: File,
-            key: 'id'
-        }, allowNull: true, comment: "执行回复附件"
+        type: DataTypes.JSON, allowNull: true, comment: "执行回复附件"
     },
+    // zxhffj: {
+    //     type: DataTypes.INTEGER, references: {
+    //         model: File,
+    //         key: 'id'
+    //     }, allowNull: true, comment: "执行回复附件"
+    // },
     wlsqksm: { type: DataTypes.TEXT, allowNull: true, comment: "未落实情况说明" },
 
     projectId: {

db/model/jt/projectTzzt.js

@@ -14,10 +14,11 @@ const ProjectTzzt = sequelize.define('ProjectTzzt', {
     hymc: { type: DataTypes.STRING, allowNull: true, comment: "会议名称" },
     shsj: { type: DataTypes.DATE, allowNull: true, comment: "审核时间" },
     jl: { type: DataTypes.STRING, allowNull: true, comment: "结论" },
-    fj: {type: DataTypes.INTEGER, references: {
-            model: File,
-            key: 'id'
-        }, allowNull: true, comment: "附件"},
+    fj: {type: DataTypes.JSON, allowNull: true, comment: "附件"},
+    // fj: {type: DataTypes.INTEGER, references: {
+    //         model: File,
+    //         key: 'id'
+    //     }, allowNull: true, comment: "附件"},
     qtsm: { type: DataTypes.TEXT, allowNull: true, comment: "其他说明" },
     projectId: {
         type: DataTypes.INTEGER,

db/model/system/excel.js

@@ -23,12 +23,13 @@ const ExcelRecord = sequelize.define('ExcelRecord', {
         comment: "1. 导入  2. 导出"
     },
     excelUrl: {
-        type: DataTypes.INTEGER,
+        type: DataTypes.STRING,
+        // type: DataTypes.INTEGER,
         allowNull: true,
-        references: {
-            model: DB.File, // 关联的表名
-            key: 'id'           // 关联的字段      
-        },
+        // references: {
+        //     model: DB.File, // 关联的表名
+        //     key: 'id'           // 关联的字段      
+        // },
         comment: "导出文件地址",
     },
     modleName: {

module/userModule.js

@@ -78,7 +78,6 @@ async function setUserPosition(userId, positionIds, positions) {
         const element = positions[index];
         dbIds.push(element.id);
         if (!positionIds.includes(element.id)) {
-            // 1. departIds里面没有  但是关系表里有的 需要删除
             needDelIds.push(element.id);
         }
     }