修正
This commit is contained in:
@@ -310,6 +310,17 @@ def build_voucher_summary(
|
||||
emp_name = emp_row.get("name")
|
||||
else:
|
||||
emp_code, emp_name = emp_row
|
||||
|
||||
# 雇用形態を最新の給与設定から取得
|
||||
cur.execute(
|
||||
"SELECT employment_type FROM salary_settings WHERE employee_id = %s ORDER BY valid_from DESC LIMIT 1",
|
||||
(emp_id,)
|
||||
)
|
||||
ss_row = cur.fetchone()
|
||||
if ss_row:
|
||||
employment_type = ss_row.get("employment_type") if isinstance(ss_row, dict) else ss_row[0]
|
||||
else:
|
||||
employment_type = None
|
||||
except Exception as e:
|
||||
logger.error(f"従業員情報取得エラー: {str(e)}")
|
||||
continue
|
||||
@@ -333,6 +344,7 @@ def build_voucher_summary(
|
||||
employee_id=emp_id,
|
||||
employee_code=emp_code,
|
||||
employee_name=emp_name,
|
||||
employment_type=employment_type,
|
||||
has_salary_data=len(salary_list) > 0,
|
||||
has_bonus_data=len(bonus_list) > 0,
|
||||
salary_count=len(salary_list),
|
||||
|
||||
Reference in New Issue
Block a user