1

src/main/resources/db/menu/init_tour_menu.sql

@@ -40,7 +40,7 @@ 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'), '旅行社管理', 'Travel Agency', '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, 'l', 0, 0
+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);

src/main/resources/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`;

src/main/resources/db/tour_setting_create.sql

@@ -5,6 +5,7 @@ CREATE TABLE IF NOT EXISTS `tour_setting` (
   `year` int DEFAULT NULL COMMENT '年度',
   `configName` varchar(100) DEFAULT NULL COMMENT '疗休养配置名称',
   `tourType` varchar(50) DEFAULT NULL COMMENT '疗休养类型',
+  `travelPeopleQuota` int DEFAULT 0 COMMENT '出行人数指标',
   `activityGroupId` varchar(32) DEFAULT NULL COMMENT '可参加人员范围ID',
   `sortNo` int DEFAULT NULL COMMENT '排序编号',
   `minGroupPeople` int DEFAULT NULL COMMENT '最少成团人数',
@@ -33,7 +34,7 @@ CREATE TABLE IF NOT EXISTS `tour_setting` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='普惠疗休养配置';
 
 -- 疗休养配置标段表。
--- 标段先挂在配置上维护，后续线路、旅行社、报名等模块可继续通过 lotId 做业务关联。
+-- 标段先挂在配置上维护，后续线路、服务单位、报名等模块可继续通过 lotId 做业务关联。
 CREATE TABLE IF NOT EXISTS `tour_setting_lot` (
   `id` varchar(32) NOT NULL COMMENT 'ID',
   `settingId` varchar(32) DEFAULT NULL COMMENT '所属配置ID',
@@ -51,12 +52,30 @@ CREATE TABLE IF NOT EXISTS `tour_setting_lot` (
   KEY `idx_tour_setting_lot_value` (`lotValue`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='普惠疗休养配置标段';
 
--- 旅行社管理表。
+-- 疗休养配置分工会人员分配表。
+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='疗休养配置分工会人员分配';
+
+-- 服务单位管理表。
 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 '旅行社名称',
+  `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 '邮箱',
@@ -72,7 +91,7 @@ CREATE TABLE IF NOT EXISTS `tour_travel_agency` (
   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='普惠疗休养旅行社';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='普惠疗休养服务单位';
 
 -- 线路管理表。
 CREATE TABLE IF NOT EXISTS `tour_line` (
@@ -80,7 +99,7 @@ CREATE TABLE IF NOT EXISTS `tour_line` (
   `year` int DEFAULT NULL COMMENT '创建年度',
   `lineCode` varchar(50) DEFAULT NULL COMMENT '线路编号',
   `lineName` varchar(100) DEFAULT NULL COMMENT '线路名称',
-  `travelAgencyId` varchar(32) DEFAULT NULL COMMENT '旅行社ID',
+  `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',

src/main/resources/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='疗休养配置分工会人员分配';