desktop/njts-accounting-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 子ども・子育て支援金を給与・賞与計算に追加（令和8年4月以降）

Browse Source
This commit is contained in:
admin
2026-04-27 01:04:54 +09:00
parent 31a64d5b59
commit a646a81719
9 changed files with 3988 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
backend/app/payroll/bonus/router.py
View File

@@ -38,12 +38,14 @@ def calculate_bonus(request: schemas.BonusCalculationRequest):
employee_id, bonus_year, bonus_month, bonus_type, payment_date, status,
base_bonus, performance_bonus, other_bonus, total_bonus,
health_insurance, care_insurance, pension_insurance, employment_insurance,
child_support,
income_tax, other_deduction, total_deduction,
net_bonus, calculated_at, calculated_by
) VALUES (
%s, %s, %s, %s, %s, %s,
%s, %s, %s, %s,
%s, %s, %s, %s,
%s,
%s, %s, %s,
%s, %s, %s
)
@@ -56,6 +58,7 @@ def calculate_bonus(request: schemas.BonusCalculationRequest):
calc_result["other_bonus"], calc_result["total_bonus"],
calc_result["health_insurance"], calc_result["care_insurance"],
calc_result["pension_insurance"], calc_result["employment_insurance"],
calc_result["child_support"],
calc_result["income_tax"], calc_result["other_deduction"],
calc_result["total_deduction"],
calc_result["net_bonus"], datetime.now(), calc_result["calculated_by"]
@@ -196,7 +199,12 @@ def delete_bonus(bonus_id: int):
"""賞与を削除"""
with get_connection() as conn:
with conn.cursor() as cur:
cur.execute("DELETE FROM bonus_payments WHERE bonus_id = %s AND status = 'draft'", (bonus_id,))
if cur.rowcount == 0:
# 承認済みは削除不可
cur.execute("SELECT status FROM bonus_payments WHERE bonus_id = %s", (bonus_id,))
row = cur.fetchone()
if not row:
raise HTTPException(status_code=404, detail="賞与が見つかりません、または削除できません")
if row["status"] == "approved":
raise HTTPException(status_code=400, detail="承認済みの賞与は削除できません")
cur.execute("DELETE FROM bonus_payments WHERE bonus_id = %s", (bonus_id,))
conn.commit()