1

controller/projectRcController.js

@@ -413,8 +413,8 @@ async function getCgqygl(req, res, next) {
         let info = await DB.RcCgqygl.findOne({ where: search, raw: true });
         if (!(info && info.id && info.projectId)) return res.sendError(errorMessage.resourceNotFound);
 
-        let tzfhs = await DB.RcCgqyglTzfh.findAll({ where: { projectId: info.projectId, sourceId: info.id }, raw: true });
-        let wtyys = await DB.RcCgqyglWtyy.findAll({ where: { projectId: info.projectId, sourceId: info.id }, raw: true });
+        let tzfhs = await DB.RcCgqyglTzfh.findAll({ where: { projectId: info.projectId, sourceId: info.id }});
+        let wtyys = await DB.RcCgqyglWtyy.findAll({ where: { projectId: info.projectId, sourceId: info.id }});
         info.tzfhs = tzfhs || [];
         info.wtyys = wtyys || [];
         return res.sendData(info);

controller/projectThController.js

@@ -481,7 +481,7 @@ async function getYjglList(req, res, next) {
         let offset = (page - 1) * limit;
 
         let search = {};
-        search.order = [['createdAt', 'DESC']];
+        search.order = [['id', 'DESC']];
         search.limit = limit;
         search.offset = offset;
 

db/model/jt/rcTwhgl.js

@@ -4,100 +4,105 @@ const moment = require('moment');
 
 //投中管理-  建设期投资检查
 const RcTwhgl = sequelize.define('RcTwhgl', {
-    id: {
-        type: DataTypes.INTEGER,
-        primaryKey: true,
-        autoIncrement: true
-    },
+  id: {
+    type: DataTypes.INTEGER,
+    primaryKey: true,
+    autoIncrement: true
+  },
+
+  meetingCode: {
+    type: DataTypes.STRING(50),
+    allowNull: false,
+    comment: '会议编号'
+  },
+  meetingName: {
+    type: DataTypes.STRING(200),
+    allowNull: false,
+    comment: '会议名称'
+  },
+  meetingDate: {
+    type: DataTypes.DATE,
+    allowNull: false,
+    comment: '会议时间',
+    defaultValue: new Date(),
+    get() {
+      const rawValue = this.getDataValue('createdAt');
+      return rawValue ? moment(rawValue).format('YYYY-MM-DD HH:mm:ss') : '';
+    }
+  },
+  meetingLocation: {
+    type: DataTypes.STRING(200),
+    allowNull: true,
+    comment: '会议地点'
+  },
+  meetingLevel: {
+    type: DataTypes.STRING,
+    comment: '会议层级:company-公司级,department-部门级,project-项目级'
+  },
+  attendingLeaders: {
+    type: DataTypes.STRING(500),
+    allowNull: true,
+    comment: '参会领导'
+  },
+  attendingDepartments: {
+    type: DataTypes.STRING(500),
+    allowNull: true,
+    comment: '参会部门'
+  },
+  meetingMinutesAttachment: {
+    type: DataTypes.JSON,
+    allowNull: true,
+    comment: '会议纪要附件路径'
+  },
 
-    meetingCode: {
-      type: DataTypes.STRING(50),
-      allowNull: false,
-      comment: '会议编号'
-    },
-    meetingName: {
-      type: DataTypes.STRING(200),
-      allowNull: false,
-      comment: '会议名称'
-    },
-    meetingDate: {
-      type: DataTypes.DATE,
-      allowNull: false,
-      comment: '会议时间'
-    },
-    meetingLocation: {
-      type: DataTypes.STRING(200),
-      allowNull: true,
-      comment: '会议地点'
-    },
-    meetingLevel: {
-      type: DataTypes.STRING,
-      comment: '会议层级:company-公司级,department-部门级,project-项目级'
-    },
-    attendingLeaders: {
-      type: DataTypes.STRING(500),
-      allowNull: true,
-      comment: '参会领导'
-    },
-    attendingDepartments: {
-      type: DataTypes.STRING(500),
-      allowNull: true,
-      comment: '参会部门'
-    },
-    meetingMinutesAttachment: {
-      type: DataTypes.JSON,
-      allowNull: true,
-      comment: '会议纪要附件路径'
-    },
 
-    
-    // sourceId: {
-    //     type: DataTypes.INTEGER,
-    //     comment: "所属主表id"
-    // },
-    // projectId: {
-    //     type: DataTypes.INTEGER,
-    //     comment: "所属项目ID",
-    // },
-    del: {
-        type: DataTypes.INTEGER,
-        defaultValue: 0,
-        comment: "0 正常 1 删除"
-    },
-        creator: {
-        type: DataTypes.INTEGER,
-        comment: "创建人"
-    },
-    createdAt: {
-        type: DataTypes.DATE,
-        defaultValue: new Date(),
-        get() {
-            const rawValue = this.getDataValue('createdAt');
-            return rawValue ? moment(rawValue).format('YYYY-MM-DD HH:mm:ss') : '';
-        }
-    },
-    updatedAt: { // 同样处理 updatedAt
-        type: DataTypes.DATE,
-        defaultValue: new Date(),
-        get() {
-            const rawValue = this.getDataValue('updatedAt');
-            return rawValue ? moment(rawValue).format('YYYY-MM-DD HH:mm:ss') : '';
-        }
+  // sourceId: {
+  //     type: DataTypes.INTEGER,
+  //     comment: "所属主表id"
+  // },
+  // projectId: {
+  //     type: DataTypes.INTEGER,
+  //     comment: "所属项目ID",
+  // },
+  del: {
+    type: DataTypes.INTEGER,
+    defaultValue: 0,
+    comment: "0 正常 1 删除"
+  },
+  creator: {
+    type: DataTypes.INTEGER,
+    comment: "创建人"
+  },
+  createdAt: {
+    type: DataTypes.DATE,
+    defaultValue: new Date(),
+    get() {
+      const rawValue = this.getDataValue('createdAt');
+      return rawValue ? moment(rawValue).format('YYYY-MM-DD HH:mm:ss') : '';
+    }
+  },
+  updatedAt: { // 同样处理 updatedAt
+    type: DataTypes.DATE,
+    defaultValue: new Date(),
+    get() {
+      const rawValue = this.getDataValue('updatedAt');
+      return rawValue ? moment(rawValue).format('YYYY-MM-DD HH:mm:ss') : '';
     }
+  }
 }, {
-    tableName: 'jt_rc_twhgl', // 指定表名（如果与模型名不同）
-    timestamps: true, // 是否自动添加 createdAt 和 updatedAt 字段（覆盖全局设置）
+  tableName: 'jt_rc_twhgl', // 指定表名（如果与模型名不同）
+  timestamps: true, // 是否自动添加 createdAt 和 updatedAt 字段（覆盖全局设置）
 });
 
 // 同步模型到数据库（创建表）
 RcTwhgl.sync({
-    // force: false,
-    // force: true ,//会删除已存在表并重新创建
-    alter: true
+  // force: false,
+  // force: true ,//会删除已存在表并重新创建
+  alter: true
 })
-    .then(() => {
-        console.log('RcTwhgl 表同步成功');
-    });
+  .then(() => {
+    console.log('RcTwhgl 表同步成功');
+  });
 
 
 module.exports = RcTwhgl;
\ No newline at end of file