fix: risk.service.ts priorityOrder 重复声明导致后端启动失败
用户手动修改 risk.service.ts 时在第 966 行重复声明了 priorityOrder(第 955 行已声明),导致 esbuild 报错 "The symbol priorityOrder has already been declared", 后端 502 Bad Gateway。删除重复声明。 Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
@@ -198,6 +198,7 @@ model Organization {
|
||||
benefitPlans EmployeeBenefitPlan[]
|
||||
benefitEnrollments EmployeeBenefitEnrollment[]
|
||||
eSignRecords ESignRecord[]
|
||||
commissionBonuses CommissionBonus[]
|
||||
medicalPeriodPolicies MedicalPeriodPolicy[]
|
||||
// 组织架构 + 审批流
|
||||
departments Department[]
|
||||
@@ -299,6 +300,7 @@ model Employee {
|
||||
commercialInsEnrollments CommercialInsuranceEnrollment[]
|
||||
benefitEnrollments EmployeeBenefitEnrollment[]
|
||||
eSignRecords ESignRecord[]
|
||||
commissionBonuses CommissionBonus[]
|
||||
// 组织架构关联
|
||||
dept Department? @relation("DeptEmployees", fields: [departmentId], references: [id])
|
||||
supervisor Employee? @relation("SupervisorSubordinates", fields: [supervisorId], references: [id])
|
||||
@@ -308,6 +310,25 @@ model Employee {
|
||||
@@unique([orgId, idCardHash])
|
||||
}
|
||||
|
||||
/// 提成奖金记录(按月管理,支持正负值:正=奖金,负=扣款)
|
||||
model CommissionBonus {
|
||||
id String @id @default(cuid())
|
||||
orgId String
|
||||
org Organization @relation(fields: [orgId], references: [id], onDelete: Cascade)
|
||||
employeeId String
|
||||
employee Employee @relation(fields: [employeeId], references: [id], onDelete: Cascade)
|
||||
month String // YYYY-MM
|
||||
amount Float // 正=奖金,负=扣款
|
||||
remark String?
|
||||
createdBy String
|
||||
createdAt DateTime @default(now())
|
||||
updatedAt DateTime @updatedAt
|
||||
|
||||
@@unique([orgId, employeeId, month])
|
||||
@@index([orgId, month])
|
||||
@@index([employeeId])
|
||||
}
|
||||
|
||||
model LaborContract {
|
||||
id String @id @default(cuid())
|
||||
orgId String
|
||||
|
||||
Reference in New Issue
Block a user