feat: 社保公积金版本管理 + 员工基数调整 + 加班费计算优化 + UI组件改进

- SocialInsuranceConfig 版本化(effectiveFrom/effectiveTo/isCurrent/adjustmentDone)
- 社保配置版本管理接口(列表/新建/按月获取/当前版本)
- 员工基数调整:预览全部在职员工、上年月均工资计算建议基数、可编辑表格、确认后批量保存
- payroll.service 按批次月份匹配对应版本社保配置
- risk.service / seed.ts 同步更新
- 前端社保tab重构为版本管理+调整+试算
- 加班费计算三步流程、CSV导入、批次导入
- UI组件、Dashboard、合同、薪酬等页面优化
This commit is contained in:
freedakgmail
2026-07-23 16:32:46 +08:00
parent 2a09d31ccc
commit c618710a52
31 changed files with 2245 additions and 745 deletions
+25 -2
View File
@@ -128,8 +128,9 @@ model Organization {
salaryChangeRecords SalaryChangeRecord[]
onboardingLinks OnboardingLink[]
confirmLinks ContractConfirmLink[]
socialInsuranceConfig SocialInsuranceConfig?
socialInsuranceConfig SocialInsuranceConfig[]
notificationSetting NotificationSetting?
overtimeConfig OvertimeConfig?
notificationLogs NotificationLog[]
employeeAttachments EmployeeAttachment[]
disciplinaryRecords DisciplinaryRecord[]
@@ -236,6 +237,7 @@ model OvertimeRecord {
weekendPay Float @default(0)
holidayPay Float @default(0)
totalPay Float @default(0)
batchId String? // 关联的发薪批次(加入后锁定,不可重复加入)
createdAt DateTime @default(now())
@@unique([employeeId, month])
@@ -298,7 +300,7 @@ model AuditLog {
model SocialInsuranceConfig {
id String @id @default(cuid())
orgId String @unique
orgId String
org Organization @relation(fields: [orgId], references: [id], onDelete: Cascade)
city String @default("北京")
pensionOrg Float @default(16) // 养老保险 企业比例 %
@@ -313,7 +315,16 @@ model SocialInsuranceConfig {
housingEmp Float @default(12) // 公积金 个人比例 %
baseMin Float @default(6326) // 缴费基数下限
baseMax Float @default(33891) // 缴费基数上限
effectiveFrom String // 生效月份 YYYY-MM
effectiveTo String? // 失效月份 YYYY-MMnull=当前有效)
isCurrent Boolean @default(true) // 是否当前生效版本
adjustmentDone Boolean @default(false) // 是否已执行过员工基数调整
createdBy String
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
@@unique([orgId, effectiveFrom])
@@index([orgId, isCurrent])
}
model NotificationSetting {
@@ -336,6 +347,18 @@ model NotificationSetting {
updatedAt DateTime @updatedAt
}
model OvertimeConfig {
id String @id @default(cuid())
orgId String @unique
org Organization @relation(fields: [orgId], references: [id], onDelete: Cascade)
weekdayRate Float @default(1.5) // 工作日加班倍率
weekendRate Float @default(2.0) // 休息日加班倍率
holidayRate Float @default(3.0) // 法定节假日加班倍率
monthlyDays Float @default(21.75) // 月计薪天数
dailyHours Float @default(8) // 每日工时
updatedAt DateTime @updatedAt
}
model NotificationLog {
id String @id @default(cuid())
orgId String