freedak/TurboHR
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 社保公积金月度办理排除劳务/实习协议员工

Browse Source
This commit is contained in:
freedakgmail
2026-08-18 07:15:05 +08:00
parent 17fafc5a03
commit c24cc68cd8
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/routes/social.routes.ts
+13 -11
View File
@@ -1275,17 +1275,17 @@ router.get('/monthly-changes', async (req: AuthRequest, res: Response, next: Nex
const month = (req.query.month as string) || new Date().toISOString().slice(0, 7) const month = (req.query.month as string) || new Date().toISOString().slice(0, 7)
const orgId = req.user!.orgId const orgId = req.user!.orgId
// 增员：startMonth == month // 增员：startMonth == month（排除劳务/实习协议员工）
const additions = await prisma.employeeSocialInsRecord.findMany({ const additions = await prisma.employeeSocialInsRecord.findMany({
where: { orgId, startMonth: month }, where: { orgId, startMonth: month, employee: { contracts: { some: { contractType: { in: ['FIXED', 'UNFIXED'] } } } } },
include: { employee: { select: { name: true, department: true, idCardNumber: true } } }, include: { employee: { select: { name: true, department: true, idCardNumber: true, contracts: { orderBy: { createdAt: 'desc' }, take: 1, select: { contractType: true } } } } },
orderBy: { createdAt: 'asc' }, orderBy: { createdAt: 'asc' },
}) })
// 减员：endMonth == month 且 changeType 为 TERMINATION 或 CITY_CHANGE // 减员：endMonth == month 且 changeType 为 TERMINATION 或 CITY_CHANGE
const reductions = await prisma.employeeSocialInsRecord.findMany({ const reductions = await prisma.employeeSocialInsRecord.findMany({
where: { orgId, endMonth: month, changeType: { in: ['TERMINATION', 'CITY_CHANGE'] } }, where: { orgId, endMonth: month, changeType: { in: ['TERMINATION', 'CITY_CHANGE'] }, employee: { contracts: { some: { contractType: { in: ['FIXED', 'UNFIXED'] } } } } },
include: { employee: { select: { name: true, department: true, idCardNumber: true } } }, include: { employee: { select: { name: true, department: true, idCardNumber: true, contracts: { orderBy: { createdAt: 'desc' }, take: 1, select: { contractType: true } } } } },
orderBy: { createdAt: 'asc' }, orderBy: { createdAt: 'asc' },
}) })
@@ -1350,14 +1350,14 @@ router.get('/housing/monthly-changes', async (req: AuthRequest, res: Response, n
const orgId = req.user!.orgId const orgId = req.user!.orgId
const additions = await prisma.employeeHousingFundRecord.findMany({ const additions = await prisma.employeeHousingFundRecord.findMany({
where: { orgId, startMonth: month }, where: { orgId, startMonth: month, employee: { contracts: { some: { contractType: { in: ['FIXED', 'UNFIXED'] } } } } },
include: { employee: { select: { name: true, department: true, idCardNumber: true } } }, include: { employee: { select: { name: true, department: true, idCardNumber: true, contracts: { orderBy: { createdAt: 'desc' }, take: 1, select: { contractType: true } } } } },
orderBy: { createdAt: 'asc' }, orderBy: { createdAt: 'asc' },
}) })
const reductions = await prisma.employeeHousingFundRecord.findMany({ const reductions = await prisma.employeeHousingFundRecord.findMany({
where: { orgId, endMonth: month, changeType: { in: ['TERMINATION', 'CITY_CHANGE'] } }, where: { orgId, endMonth: month, changeType: { in: ['TERMINATION', 'CITY_CHANGE'] }, employee: { contracts: { some: { contractType: { in: ['FIXED', 'UNFIXED'] } } } } },
include: { employee: { select: { name: true, department: true, idCardNumber: true } } }, include: { employee: { select: { name: true, department: true, idCardNumber: true, contracts: { orderBy: { createdAt: 'desc' }, take: 1, select: { contractType: true } } } } },
orderBy: { createdAt: 'asc' }, orderBy: { createdAt: 'asc' },
}) })
@@ -1421,8 +1421,9 @@ router.get('/active-declaration', async (req: AuthRequest, res: Response, next:
orgId, orgId,
startMonth: { lt: month }, startMonth: { lt: month },
OR: [{ endMonth: null }, { endMonth: { gt: month } }], OR: [{ endMonth: null }, { endMonth: { gt: month } }],
employee: { contracts: { some: { contractType: { in: ['FIXED', 'UNFIXED'] } } } },
}, },
include: { employee: { select: { name: true, department: true, idCardNumber: true, hireDate: true } } }, include: { employee: { select: { name: true, department: true, idCardNumber: true, hireDate: true, contracts: { orderBy: { createdAt: 'desc' }, take: 1, select: { contractType: true } } } } },
orderBy: { createdAt: 'asc' }, orderBy: { createdAt: 'asc' },
}) })
@@ -1483,8 +1484,9 @@ router.get('/housing/active-declaration', async (req: AuthRequest, res: Response
orgId, orgId,
startMonth: { lt: month }, startMonth: { lt: month },
OR: [{ endMonth: null }, { endMonth: { gt: month } }], OR: [{ endMonth: null }, { endMonth: { gt: month } }],
employee: { contracts: { some: { contractType: { in: ['FIXED', 'UNFIXED'] } } } },
}, },
include: { employee: { select: { name: true, department: true, idCardNumber: true, hireDate: true } } }, include: { employee: { select: { name: true, department: true, idCardNumber: true, hireDate: true, contracts: { orderBy: { createdAt: 'desc' }, take: 1, select: { contractType: true } } } } },
orderBy: { createdAt: 'asc' }, orderBy: { createdAt: 'asc' },
}) })