|
@@ -1,9 +1,9 @@
|
|
|
import { Entity, Column, PrimaryGeneratedColumn, CreateDateColumn, UpdateDateColumn, OneToMany, ManyToOne, JoinColumn, Index } from 'typeorm';
|
|
import { Entity, Column, PrimaryGeneratedColumn, CreateDateColumn, UpdateDateColumn, OneToMany, ManyToOne, JoinColumn, Index } from 'typeorm';
|
|
|
import type { OrderPerson } from './order-person.entity';
|
|
import type { OrderPerson } from './order-person.entity';
|
|
|
import { OrderStatus, WorkStatus } from '@d8d/allin-enums';
|
|
import { OrderStatus, WorkStatus } from '@d8d/allin-enums';
|
|
|
-import { Company } from '@d8d/allin-company-module';
|
|
|
|
|
-import { Platform } from '@d8d/allin-platform-module';
|
|
|
|
|
-import { Channel } from '@d8d/allin-channel-module';
|
|
|
|
|
|
|
+import type { Company } from '@d8d/allin-company-module';
|
|
|
|
|
+import type { Platform } from '@d8d/allin-platform-module';
|
|
|
|
|
+import type { Channel } from '@d8d/allin-channel-module';
|
|
|
|
|
|
|
|
@Entity('employment_order', { comment: '用工订单表' })
|
|
@Entity('employment_order', { comment: '用工订单表' })
|
|
|
@Index(['companyId', 'orderStatus']) // 企业统计查询优化
|
|
@Index(['companyId', 'orderStatus']) // 企业统计查询优化
|
|
@@ -112,18 +112,18 @@ export class EmploymentOrder {
|
|
|
@OneToMany('OrderPerson', 'order')
|
|
@OneToMany('OrderPerson', 'order')
|
|
|
orderPersons!: OrderPerson[];
|
|
orderPersons!: OrderPerson[];
|
|
|
|
|
|
|
|
- // 关联关系 - 公司
|
|
|
|
|
- @ManyToOne(() => Company)
|
|
|
|
|
|
|
+ // 关联关系 - 公司(使用字符串语法避免循环依赖)
|
|
|
|
|
+ @ManyToOne('Company')
|
|
|
@JoinColumn({ name: 'company_id' })
|
|
@JoinColumn({ name: 'company_id' })
|
|
|
company!: Company;
|
|
company!: Company;
|
|
|
|
|
|
|
|
- // 关联关系 - 平台
|
|
|
|
|
- @ManyToOne(() => Platform)
|
|
|
|
|
|
|
+ // 关联关系 - 平台(使用字符串语法避免循环依赖)
|
|
|
|
|
+ @ManyToOne('Platform')
|
|
|
@JoinColumn({ name: 'platform_id' })
|
|
@JoinColumn({ name: 'platform_id' })
|
|
|
platform!: Platform;
|
|
platform!: Platform;
|
|
|
|
|
|
|
|
- // 关联关系 - 渠道(可选)
|
|
|
|
|
- @ManyToOne(() => Channel, { nullable: true })
|
|
|
|
|
|
|
+ // 关联关系 - 渠道(可选,使用字符串语法避免循环依赖)
|
|
|
|
|
+ @ManyToOne('Channel', { nullable: true })
|
|
|
@JoinColumn({ name: 'channel_id' })
|
|
@JoinColumn({ name: 'channel_id' })
|
|
|
channel?: Channel;
|
|
channel?: Channel;
|
|
|
|
|
|