diff --git a/backend/models/Ticket.js b/backend/models/Ticket.js index 955a5ae..eb7b47d 100644 --- a/backend/models/Ticket.js +++ b/backend/models/Ticket.js @@ -70,6 +70,14 @@ const Ticket = sequelize.define('Ticket', { allowNull: false, comment: '报修人姓名' }, + assigneeId: { + type: DataTypes.STRING, + comment: '处理人ID' + }, + assigneeName: { + type: DataTypes.STRING, + comment: '处理人姓名' + }, location: { type: DataTypes.STRING, comment: '设备位置' @@ -114,11 +122,13 @@ const Ticket = sequelize.define('Ticket', { { fields: ['faultCategory'] }, { fields: ['priority'] }, { fields: ['reporterId'] }, + { fields: ['assigneeId'] }, { fields: ['createdAt'] } ] }); Ticket.belongsTo(User, { foreignKey: 'reporterId', as: 'reporter', constraints: false }); +Ticket.belongsTo(User, { foreignKey: 'assigneeId', as: 'assignee', constraints: false }); Ticket.belongsTo(Device, { foreignKey: 'deviceId', constraints: false }); module.exports = Ticket; diff --git a/backend/models/ticketIndex.js b/backend/models/ticketIndex.js index c083317..dca27e9 100644 --- a/backend/models/ticketIndex.js +++ b/backend/models/ticketIndex.js @@ -157,8 +157,6 @@ const initDefaultFaultCategories = async () => { }; const initAssociations = () => { - Ticket.belongsTo(User, { foreignKey: 'assigneeId', as: 'assignee' }); - Ticket.hasMany(TicketOperationRecord, { foreignKey: 'ticketId', as: 'operationRecords' }); TicketOperationRecord.belongsTo(Ticket, { foreignKey: 'ticketId' }); };