fix: 个税累计预扣中专项附加扣除改为按月读取实际填报金额
原逻辑用 employee.specialDeduction（便捷字段）× 月数计算累计 专项附加扣除，未按月读取 SpecialDeductionRecord 实际金额。 若员工某月填报/取消专项附加扣除，累计值会不准。 修复： - 优先按月查询 SpecialDeductionRecord（当年至当月）累加实际金额 - 无按月记录时回退到便捷字段 × 月数（兼容旧数据） - taxBreakdown 增加 specialDeductionSource 字段标识数据来源 Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
selfrelease
@@ -200,6 +200,8 @@ model Organization {
|
||||
eSignRecords ESignRecord[]
|
||||
commissionBonuses CommissionBonus[]
|
||||
medicalPeriodPolicies MedicalPeriodPolicy[]
|
||||
socialAccounts SocialAccount[]
|
||||
socialYearStandards SocialYearStandard[]
|
||||
// 组织架构 + 审批流
|
||||
departments Department[]
|
||||
positions Position[]
|
||||
@@ -459,6 +461,76 @@ model AuditLog {
|
||||
|
||||
// ========== 社保 & 通知 & 附件 ==========
|
||||
|
||||
/// 社保/公积金账户（实体化管理，替代原 city 字符串）
|
||||
model SocialAccount {
|
||||
id String @id @default(cuid())
|
||||
orgId String
|
||||
org Organization @relation(fields: [orgId], references: [id], onDelete: Cascade)
|
||||
type String // SOCIAL=社保账户, HOUSING=公积金账户
|
||||
name String // 账户名称，如"北京总公司社保账户"
|
||||
city String // 参保城市
|
||||
accountNo String? // 社保登记号 / 公积金单位账号
|
||||
bankName String? // 公积金开户行（公积金专用）
|
||||
bankAccount String? // 公积金银行账号（公积金专用）
|
||||
orgName String? // 缴费主体名称（子公司/分公司名称）
|
||||
orgCode String? // 缴费主体统一社会信用代码
|
||||
accountType String? // 公积金账户类型 BASIC=基本, SUPPLEMENTARY=补充
|
||||
isDefault Boolean @default(false)
|
||||
status String @default("ACTIVE") // ACTIVE=正常, SUSPENDED=停用
|
||||
remark String?
|
||||
createdBy String
|
||||
createdAt DateTime @default(now())
|
||||
updatedAt DateTime @updatedAt
|
||||
|
||||
yearStandards SocialYearStandard[]
|
||||
socialRecords EmployeeSocialInsRecord[]
|
||||
housingRecords EmployeeHousingFundRecord[]
|
||||
monthlyProcesses SocialMonthlyProcess[]
|
||||
|
||||
@@unique([orgId, type, name])
|
||||
@@index([orgId, type, city])
|
||||
@@index([orgId, type, isDefault])
|
||||
}
|
||||
|
||||
/// 年度标准（替代原 SocialInsuranceConfig / HousingFundConfig）
|
||||
model SocialYearStandard {
|
||||
id String @id @default(cuid())
|
||||
orgId String
|
||||
org Organization @relation(fields: [orgId], references: [id], onDelete: Cascade)
|
||||
accountId String
|
||||
account SocialAccount @relation(fields: [accountId], references: [id], onDelete: Cascade)
|
||||
|
||||
// 社保比例（type=SOCIAL 时使用）
|
||||
pensionOrg Float @default(16)
|
||||
pensionEmp Float @default(8)
|
||||
medicalOrg Float @default(9.8)
|
||||
medicalEmp Float @default(2)
|
||||
unemploymentOrg Float @default(0.5)
|
||||
unemploymentEmp Float @default(0.5)
|
||||
injuryOrg Float @default(0.2)
|
||||
maternityOrg Float @default(0.8)
|
||||
baseMin Float @default(6326)
|
||||
baseMax Float @default(33891)
|
||||
medicalBaseMin Float @default(0)
|
||||
medicalBaseMax Float @default(0)
|
||||
extraInsurances Json?
|
||||
|
||||
// 公积金比例（type=HOUSING 时使用）
|
||||
housingOrg Float @default(12)
|
||||
housingEmp Float @default(12)
|
||||
|
||||
effectiveFrom String // 生效月份 YYYY-MM
|
||||
effectiveTo String? // 失效月份 YYYY-MM（null=当前有效）
|
||||
isCurrent Boolean @default(true)
|
||||
adjustmentDone Boolean @default(false)
|
||||
createdBy String
|
||||
createdAt DateTime @default(now())
|
||||
updatedAt DateTime @updatedAt
|
||||
|
||||
@@unique([accountId, effectiveFrom])
|
||||
@@index([accountId, isCurrent])
|
||||
}
|
||||
|
||||
model SocialInsuranceConfig {
|
||||
id String @id @default(cuid())
|
||||
orgId String
|
||||
@@ -877,7 +949,9 @@ model EmployeeSocialInsRecord {
|
||||
org Organization @relation(fields: [orgId], references: [id], onDelete: Cascade)
|
||||
employeeId String
|
||||
employee Employee @relation(fields: [employeeId], references: [id], onDelete: Cascade)
|
||||
city String @default("北京") // 参保城市
|
||||
accountId String? // 关联到 SocialAccount（迁移后非空）
|
||||
account SocialAccount? @relation(fields: [accountId], references: [id])
|
||||
city String @default("北京") // 参保城市（兼容旧数据，从 account.city 派生）
|
||||
startMonth String // 开始缴费年月 YYYY-MM
|
||||
endMonth String? // 截止缴费年月 YYYY-MM（null=至今有效）
|
||||
base Float // 缴费基数
|
||||
@@ -890,6 +964,7 @@ model EmployeeSocialInsRecord {
|
||||
@@index([orgId, employeeId])
|
||||
@@index([employeeId, startMonth, endMonth])
|
||||
@@index([orgId, city])
|
||||
@@index([accountId])
|
||||
}
|
||||
|
||||
model EmployeeHousingFundRecord {
|
||||
@@ -898,7 +973,9 @@ model EmployeeHousingFundRecord {
|
||||
org Organization @relation(fields: [orgId], references: [id], onDelete: Cascade)
|
||||
employeeId String
|
||||
employee Employee @relation(fields: [employeeId], references: [id], onDelete: Cascade)
|
||||
city String @default("北京") // 参保城市
|
||||
accountId String? // 关联到 SocialAccount（迁移后非空）
|
||||
account SocialAccount? @relation(fields: [accountId], references: [id])
|
||||
city String @default("北京") // 参保城市（兼容旧数据）
|
||||
startMonth String // 开始缴费年月 YYYY-MM
|
||||
endMonth String? // 截止缴费年月 YYYY-MM（null=至今有效）
|
||||
base Float // 缴费基数
|
||||
@@ -910,6 +987,7 @@ model EmployeeHousingFundRecord {
|
||||
|
||||
@@index([orgId, employeeId])
|
||||
@@index([employeeId, startMonth, endMonth])
|
||||
@@index([accountId])
|
||||
}
|
||||
|
||||
/// 月度社保/公积金办理记录（标记某月已办理完成，保存快照）
|
||||
@@ -917,6 +995,8 @@ model SocialMonthlyProcess {
|
||||
id String @id @default(cuid())
|
||||
orgId String
|
||||
org Organization @relation(fields: [orgId], references: [id], onDelete: Cascade)
|
||||
accountId String? // 关联到账户（迁移后非空）
|
||||
account SocialAccount? @relation(fields: [accountId], references: [id])
|
||||
month String // 办理月份 YYYY-MM
|
||||
type String // SOCIAL=社保, HOUSING=公积金
|
||||
status String @default("COMPLETED") // COMPLETED=已办理
|
||||
@@ -928,6 +1008,7 @@ model SocialMonthlyProcess {
|
||||
|
||||
@@unique([orgId, month, type])
|
||||
@@index([orgId, month])
|
||||
@@index([accountId, month])
|
||||
}
|
||||
|
||||
model EmployeeDepartmentRecord {
|
||||
|
||||
@@ -0,0 +1,199 @@
|
||||
/**
|
||||
* 社保公积金账户化迁移脚本
|
||||
* 将旧 SocialInsuranceConfig / HousingFundConfig 迁移到 SocialAccount + SocialYearStandard
|
||||
* 将员工参保记录的 city 关联到 accountId
|
||||
*
|
||||
* 用法: npx tsx scripts/migrate-social-accounts.ts
|
||||
*/
|
||||
import prisma from '../src/lib/prisma'
|
||||
|
||||
async function main() {
|
||||
console.log('========== 社保公积金账户化迁移 ==========')
|
||||
|
||||
// ========== 1. 迁移社保配置 → 社保账户 + 年度标准 ==========
|
||||
console.log('[1/6] 迁移社保配置...')
|
||||
|
||||
// 按 (orgId, city) 分组创建社保账户
|
||||
const socialConfigs = await prisma.socialInsuranceConfig.findMany()
|
||||
const socialAccountMap = new Map<string, string>() // key: orgId:city → accountId
|
||||
|
||||
for (const config of socialConfigs) {
|
||||
const key = `${config.orgId}:${config.city}`
|
||||
if (socialAccountMap.has(key)) continue
|
||||
|
||||
const account = await prisma.socialAccount.create({
|
||||
data: {
|
||||
orgId: config.orgId,
|
||||
type: 'SOCIAL',
|
||||
name: `${config.city}社保账户`,
|
||||
city: config.city,
|
||||
isDefault: true,
|
||||
status: 'ACTIVE',
|
||||
createdBy: 'migration',
|
||||
},
|
||||
})
|
||||
socialAccountMap.set(key, account.id)
|
||||
console.log(` 创建社保账户: ${config.city} → ${account.id}`)
|
||||
}
|
||||
|
||||
// 迁移每条 Config → YearStandard
|
||||
for (const config of socialConfigs) {
|
||||
const key = `${config.orgId}:${config.city}`
|
||||
const accountId = socialAccountMap.get(key)!
|
||||
await prisma.socialYearStandard.create({
|
||||
data: {
|
||||
orgId: config.orgId,
|
||||
accountId,
|
||||
pensionOrg: config.pensionOrg,
|
||||
pensionEmp: config.pensionEmp,
|
||||
medicalOrg: config.medicalOrg,
|
||||
medicalEmp: config.medicalEmp,
|
||||
unemploymentOrg: config.unemploymentOrg,
|
||||
unemploymentEmp: config.unemploymentEmp,
|
||||
injuryOrg: config.injuryOrg,
|
||||
maternityOrg: config.maternityOrg,
|
||||
baseMin: config.baseMin,
|
||||
baseMax: config.baseMax,
|
||||
medicalBaseMin: config.medicalBaseMin,
|
||||
medicalBaseMax: config.medicalBaseMax,
|
||||
extraInsurances: config.extraInsurances as any,
|
||||
effectiveFrom: config.effectiveFrom,
|
||||
effectiveTo: config.effectiveTo,
|
||||
isCurrent: config.isCurrent,
|
||||
adjustmentDone: config.adjustmentDone,
|
||||
createdBy: config.createdBy,
|
||||
},
|
||||
})
|
||||
}
|
||||
console.log(` 迁移 ${socialConfigs.length} 条社保年度标准`)
|
||||
|
||||
// ========== 2. 迁移公积金配置 → 公积金账户 + 年度标准 ==========
|
||||
console.log('[2/6] 迁移公积金配置...')
|
||||
|
||||
const housingConfigs = await prisma.housingFundConfig.findMany()
|
||||
const housingAccountMap = new Map<string, string>() // key: orgId:city:accountType → accountId
|
||||
|
||||
for (const config of housingConfigs) {
|
||||
const accountType = config.accountType || 'BASIC'
|
||||
const key = `${config.orgId}:${config.city}:${accountType}`
|
||||
if (housingAccountMap.has(key)) continue
|
||||
|
||||
const account = await prisma.socialAccount.create({
|
||||
data: {
|
||||
orgId: config.orgId,
|
||||
type: 'HOUSING',
|
||||
name: `${config.city}${accountType === 'SUPPLEMENTARY' ? '补充' : ''}公积金账户`,
|
||||
city: config.city,
|
||||
accountType,
|
||||
isDefault: accountType === 'BASIC',
|
||||
status: 'ACTIVE',
|
||||
createdBy: 'migration',
|
||||
},
|
||||
})
|
||||
housingAccountMap.set(key, account.id)
|
||||
console.log(` 创建公积金账户: ${config.city} ${accountType} → ${account.id}`)
|
||||
}
|
||||
|
||||
for (const config of housingConfigs) {
|
||||
const accountType = config.accountType || 'BASIC'
|
||||
const key = `${config.orgId}:${config.city}:${accountType}`
|
||||
const accountId = housingAccountMap.get(key)!
|
||||
await prisma.socialYearStandard.create({
|
||||
data: {
|
||||
orgId: config.orgId,
|
||||
accountId,
|
||||
housingOrg: config.housingOrg,
|
||||
housingEmp: config.housingEmp,
|
||||
baseMin: config.baseMin,
|
||||
baseMax: config.baseMax,
|
||||
effectiveFrom: config.effectiveFrom,
|
||||
effectiveTo: config.effectiveTo,
|
||||
isCurrent: config.isCurrent,
|
||||
adjustmentDone: config.adjustmentDone,
|
||||
createdBy: config.createdBy,
|
||||
},
|
||||
})
|
||||
}
|
||||
console.log(` 迁移 ${housingConfigs.length} 条公积金年度标准`)
|
||||
|
||||
// ========== 3. 迁移员工社保参保记录 accountId ==========
|
||||
console.log('[3/6] 迁移员工社保参保记录 accountId...')
|
||||
|
||||
const socialRecords = await prisma.employeeSocialInsRecord.findMany({ where: { accountId: null } })
|
||||
let socialUpdated = 0
|
||||
for (const record of socialRecords) {
|
||||
const key = `${record.orgId}:${record.city}`
|
||||
const accountId = socialAccountMap.get(key)
|
||||
if (accountId) {
|
||||
await prisma.employeeSocialInsRecord.update({ where: { id: record.id }, data: { accountId } })
|
||||
socialUpdated++
|
||||
}
|
||||
}
|
||||
console.log(` 更新 ${socialUpdated}/${socialRecords.length} 条社保参保记录`)
|
||||
|
||||
// ========== 4. 迁移员工公积金参保记录 accountId ==========
|
||||
console.log('[4/6] 迁移员工公积金参保记录 accountId...')
|
||||
|
||||
const housingRecords = await prisma.employeeHousingFundRecord.findMany({ where: { accountId: null } })
|
||||
let housingUpdated = 0
|
||||
for (const record of housingRecords) {
|
||||
// 公积金默认用 BASIC 类型账户
|
||||
const key = `${record.orgId}:${record.city}:BASIC`
|
||||
const accountId = housingAccountMap.get(key)
|
||||
if (accountId) {
|
||||
await prisma.employeeHousingFundRecord.update({ where: { id: record.id }, data: { accountId } })
|
||||
housingUpdated++
|
||||
}
|
||||
}
|
||||
console.log(` 更新 ${housingUpdated}/${housingRecords.length} 条公积金参保记录`)
|
||||
|
||||
// ========== 5. 迁移月度办理记录 accountId ==========
|
||||
console.log('[5/6] 迁移月度办理记录 accountId...')
|
||||
|
||||
const monthlyProcesses = await prisma.socialMonthlyProcess.findMany({ where: { accountId: null } })
|
||||
let monthlyUpdated = 0
|
||||
for (const proc of monthlyProcesses) {
|
||||
const snapshot = proc.snapshot as any
|
||||
const city = snapshot?.city || snapshot?.configCity
|
||||
if (city) {
|
||||
const accountMap = proc.type === 'SOCIAL' ? socialAccountMap : housingAccountMap
|
||||
// 社保用 orgId:city，公积金用 orgId:city:BASIC
|
||||
const key = proc.type === 'SOCIAL' ? `${proc.orgId}:${city}` : `${proc.orgId}:${city}:BASIC`
|
||||
const accountId = accountMap.get(key)
|
||||
if (accountId) {
|
||||
await prisma.socialMonthlyProcess.update({ where: { id: proc.id }, data: { accountId } })
|
||||
monthlyUpdated++
|
||||
}
|
||||
}
|
||||
}
|
||||
console.log(` 更新 ${monthlyUpdated}/${monthlyProcesses.length} 条月度办理记录`)
|
||||
|
||||
// ========== 6. 验证数据完整性 ==========
|
||||
console.log('[6/6] 验证数据完整性...')
|
||||
|
||||
const accounts = await prisma.socialAccount.count()
|
||||
const standards = await prisma.socialYearStandard.count()
|
||||
const socialWithoutAccount = await prisma.employeeSocialInsRecord.count({ where: { accountId: null } })
|
||||
const housingWithoutAccount = await prisma.employeeHousingFundRecord.count({ where: { accountId: null } })
|
||||
|
||||
console.log(` 账户总数: ${accounts}`)
|
||||
console.log(` 年度标准总数: ${standards}`)
|
||||
console.log(` 社保参保记录无 accountId: ${socialWithoutAccount}`)
|
||||
console.log(` 公积金参保记录无 accountId: ${housingWithoutAccount}`)
|
||||
|
||||
if (socialWithoutAccount > 0 || housingWithoutAccount > 0) {
|
||||
console.log(' ⚠️ 部分参保记录未关联账户（可能城市无对应配置），需手动处理')
|
||||
}
|
||||
|
||||
console.log('')
|
||||
console.log('========== 迁移完成 ==========')
|
||||
}
|
||||
|
||||
main()
|
||||
.catch((e) => {
|
||||
console.error('迁移失败:', e)
|
||||
process.exit(1)
|
||||
})
|
||||
.finally(async () => {
|
||||
await prisma.$disconnect()
|
||||
})
|
||||
@@ -258,7 +258,22 @@ export async function calcBatchEntry(
|
||||
const ytdIncome = archivedEntries.reduce((s, e) => s + e.totalPay, 0) + totalPay
|
||||
const ytdSocialEmp = archivedEntries.reduce((s, e) => s + e.socialEmp, 0) + socialEmp
|
||||
const ytdHousingEmp = archivedEntries.reduce((s, e) => s + e.housingEmp, 0) + housingEmp
|
||||
const ytdSpecialDeduction = employee.specialDeduction * Number(month.slice(5, 7))
|
||||
|
||||
// 专项附加扣除：按月读取 SpecialDeductionRecord 实际填报金额累加
|
||||
// 优先使用按月记录；若无按月记录，回退到员工便捷字段 × 月数（兼容旧数据）
|
||||
const deductionRecords = await prisma.specialDeductionRecord.findMany({
|
||||
where: { orgId, employeeId, month: { startsWith: year, lte: month } },
|
||||
select: { amount: true, month: true },
|
||||
})
|
||||
let ytdSpecialDeduction: number
|
||||
if (deductionRecords.length > 0) {
|
||||
// 按月实际填报金额累加
|
||||
ytdSpecialDeduction = deductionRecords.reduce((s, r) => s + r.amount, 0)
|
||||
} else {
|
||||
// 回退：员工便捷字段 × 月数（兼容未填报按月记录的旧数据）
|
||||
ytdSpecialDeduction = employee.specialDeduction * Number(month.slice(5, 7))
|
||||
}
|
||||
|
||||
const ytdTaxDeducted = archivedEntries.reduce((s, e) => s + e.tax, 0)
|
||||
const deductionAmount = 5000 * Number(month.slice(5, 7))
|
||||
const ytdTaxableIncome = Math.max(0, ytdIncome - deductionAmount - ytdSocialEmp - ytdHousingEmp - ytdSpecialDeduction)
|
||||
@@ -271,6 +286,8 @@ export async function calcBatchEntry(
|
||||
ytdSocialEmp,
|
||||
ytdHousingEmp,
|
||||
ytdSpecialDeduction,
|
||||
specialDeductionSource: deductionRecords.length > 0 ? '按月记录' : '便捷字段',
|
||||
specialDeductionRecords: deductionRecords.length,
|
||||
ytdTaxableIncome,
|
||||
ytdTaxDeducted,
|
||||
currentMonthTax: tax,
|
||||
|
||||
Reference in New Issue
Block a user