fix: 公积金基数上下限独立于社保
问题:SocialYearStandard 只有一套 baseMin/baseMax,社保和公积金 共用,但公积金下限通常是最低工资标准(如北京2420),远低于社保 下限(如北京6326)。 修复: - SocialYearStandard 新增 housingBaseMin/housingBaseMax 字段 - clampHousingFundBase 优先用公积金专用上下限,为0时回退到社保 - calcHousingFund 同样优先用公积金专用上下限 - 前端公积金年度标准表单加公积金基数上下限输入 - 前端公积金当前标准展示用公积金专用上下限 同时修复 blank_employees/blank_all 模式跳过试用期工资覆盖 Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
@@ -39,7 +39,12 @@ async function clampHousingFundBase(orgId: string, base: number, city?: string,
|
||||
where: { accountId, isCurrent: true },
|
||||
orderBy: { effectiveFrom: 'desc' },
|
||||
})
|
||||
if (standard) return Math.min(Math.max(base, standard.baseMin), standard.baseMax)
|
||||
if (standard) {
|
||||
// 公积金专用上下限(housingBaseMin/Max),为0时回退到社保的 baseMin/baseMax
|
||||
const min = standard.housingBaseMin > 0 ? standard.housingBaseMin : standard.baseMin
|
||||
const max = standard.housingBaseMax > 0 ? standard.housingBaseMax : standard.baseMax
|
||||
return Math.min(Math.max(base, min), max)
|
||||
}
|
||||
}
|
||||
// 回退到旧配置表
|
||||
const config = await prisma.housingFundConfig.findFirst({
|
||||
|
||||
Reference in New Issue
Block a user