From d91b0fe413a24ca61c1da557be855566138b7d7a Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期五, 30 十月 2026 12:16:20 +0800
Subject: [PATCH] fix(hrm): 补充缺失字典 hrm_holiday_type,修复节假日类型下拉框无选项
---
sql/mysql/add_dict_hrm_holiday_type_20261030.sql | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/sql/mysql/add_dict_hrm_holiday_type_20261030.sql b/sql/mysql/add_dict_hrm_holiday_type_20261030.sql
new file mode 100644
index 0000000..d908c49
--- /dev/null
+++ b/sql/mysql/add_dict_hrm_holiday_type_20261030.sql
@@ -0,0 +1,48 @@
+-- ============================================================
+-- 琛ュ厖缂哄け鐨勫瓧鍏革細hrm_holiday_type锛堣�冨嫟鑺傚亣鏃ョ被鍨嬶級
+-- 鐢熸垚鏃堕棿锛�2026-10-30
+--
+-- 闂锛氳妭鍋囨棩閰嶇疆椤甸潰鐨勩�岀被鍨嬨�嶆帶浠舵病鏈変换浣曢�夐」
+-- 鍒楄〃鎼滅储鐨� Select 涓庣紪杈戝脊绐楃殑 RadioGroup 閮藉彇
+-- getDictOptions(DICT_TYPE.HRM_HOLIDAY_TYPE)
+-- 鑰� system_dict_type / system_dict_data 閲屽畬鍏ㄦ病鏈夎繖涓瓧鍏�
+--
+-- 渚濇嵁锛氬悗绔灇涓� HrmAttendanceHolidayTypeEnum
+-- REST_DAY(1, "浼戞伅鏃�")
+-- WORK_DAY(2, "宸ヤ綔鏃�")
+--
+-- 瀵规瘮锛氬叾浣� 14 涓� hrm_* 瀛楀吀閮藉凡瀛樺湪锛屼粎缂烘涓�涓�
+-- 骞傜瓑锛歄N DUPLICATE KEY UPDATE锛屽彲閲嶅鎵ц
+-- ============================================================
+
+-- ---------- 1. 瀛楀吀绫诲瀷 ----------
+INSERT INTO `system_dict_type`
+ (`name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`)
+VALUES
+ ('鑰冨嫟鑺傚亣鏃ョ被鍨�', 'hrm_holiday_type', 0, '鑰冨嫟鑺傚亣鏃ラ厤缃殑绫诲瀷锛氫紤鎭棩 / 宸ヤ綔鏃�',
+ '1', NOW(), '1', NOW(), b'0', NULL)
+ON DUPLICATE KEY UPDATE
+ `name` = VALUES(`name`), `status` = VALUES(`status`), `remark` = VALUES(`remark`),
+ `deleted` = b'0', `update_time` = NOW();
+
+-- ---------- 2. 瀛楀吀鏁版嵁 ----------
+INSERT INTO `system_dict_data`
+ (`sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`,
+ `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`)
+VALUES
+ (1, '浼戞伅鏃�', '1', 'hrm_holiday_type', 0, 'info', '', '鏀惧亣/浼戞伅鐨勬棩瀛愶紝鎵撳崱鎸変紤鎭棩瑙勫垯', '1', NOW(), '1', NOW(), b'0'),
+ (2, '宸ヤ綔鏃�', '2', 'hrm_holiday_type', 0, 'success', '', '璋冧紤涓婄彮鐨勬棩瀛愶紝鎵撳崱鎸夊伐浣滄棩瑙勫垯', '1', NOW(), '1', NOW(), b'0')
+ON DUPLICATE KEY UPDATE
+ `label` = VALUES(`label`), `sort` = VALUES(`sort`), `status` = VALUES(`status`),
+ `color_type` = VALUES(`color_type`), `remark` = VALUES(`remark`), `deleted` = b'0';
+
+-- ---------- 3. 鏍¢獙 ----------
+SELECT t.type, t.name, t.status, t.deleted+0 AS del,
+ COUNT(d.id) AS 鏁版嵁鏉℃暟
+ FROM system_dict_type t
+ LEFT JOIN system_dict_data d ON d.dict_type = t.type AND d.deleted = b'0'
+ WHERE t.type = 'hrm_holiday_type'
+ GROUP BY t.type, t.name, t.status, t.deleted;
+
+SELECT sort, label, value, color_type FROM system_dict_data
+ WHERE dict_type = 'hrm_holiday_type' AND deleted = b'0' ORDER BY sort;
--
Gitblit v1.9.3