first commit

target/classes/db/activity_school_add_template_status.sql

@@ -0,0 +1,7 @@
+-- 体育活动增加模板设置状态，并根据现有工作模板回填历史数据。
+ALTER TABLE `activity_school`
+  ADD COLUMN `templateStatus` tinyint(1) NOT NULL DEFAULT 0 COMMENT '模板设置状态 0.未设置 1.已设置' AFTER `isSave`;
+
+UPDATE `activity_school` school
+INNER JOIN `sys_home_template` template ON template.`id` = school.`id`
+SET school.`templateStatus` = 1;

target/classes/db/activity_tissue_add_template_status.sql

@@ -0,0 +1,8 @@
+-- 文化活动增加模板设置状态，并只回填校工会文化活动的历史模板数据。
+ALTER TABLE `activity_tissue`
+  ADD COLUMN `templateStatus` tinyint(1) NOT NULL DEFAULT 0 COMMENT '模板设置状态 0.未设置 1.已设置';
+
+UPDATE `activity_tissue` tissue
+INNER JOIN `sys_home_template` template ON template.`id` = tissue.`id`
+SET tissue.`templateStatus` = 1
+WHERE tissue.`activity_type` = 40001;

target/classes/db/activity_tissue_backfill_union_template_status.sql

@@ -0,0 +1,5 @@
+-- 使用现有模板设置状态字段，回填分工会文化活动的历史模板数据。
+UPDATE `activity_tissue` tissue
+INNER JOIN `sys_home_template` template ON template.`id` = tissue.`id`
+SET tissue.`templateStatus` = 1
+WHERE tissue.`activity_type` = 40002;

target/classes/db/activity_works_collection_add_template_status.sql

@@ -0,0 +1,7 @@
+-- 作品征集活动增加模板设置状态，并根据现有工作模板回填历史数据。
+ALTER TABLE `activity_works_collection`
+  ADD COLUMN `templateStatus` tinyint(1) NOT NULL DEFAULT 0 COMMENT '模板设置状态 0.未设置 1.已设置';
+
+UPDATE `activity_works_collection` activity
+INNER JOIN `sys_home_template` template ON template.`id` = activity.`id`
+SET activity.`templateStatus` = 1;

target/classes/db/evaluate_apply_add_history_import_fields.sql

@@ -0,0 +1,4 @@
+-- 评优评先申请表新增历史导入来源和类型名称字段。
+ALTER TABLE `evaluate_apply`
+  ADD COLUMN `source` int(2) DEFAULT 0 COMMENT '来源 0.流程申请 1.历史导入' AFTER `honorTypeId`,
+  ADD COLUMN `typeName` varchar(200) DEFAULT NULL COMMENT '类型名称' AFTER `source`;

target/classes/db/family_activity_add_template_status.sql

@@ -0,0 +1,7 @@
+-- 亲子活动增加模板设置状态，并根据现有工作模板回填历史数据。
+ALTER TABLE `family_activity`
+  ADD COLUMN `templateStatus` tinyint(1) NOT NULL DEFAULT 0 COMMENT '模板设置状态 0.未设置 1.已设置';
+
+UPDATE `family_activity` activity
+INNER JOIN `sys_home_template` template ON template.`id` = activity.`id`
+SET activity.`templateStatus` = 1;

target/classes/db/menu/init_pending_source_change_menu.sql

@@ -0,0 +1,64 @@
+-- 待确认人员记录菜单。以“变更记录”为同级菜单，并复制原变更记录菜单的角色授权。
+INSERT INTO sys_menu (
+    id, parentId, path, name, aliasName, type, href, target, icon, showit, disabled,
+    permission, note, location, hasChildren, createdBy, createdAt, updatedBy, updatedAt,
+    delFlag, platform, moduleId, picIcon, initialPinyinName, isRecommendApp, isRecommendService
+)
+SELECT
+    '76a21e7d35df4ffbaecce44b3a659901',
+    source_menu.parentId,
+    CONCAT(
+        LEFT(source_menu.path, CHAR_LENGTH(source_menu.path) - 4),
+        LPAD(
+            IFNULL((
+                SELECT MAX(CAST(RIGHT(child.path, 4) AS UNSIGNED))
+                FROM sys_menu child
+                WHERE child.parentId = source_menu.parentId
+            ), 0) + 1,
+            4,
+            '0'
+        )
+    ),
+    '待确认人员记录',
+    'Pending Personnel',
+    'menu',
+    '/platform/sourcechange/pending',
+    'data-pjax',
+    '',
+    1,
+    0,
+    'staff.sourcechange.pending',
+    '系统用户待确认和已确认人员记录',
+    source_menu.location + 1,
+    0,
+    '',
+    UNIX_TIMESTAMP(NOW()) * 1000,
+    '',
+    UNIX_TIMESTAMP(NOW()) * 1000,
+    0,
+    'PC',
+    source_menu.moduleId,
+    NULL,
+    'd',
+    0,
+    0
+FROM sys_menu source_menu
+WHERE source_menu.permission = 'staff.sourcechange.manage'
+  AND NOT EXISTS (
+      SELECT 1
+      FROM (SELECT id FROM sys_menu WHERE permission = 'staff.sourcechange.pending') existing_menu
+  );
+
+-- 原先能够查看“变更记录”的角色默认拥有待确认人员记录权限。
+INSERT INTO sys_role_menu (roleId, menuId)
+SELECT source_role.roleId, pending_menu.id
+FROM sys_role_menu source_role
+JOIN sys_menu source_menu
+  ON source_menu.id = source_role.menuId
+ AND source_menu.permission = 'staff.sourcechange.manage'
+JOIN sys_menu pending_menu
+  ON pending_menu.permission = 'staff.sourcechange.pending'
+LEFT JOIN sys_role_menu existing_role
+  ON existing_role.roleId = source_role.roleId
+ AND existing_role.menuId = pending_menu.id
+WHERE existing_role.roleId IS NULL;

target/classes/db/menu/init_tour_menu.sql

@@ -0,0 +1,122 @@
+-- 普惠疗休养平台电脑端菜单。
+-- 使用 permission 做幂等判断，避免同一环境重复执行时插入重复菜单。
+INSERT INTO sys_menu (id, parentId, path, name, aliasName, type, href, target, icon, showit, disabled, permission, note, location, hasChildren, createdBy, createdAt, updatedBy, updatedAt, delFlag, platform, moduleId, picIcon, initialPinyinName, isRecommendApp, isRecommendService)
+SELECT
+    'b7c63f0c73a44a9a8c4f3d3bb1a10001',
+    '',
+    LPAD(IFNULL(MAX(CAST(path AS UNSIGNED)), 0) + 1, 4, '0'),
+    '普惠疗休养',
+    'Tour',
+    'menu',
+    '',
+    '',
+    'ti-map-alt',
+    1,
+    0,
+    'tour',
+    NULL,
+    991,
+    1,
+    '',
+    UNIX_TIMESTAMP(NOW()) * 1000,
+    '',
+    UNIX_TIMESTAMP(NOW()) * 1000,
+    0,
+    'PC',
+    NULL,
+    NULL,
+    'p',
+    0,
+    0
+FROM sys_menu
+WHERE (parentId = '' OR parentId IS NULL)
+  AND CHAR_LENGTH(path) = 4
+HAVING NOT EXISTS (SELECT 1 FROM (SELECT id FROM sys_menu WHERE permission = 'tour') t);
+
+INSERT INTO sys_menu (id, parentId, path, name, aliasName, type, href, target, icon, showit, disabled, permission, note, location, hasChildren, createdBy, createdAt, updatedBy, updatedAt, delFlag, platform, moduleId, picIcon, initialPinyinName, isRecommendApp, isRecommendService)
+SELECT 'b7c63f0c73a44a9a8c4f3d3bb1a10002', p.id, CONCAT(p.path, '0001'), '疗休养设置', 'Tour Setting', 'menu', '/platform/tour/setting', 'data-pjax', '', 1, 0, 'tour.setting', NULL, 1, 0, '', UNIX_TIMESTAMP(NOW()) * 1000, '', UNIX_TIMESTAMP(NOW()) * 1000, 0, 'PC', NULL, NULL, 'l', 0, 0
+FROM sys_menu p
+WHERE p.permission = 'tour'
+  AND NOT EXISTS (SELECT 1 FROM (SELECT id FROM sys_menu WHERE permission = 'tour.setting') t);
+
+INSERT INTO sys_menu (id, parentId, path, name, aliasName, type, href, target, icon, showit, disabled, permission, note, location, hasChildren, createdBy, createdAt, updatedBy, updatedAt, delFlag, platform, moduleId, picIcon, initialPinyinName, isRecommendApp, isRecommendService)
+SELECT 'b7c63f0c73a44a9a8c4f3d3bb1a10003', p.id, CONCAT(p.path, '0002'), '服务单位管理', 'Service Unit', 'menu', '/platform/tour/travelAgency', 'data-pjax', '', 1, 0, 'tour.travelAgency', NULL, 2, 0, '', UNIX_TIMESTAMP(NOW()) * 1000, '', UNIX_TIMESTAMP(NOW()) * 1000, 0, 'PC', NULL, NULL, 'f', 0, 0
+FROM sys_menu p
+WHERE p.permission = 'tour'
+  AND NOT EXISTS (SELECT 1 FROM (SELECT id FROM sys_menu WHERE permission = 'tour.travelAgency') t);
+
+INSERT INTO sys_menu (id, parentId, path, name, aliasName, type, href, target, icon, showit, disabled, permission, note, location, hasChildren, createdBy, createdAt, updatedBy, updatedAt, delFlag, platform, moduleId, picIcon, initialPinyinName, isRecommendApp, isRecommendService)
+SELECT 'b7c63f0c73a44a9a8c4f3d3bb1a10004', p.id, CONCAT(p.path, '0003'), '线路管理', 'Route Manage', 'menu', '/platform/tour/route', 'data-pjax', '', 1, 0, 'tour.route', NULL, 3, 0, '', UNIX_TIMESTAMP(NOW()) * 1000, '', UNIX_TIMESTAMP(NOW()) * 1000, 0, 'PC', NULL, NULL, 'x', 0, 0
+FROM sys_menu p
+WHERE p.permission = 'tour'
+  AND NOT EXISTS (SELECT 1 FROM (SELECT id FROM sys_menu WHERE permission = 'tour.route') t);
+
+INSERT INTO sys_menu (id, parentId, path, name, aliasName, type, href, target, icon, showit, disabled, permission, note, location, hasChildren, createdBy, createdAt, updatedBy, updatedAt, delFlag, platform, moduleId, picIcon, initialPinyinName, isRecommendApp, isRecommendService)
+SELECT 'b7c63f0c73a44a9a8c4f3d3bb1a10005', p.id, CONCAT(p.path, '0004'), '疗休养事项', 'Tour Matter', 'menu', '/platform/tour/matter', 'data-pjax', '', 1, 0, 'tour.matter', NULL, 4, 0, '', UNIX_TIMESTAMP(NOW()) * 1000, '', UNIX_TIMESTAMP(NOW()) * 1000, 0, 'PC', NULL, NULL, 'l', 0, 0
+FROM sys_menu p
+WHERE p.permission = 'tour'
+  AND NOT EXISTS (SELECT 1 FROM (SELECT id FROM sys_menu WHERE permission = 'tour.matter') t);
+
+INSERT INTO sys_menu (id, parentId, path, name, aliasName, type, href, target, icon, showit, disabled, permission, note, location, hasChildren, createdBy, createdAt, updatedBy, updatedAt, delFlag, platform, moduleId, picIcon, initialPinyinName, isRecommendApp, isRecommendService)
+SELECT 'b7c63f0c73a44a9a8c4f3d3bb1a10006', p.id, CONCAT(p.path, '0005'), '疗休养报名', 'Tour Signup', 'menu', '/platform/tour/signup', 'data-pjax', '', 1, 0, 'tour.signup', NULL, 5, 0, '', UNIX_TIMESTAMP(NOW()) * 1000, '', UNIX_TIMESTAMP(NOW()) * 1000, 0, 'PC', NULL, NULL, 'l', 0, 0
+FROM sys_menu p
+WHERE p.permission = 'tour'
+  AND NOT EXISTS (SELECT 1 FROM (SELECT id FROM sys_menu WHERE permission = 'tour.signup') t);
+
+INSERT INTO sys_menu (id, parentId, path, name, aliasName, type, href, target, icon, showit, disabled, permission, note, location, hasChildren, createdBy, createdAt, updatedBy, updatedAt, delFlag, platform, moduleId, picIcon, initialPinyinName, isRecommendApp, isRecommendService)
+SELECT 'b7c63f0c73a44a9a8c4f3d3bb1a10008', p.id, CONCAT(p.path, '0006'), '我的报名', 'My Signup', 'menu', '/platform/tour/mysignup', 'data-pjax', '', 1, 0, 'tour.mysignup', NULL, 6, 0, '', UNIX_TIMESTAMP(NOW()) * 1000, '', UNIX_TIMESTAMP(NOW()) * 1000, 0, 'PC', NULL, NULL, 'w', 0, 0
+FROM sys_menu p
+WHERE p.permission = 'tour'
+  AND NOT EXISTS (SELECT 1 FROM (SELECT id FROM sys_menu WHERE permission = 'tour.mysignup') t);
+
+INSERT INTO sys_menu (id, parentId, path, name, aliasName, type, href, target, icon, showit, disabled, permission, note, location, hasChildren, createdBy, createdAt, updatedBy, updatedAt, delFlag, platform, moduleId, picIcon, initialPinyinName, isRecommendApp, isRecommendService)
+SELECT 'b7c63f0c73a44a9a8c4f3d3bb1a10009', p.id, CONCAT(p.path, '0007'), '分工会查询', 'Union Ledger', 'menu', '/platform/tour/unionledger', 'data-pjax', '', 1, 0, 'tour.unionledger', NULL, 7, 0, '', UNIX_TIMESTAMP(NOW()) * 1000, '', UNIX_TIMESTAMP(NOW()) * 1000, 0, 'PC', NULL, NULL, 'f', 0, 0
+FROM sys_menu p
+WHERE p.permission = 'tour'
+  AND NOT EXISTS (SELECT 1 FROM (SELECT id FROM sys_menu WHERE permission = 'tour.unionledger') t);
+
+INSERT INTO sys_menu (id, parentId, path, name, aliasName, type, href, target, icon, showit, disabled, permission, note, location, hasChildren, createdBy, createdAt, updatedBy, updatedAt, delFlag, platform, moduleId, picIcon, initialPinyinName, isRecommendApp, isRecommendService)
+SELECT 'b7c63f0c73a44a9a8c4f3d3bb1a10011', p.id, CONCAT(p.path, '0010'), '分工会审核', 'Union Approval', 'menu', '/platform/tour/unionApproval', 'data-pjax', '', 1, 0, 'tour.unionApproval', NULL, 8, 0, '', UNIX_TIMESTAMP(NOW()) * 1000, '', UNIX_TIMESTAMP(NOW()) * 1000, 0, 'PC', NULL, NULL, 'f', 0, 0
+FROM sys_menu p
+WHERE p.permission = 'tour'
+  AND NOT EXISTS (SELECT 1 FROM (SELECT id FROM sys_menu WHERE permission = 'tour.unionApproval') t);
+
+INSERT INTO sys_menu (id, parentId, path, name, aliasName, type, href, target, icon, showit, disabled, permission, note, location, hasChildren, createdBy, createdAt, updatedBy, updatedAt, delFlag, platform, moduleId, picIcon, initialPinyinName, isRecommendApp, isRecommendService)
+SELECT 'b7c63f0c73a44a9a8c4f3d3bb1a10012', p.id, CONCAT(p.path, '0011'), '校工会审核', 'School Union Approval', 'menu', '/platform/tour/schoolUnionApproval', 'data-pjax', '', 1, 0, 'tour.schoolUnionApproval', NULL, 9, 0, '', UNIX_TIMESTAMP(NOW()) * 1000, '', UNIX_TIMESTAMP(NOW()) * 1000, 0, 'PC', NULL, NULL, 'x', 0, 0
+FROM sys_menu p
+WHERE p.permission = 'tour'
+  AND NOT EXISTS (SELECT 1 FROM (SELECT id FROM sys_menu WHERE permission = 'tour.schoolUnionApproval') t);
+
+INSERT INTO sys_menu (id, parentId, path, name, aliasName, type, href, target, icon, showit, disabled, permission, note, location, hasChildren, createdBy, createdAt, updatedBy, updatedAt, delFlag, platform, moduleId, picIcon, initialPinyinName, isRecommendApp, isRecommendService)
+SELECT 'b7c63f0c73a44a9a8c4f3d3bb1a10007', p.id, CONCAT(p.path, '0008'), '疗休养台账', 'Tour Ledger', 'menu', '/platform/tour/ledger', 'data-pjax', '', 1, 0, 'tour.ledger', NULL, 10, 0, '', UNIX_TIMESTAMP(NOW()) * 1000, '', UNIX_TIMESTAMP(NOW()) * 1000, 0, 'PC', NULL, NULL, 'l', 0, 0
+FROM sys_menu p
+WHERE p.permission = 'tour'
+  AND NOT EXISTS (SELECT 1 FROM (SELECT id FROM sys_menu WHERE permission = 'tour.ledger') t);
+
+INSERT INTO sys_menu (id, parentId, path, name, aliasName, type, href, target, icon, showit, disabled, permission, note, location, hasChildren, createdBy, createdAt, updatedBy, updatedAt, delFlag, platform, moduleId, picIcon, initialPinyinName, isRecommendApp, isRecommendService)
+SELECT 'b7c63f0c73a44a9a8c4f3d3bb1a10010', p.id, CONCAT(p.path, '0009'), '线路成团', 'Tour Group', 'menu', '/platform/tour/group', 'data-pjax', '', 1, 0, 'tour.group', NULL, 11, 0, '', UNIX_TIMESTAMP(NOW()) * 1000, '', UNIX_TIMESTAMP(NOW()) * 1000, 0, 'PC', NULL, NULL, 'x', 0, 0
+FROM sys_menu p
+WHERE p.permission = 'tour'
+  AND NOT EXISTS (SELECT 1 FROM (SELECT id FROM sys_menu WHERE permission = 'tour.group') t);
+
+-- 给系统管理员默认授权，其他角色可在角色管理中按需分配。
+INSERT INTO sys_role_menu (roleId, menuId)
+SELECT r.id, m.id
+FROM sys_role r
+JOIN sys_menu m ON m.permission IN (
+    'tour',
+    'tour.setting',
+    'tour.travelAgency',
+    'tour.route',
+    'tour.matter',
+    'tour.signup',
+    'tour.group',
+    'tour.mysignup',
+    'tour.unionledger',
+    'tour.unionApproval',
+    'tour.schoolUnionApproval',
+    'tour.ledger'
+)
+LEFT JOIN sys_role_menu rm ON rm.roleId = r.id AND rm.menuId = m.id
+WHERE r.code = 'SYSADMIN'
+  AND rm.roleId IS NULL;

target/classes/db/menu/update_tour_service_unit_menu.sql

@@ -0,0 +1,8 @@
+-- 已初始化环境通过权限标识定位菜单，仅更新展示信息，不改变权限和访问路径。
+UPDATE sys_menu
+SET name = '服务单位管理',
+    aliasName = 'Service Unit',
+    initialPinyinName = 'f',
+    updatedAt = UNIX_TIMESTAMP(NOW()) * 1000
+WHERE permission = 'tour.travelAgency'
+  AND delFlag = 0;

target/classes/db/sys_user_add_pending_confirm_status.sql

@@ -0,0 +1,19 @@
+-- 系统用户增加人员待确认状态：0不用确认、1待确认、2已确认。
+-- 脚本支持重复执行，字段已存在时不再修改表结构。
+SET @pending_confirm_status_column_count = (
+    SELECT COUNT(*)
+    FROM information_schema.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE()
+      AND TABLE_NAME = 'sys_user'
+      AND COLUMN_NAME = 'pendingConfirmStatus'
+);
+
+SET @pending_confirm_status_ddl = IF(
+    @pending_confirm_status_column_count = 0,
+    'ALTER TABLE sys_user ADD COLUMN pendingConfirmStatus TINYINT NOT NULL DEFAULT 0 COMMENT ''待确认状态：0不用确认、1待确认、2已确认'' AFTER personType',
+    'SELECT 1'
+);
+
+PREPARE pending_confirm_status_stmt FROM @pending_confirm_status_ddl;
+EXECUTE pending_confirm_status_stmt;
+DEALLOCATE PREPARE pending_confirm_status_stmt;

target/classes/db/sys_user_role_add_enable.sql

@@ -0,0 +1,41 @@
+-- 用户角色关系增加启用状态，并按当前开启的教代会届次初始化历史数据。
+-- 脚本支持重复执行：字段已存在时不再重复修改表结构。
+SET @sys_user_role_enable_column_count = (
+    SELECT COUNT(*)
+    FROM information_schema.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE()
+      AND TABLE_NAME = 'sys_user_role'
+      AND COLUMN_NAME = 'enable'
+);
+
+SET @sys_user_role_enable_ddl = IF(
+    @sys_user_role_enable_column_count = 0,
+    'ALTER TABLE sys_user_role ADD COLUMN enable TINYINT(1) NOT NULL DEFAULT 1 COMMENT ''是否启用：1启用，0禁用'' AFTER userId',
+    'SELECT 1'
+);
+
+PREPARE sys_user_role_enable_stmt FROM @sys_user_role_enable_ddl;
+EXECUTE sys_user_role_enable_stmt;
+DEALLOCATE PREPARE sys_user_role_enable_stmt;
+
+-- 普通角色不受教代会届次切换影响，历史数据统一保持启用。
+UPDATE sys_user_role
+SET enable = 1
+WHERE tcSessionId IS NULL OR tcSessionId = '';
+
+-- 历史教代会届次角色先全部禁用，再只启用当前开启的最新届次。
+UPDATE sys_user_role
+SET enable = 0
+WHERE tcSessionId IS NOT NULL AND tcSessionId <> '';
+
+SET @current_teacher_congress_session_id = (
+    SELECT id
+    FROM teacher_congress_session
+    WHERE enable = 1
+    ORDER BY startDate DESC, createdAt DESC, id DESC
+    LIMIT 1
+);
+
+UPDATE sys_user_role
+SET enable = 1
+WHERE tcSessionId = @current_teacher_congress_session_id;

target/classes/db/tour_ledger_add_in_province_check_index.sql

@@ -0,0 +1,3 @@
+-- 省内参加间隔按工号、年度、线路类型和参加状态查询，补充联合索引降低报名校验耗时。
+ALTER TABLE `tour_ledger`
+  ADD KEY `idx_tour_ledger_in_province_check` (`jobNo`, `joined`, `delFlag`, `lineType`, `year`);

target/classes/db/tour_ledger_add_union_quota_index.sql

@@ -0,0 +1,3 @@
+-- 分工会名额校验按事项、分工会和删除状态统计报名人数，补充联合索引降低抢票时锁内查询耗时。
+ALTER TABLE `tour_ledger`
+  ADD KEY `idx_tour_ledger_matter_union_del` (`matterId`, `unionId`, `delFlag`);

target/classes/db/tour_setting_add_in_province_years.sql

@@ -0,0 +1,3 @@
+-- 疗休养配置增加省内参加间隔年限，历史配置默认不限制。
+ALTER TABLE `tour_setting`
+  ADD COLUMN `inProvinceYears` int DEFAULT 0 COMMENT '省内几年去一次' AFTER `maxGroupPeople`;

target/classes/db/tour_setting_add_travel_people_quota.sql

@@ -0,0 +1,3 @@
+-- 疗休养配置增加出行人数指标，历史配置默认按 0 处理。
+ALTER TABLE `tour_setting`
+  ADD COLUMN `travelPeopleQuota` int DEFAULT 0 COMMENT '出行人数指标' AFTER `tourType`;

target/classes/db/tour_setting_create.sql

@@ -0,0 +1,184 @@
+-- 普惠疗休养基础配置表。
+-- 若生产环境未开启 Nutz 自动建表，请先执行本脚本再使用“疗休养设置”菜单。
+CREATE TABLE IF NOT EXISTS `tour_setting` (
+  `id` varchar(32) NOT NULL COMMENT 'ID',
+  `year` int DEFAULT NULL COMMENT '年度',
+  `configName` varchar(100) DEFAULT NULL COMMENT '疗休养配置名称',
+  `tourType` varchar(50) DEFAULT NULL COMMENT '疗休养类型',
+  `activityGroupId` varchar(32) DEFAULT NULL COMMENT '可参加人员范围ID',
+  `sortNo` int DEFAULT NULL COMMENT '排序编号',
+  `minGroupPeople` int DEFAULT NULL COMMENT '最少成团人数',
+  `maxGroupPeople` int DEFAULT NULL COMMENT '最多成团人数',
+  `inProvinceYears` int DEFAULT 0 COMMENT '省内几年去一次',
+  `outProvinceYears` int DEFAULT NULL COMMENT '省外几年去一次',
+  `outProvinceRatio` decimal(10,2) DEFAULT NULL COMMENT '省外人数占比',
+  `outProvinceRatioType` varchar(50) DEFAULT '当年报名人数' COMMENT '省外人数占比类型',
+  `outProvinceFixedPeople` int DEFAULT 0 COMMENT '省外固定人数',
+  `cycleStartYear` int DEFAULT NULL COMMENT '周期开始年度',
+  `cycleEndYear` int DEFAULT NULL COMMENT '周期结束年度',
+  `cycleTotalCost` int DEFAULT NULL COMMENT '周期内总费用',
+  `cycleAllowedTimes` int DEFAULT NULL COMMENT '周期允许次数',
+  `allowFamily` tinyint(1) DEFAULT 0 COMMENT '是否允许携带家属',
+  `fillBedInfo` tinyint(1) DEFAULT 1 COMMENT '是否填报床位信息',
+  `enabled` tinyint(1) DEFAULT 1 COMMENT '是否启用',
+  `serviceNotice` text COMMENT '服务须知',
+  `createdBy` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `createdAt` bigint DEFAULT NULL COMMENT '创建时间',
+  `updatedBy` varchar(32) DEFAULT NULL COMMENT '修改人',
+  `updatedAt` bigint DEFAULT NULL COMMENT '修改时间',
+  `delFlag` tinyint(1) DEFAULT 0 COMMENT '删除标记',
+  PRIMARY KEY (`id`),
+  KEY `idx_tour_setting_year` (`year`),
+  KEY `idx_tour_setting_activity_group` (`activityGroupId`),
+  KEY `idx_tour_setting_sort` (`sortNo`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='普惠疗休养配置';
+
+-- 疗休养配置标段表。
+-- 标段先挂在配置上维护，后续线路、旅行社、报名等模块可继续通过 lotId 做业务关联。
+CREATE TABLE IF NOT EXISTS `tour_setting_lot` (
+  `id` varchar(32) NOT NULL COMMENT 'ID',
+  `settingId` varchar(32) DEFAULT NULL COMMENT '所属配置ID',
+  `lotName` varchar(50) DEFAULT NULL COMMENT '标段名称',
+  `lotValue` varchar(50) DEFAULT NULL COMMENT '标段值',
+  `activityCost` int DEFAULT NULL COMMENT '标段费用',
+  `allowOverReimbursement` tinyint(1) DEFAULT 0 COMMENT '允许超出报销',
+  `createdBy` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `createdAt` bigint DEFAULT NULL COMMENT '创建时间',
+  `updatedBy` varchar(32) DEFAULT NULL COMMENT '修改人',
+  `updatedAt` bigint DEFAULT NULL COMMENT '修改时间',
+  `delFlag` tinyint(1) DEFAULT 0 COMMENT '删除标记',
+  PRIMARY KEY (`id`),
+  KEY `idx_tour_setting_lot_setting` (`settingId`),
+  KEY `idx_tour_setting_lot_value` (`lotValue`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='普惠疗休养配置标段';
+
+-- 旅行社管理表。
+CREATE TABLE IF NOT EXISTS `tour_travel_agency` (
+  `id` varchar(32) NOT NULL COMMENT 'ID',
+  `year` int DEFAULT NULL COMMENT '年度',
+  `agencyCode` varchar(50) DEFAULT NULL COMMENT '旅行社编号',
+  `agencyName` varchar(100) DEFAULT NULL COMMENT '旅行社名称',
+  `contactName` varchar(30) DEFAULT NULL COMMENT '联系人',
+  `contactPhone` varchar(30) DEFAULT NULL COMMENT '联系人手机',
+  `email` varchar(100) DEFAULT NULL COMMENT '邮箱',
+  `remark` text COMMENT '备注',
+  `mobileThumb` varchar(500) DEFAULT NULL COMMENT '移动端缩略图',
+  `enabled` tinyint(1) DEFAULT 1 COMMENT '激活状态',
+  `createdBy` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `createdAt` bigint DEFAULT NULL COMMENT '创建时间',
+  `updatedBy` varchar(32) DEFAULT NULL COMMENT '修改人',
+  `updatedAt` bigint DEFAULT NULL COMMENT '修改时间',
+  `delFlag` tinyint(1) DEFAULT 0 COMMENT '删除标记',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_tour_travel_agency_year_code` (`year`, `agencyCode`),
+  KEY `idx_tour_travel_agency_name` (`agencyName`),
+  KEY `idx_tour_travel_agency_contact` (`contactName`, `contactPhone`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='普惠疗休养旅行社';
+
+-- 线路管理表。
+CREATE TABLE IF NOT EXISTS `tour_line` (
+  `id` varchar(32) NOT NULL COMMENT 'ID',
+  `year` int DEFAULT NULL COMMENT '创建年度',
+  `lineCode` varchar(50) DEFAULT NULL COMMENT '线路编号',
+  `lineName` varchar(100) DEFAULT NULL COMMENT '线路名称',
+  `travelAgencyId` varchar(32) DEFAULT NULL COMMENT '旅行社ID',
+  `creatorUserId` varchar(32) DEFAULT NULL COMMENT '创建人ID',
+  `creatorName` varchar(100) DEFAULT NULL COMMENT '创建人',
+  `unitId` varchar(32) DEFAULT NULL COMMENT '所在单位ID',
+  `unitName` varchar(100) DEFAULT NULL COMMENT '所在单位',
+  `lineType` varchar(50) DEFAULT NULL COMMENT '线路类型',
+  `lotId` varchar(32) DEFAULT NULL COMMENT '时间标段ID',
+  `lineContent` text COMMENT '线路内容',
+  `mobileThumb` varchar(500) DEFAULT NULL COMMENT '移动端缩略图',
+  `openFlag` tinyint(1) DEFAULT 1 COMMENT '是否对外开放',
+  `directFamilyUnitLine` tinyint(1) DEFAULT 0 COMMENT '是否直系亲属线路',
+  `enabled` tinyint(1) DEFAULT 1 COMMENT '激活状态',
+  `createdBy` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `createdAt` bigint DEFAULT NULL COMMENT '创建时间',
+  `updatedBy` varchar(32) DEFAULT NULL COMMENT '修改人',
+  `updatedAt` bigint DEFAULT NULL COMMENT '修改时间',
+  `delFlag` tinyint(1) DEFAULT 0 COMMENT '删除标记',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_tour_line_year_code` (`year`, `lineCode`),
+  KEY `idx_tour_line_year` (`year`),
+  KEY `idx_tour_line_name` (`lineName`),
+  KEY `idx_tour_line_agency` (`travelAgencyId`),
+  KEY `idx_tour_line_creator` (`creatorUserId`),
+  KEY `idx_tour_line_unit` (`unitId`),
+  KEY `idx_tour_line_lot` (`lotId`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='普惠疗休养线路';
+
+-- 疗休养事项表。
+CREATE TABLE IF NOT EXISTS `tour_matter` (
+  `id` varchar(32) NOT NULL COMMENT 'ID',
+  `year` int DEFAULT NULL COMMENT '年度',
+  `matterName` varchar(100) DEFAULT NULL COMMENT '事项名称',
+  `settingId` varchar(32) DEFAULT NULL COMMENT '疗休养配置ID',
+  `creatorUserId` varchar(32) DEFAULT NULL COMMENT '创建人ID',
+  `creatorName` varchar(100) DEFAULT NULL COMMENT '创建人',
+  `unionId` varchar(32) DEFAULT NULL COMMENT '所属工会ID',
+  `organizationType` varchar(100) DEFAULT NULL COMMENT '组织形式',
+  `mobileThumb` varchar(500) DEFAULT NULL COMMENT '移动端缩略图',
+  `enabled` tinyint(1) DEFAULT 1 COMMENT '事项状态',
+  `createdBy` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `createdAt` bigint DEFAULT NULL COMMENT '创建时间',
+  `updatedBy` varchar(32) DEFAULT NULL COMMENT '修改人',
+  `updatedAt` bigint DEFAULT NULL COMMENT '修改时间',
+  `delFlag` tinyint(1) DEFAULT 0 COMMENT '删除标记',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_tour_matter_year_name` (`year`, `matterName`),
+  KEY `idx_tour_matter_year` (`year`),
+  KEY `idx_tour_matter_creator` (`creatorUserId`),
+  KEY `idx_tour_matter_setting` (`settingId`),
+  KEY `idx_tour_matter_union` (`unionId`),
+  KEY `idx_tour_matter_org_type` (`organizationType`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='普惠疗休养事项';
+
+-- 疗休养事项批次表。
+CREATE TABLE IF NOT EXISTS `tour_matter_batch` (
+  `id` varchar(32) NOT NULL COMMENT 'ID',
+  `matterId` varchar(32) DEFAULT NULL COMMENT '事项ID',
+  `lineId` varchar(32) DEFAULT NULL COMMENT '线路ID',
+  `batchName` varchar(100) DEFAULT NULL COMMENT '批次名称',
+  `signupStartTime` varchar(20) DEFAULT NULL COMMENT '报名开始时间',
+  `signupEndTime` varchar(20) DEFAULT NULL COMMENT '报名结束时间',
+  `travelStartTime` varchar(20) DEFAULT NULL COMMENT '出行开始时间',
+  `travelEndTime` varchar(20) DEFAULT NULL COMMENT '出行结束时间',
+  `changeDeadline` varchar(20) DEFAULT NULL COMMENT '变更截止时间',
+  `contactName` varchar(30) DEFAULT NULL COMMENT '联系人',
+  `contactPhone` varchar(30) DEFAULT NULL COMMENT '联系方式',
+  `minGroupPeople` int DEFAULT NULL COMMENT '最少成团人数',
+  `maxGroupPeople` int DEFAULT NULL COMMENT '最多成团人数',
+  `estimatedCost` decimal(10,2) DEFAULT NULL COMMENT '预计费用',
+  `enabled` tinyint(1) DEFAULT 1 COMMENT '状态',
+  `createdBy` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `createdAt` bigint DEFAULT NULL COMMENT '创建时间',
+  `updatedBy` varchar(32) DEFAULT NULL COMMENT '修改人',
+  `updatedAt` bigint DEFAULT NULL COMMENT '修改时间',
+  `delFlag` tinyint(1) DEFAULT 0 COMMENT '删除标记',
+  PRIMARY KEY (`id`),
+  KEY `idx_tour_matter_batch_matter` (`matterId`),
+  KEY `idx_tour_matter_batch_line` (`lineId`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='普惠疗休养事项批次';
+
+-- 直系亲属线路报名信息表。
+CREATE TABLE IF NOT EXISTS `tour_ledger_direct_relative` (
+  `id` varchar(32) NOT NULL COMMENT 'ID',
+  `ledgerId` varchar(32) DEFAULT NULL COMMENT '台账ID',
+  `relativeName` varchar(100) DEFAULT NULL COMMENT '亲属姓名',
+  `unitName` varchar(100) DEFAULT NULL COMMENT '所在单位',
+  `relationshipCode` varchar(50) DEFAULT NULL COMMENT '亲属关系编码',
+  `relationshipName` varchar(50) DEFAULT NULL COMMENT '亲属关系',
+  `lineId` varchar(32) DEFAULT NULL COMMENT '线路ID',
+  `lineName` varchar(100) DEFAULT NULL COMMENT '线路名称',
+  `travelStartTime` varchar(20) DEFAULT NULL COMMENT '出行开始日期',
+  `travelEndTime` varchar(20) DEFAULT NULL COMMENT '出行结束日期',
+  `createdBy` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `createdAt` bigint DEFAULT NULL COMMENT '创建时间',
+  `updatedBy` varchar(32) DEFAULT NULL COMMENT '修改人',
+  `updatedAt` bigint DEFAULT NULL COMMENT '修改时间',
+  `delFlag` tinyint(1) DEFAULT 0 COMMENT '删除标记',
+  PRIMARY KEY (`id`),
+  KEY `idx_tour_ledger_direct_relative_ledger` (`ledgerId`),
+  KEY `idx_tour_ledger_direct_relative_line` (`lineId`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='普惠疗休养直系亲属线路报名信息';

target/classes/db/tour_setting_union_quota_create.sql

@@ -0,0 +1,17 @@
+-- 疗休养配置分工会人员分配表，人员数量合计受配置的出行人数指标约束。
+CREATE TABLE IF NOT EXISTS `tour_setting_union_quota` (
+  `id` varchar(32) NOT NULL COMMENT 'ID',
+  `settingId` varchar(32) DEFAULT NULL COMMENT '所属疗休养配置ID',
+  `unionId` varchar(32) DEFAULT NULL COMMENT '分工会ID',
+  `unionName` varchar(100) DEFAULT NULL COMMENT '分工会名称',
+  `peopleQuota` int DEFAULT 0 COMMENT '人员数量',
+  `createdBy` varchar(32) DEFAULT NULL COMMENT '创建人',
+  `createdAt` bigint DEFAULT NULL COMMENT '创建时间',
+  `updatedBy` varchar(32) DEFAULT NULL COMMENT '修改人',
+  `updatedAt` bigint DEFAULT NULL COMMENT '修改时间',
+  `delFlag` tinyint(1) DEFAULT 0 COMMENT '删除标记',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_tour_setting_union_quota_setting_union` (`settingId`, `unionId`),
+  KEY `idx_tour_setting_union_quota_setting` (`settingId`),
+  KEY `idx_tour_setting_union_quota_union` (`unionId`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='疗休养配置分工会人员分配';

target/classes/db/train_sign_up_activity_add_template_status.sql

@@ -0,0 +1,7 @@
+-- 品牌活动增加模板设置状态，并根据现有工作模板回填历史数据。
+ALTER TABLE `train_sign_up_activity`
+  ADD COLUMN `templateStatus` tinyint(1) NOT NULL DEFAULT 0 COMMENT '模板设置状态 0.未设置 1.已设置';
+
+UPDATE `train_sign_up_activity` activity
+INNER JOIN `sys_home_template` template ON template.`id` = activity.`id`
+SET activity.`templateStatus` = 1;